From 800f10a99a19f4936dd2394d0e764a4c7ed7998a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 18:31:49 +0800
Subject: [PATCH] 修BUG
---
small-program/pages/index/index.vue | 1219 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 947 insertions(+), 272 deletions(-)
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index e775a3e..a5e872a 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -1,143 +1,111 @@
<template>
<view class="index">
<!-- 鎺ュ崟鏂� -->
- <view class="index-j" v-if="typeViewId === 1">
+ <view class="index-j" v-if="userInfo && userInfo.useIdentity === 1">
+ <view class="kefubtn" @click="contactPhone()">
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <text>瀹㈡湇</text>
+ </view>
<view class="index-j-head">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
<view class="index-c-title" :style="{ height: navHeight + 'px' }">
- <text>杩戝揩</text>
+ <text>鎺ュ崟澶у巺</text>
</view>
</view>
<view class="search" :style="{ top: statusbarHeight + navHeight + 'px' }">
<view class="index-j-cate">
- <view class="index-j-cate-item">
- <text>鍏ㄩ儴</text>
- <view class="index-j-cate-item-x"></view>
- </view>
- <view class="index-j-cate-item">
- <text>鐢ㄥ伐</text>
- </view>
- <view class="index-j-cate-item">
- <text>杩愯揣</text>
- </view>
- <view class="index-j-cate-item">
- <text>璁㈤</text>
+ <view class="index-j-cate-item" v-for="(item, index) in searchType" :key="index" @click="clickCate(item.id)">
+ <text :style="{ color: typeVal === item.id ? '#222222' : '', fontSize: typeVal === item.id ? '36rpx' : '', fontWeight: typeVal === item.id ? '600' : '' }">{{item.name}}</text>
+ <view class="index-j-cate-item-x" v-if="typeVal === item.id"></view>
</view>
</view>
<view class="index-j-search">
- <view class="index-j-search-item active">鏈�鏂板彂甯�</view>
- <view class="index-j-search-item">璺濈浼樺厛</view>
- <view class="index-j-search-item">浠锋牸浠庨珮鍒颁綆</view>
+ <view :class="sortType === item.id ? 'index-j-search-item active' : 'index-j-search-item'" v-for="(item, index) in sortList" :key="index" @click="clickSort(item.id)">{{item.name}}</view>
</view>
</view>
<view class="index-j-list">
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>璁㈤鍗�</text>
+ <view class="index-list-item" v-if="orderList && orderList.length" v-for="(item, index) in orderList" :key="index">
+ <view @click="goOrderDetail(item.id)">
+ <view class="index-list-item-head" >
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ </view>
+ <view class="index-list-item-head-r">{{item.distance}}km</view>
</view>
- <view class="index-list-item-head-r">璺濈 1.3km</view>
- </view>
- <view class="index-list-item-info">
- 鍗堥5鍏�(30浠�)锝滄櫄椁�8鍏�(20浠�)
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum2}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}澶� 锝渰{item.priceNum2}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}灏忔椂 锝渰{item.priceNum2}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}{{item.carType === 0?"澶�":"娆�"}}
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-if="item.wayInfo" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{address.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
</view>
<view class="eidt">
- <sunui-mverify @change="mverify"></sunui-mverify>
+ <!-- <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify> -->
+ <view class="eidt-btn" @click="show1 = true, orderId = item.id">鎶㈠崟</view>
</view>
</view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗曟柟鎺ュ崟</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�20000鏂わ綔闇�2杈�
- </view>
- <view class="index-list-item-date">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="address">
- <view class="address-xian"></view>
- <view class="address-row">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
- </view>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <sunui-mverify @change="mverify"></sunui-mverify>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�2000鏂�
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <sunui-mverify @change="mverify"></sunui-mverify>
- </view>
- </view>
+ <view v-if="orderList && orderList.length&& !next" class="more">宸插姞杞藉叏閮�</view>
+ <view v-if="(!orderList || !orderList.length)&& !next" class="more">鏆傛棤璁㈠崟鍝�</view>
</view>
</view>
- <!-- 鍙戝崟鏂� -->
- <view class="index-c" v-if="typeViewId === 0">
+ <!-- 鍙戝崟鏂� -->
+ <view class="index-c" v-if="!isLogin || !userInfo || userInfo.useIdentity === 0">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
- <view class="index-c-title" :style="{ height: navHeight + 'px' }" @click="selectAddress">
+ <view class="index-c-title" :style="{ height: navHeight + 'px' }" @click="selectAddress(-1)">
<text class="index-c-title-logo">杩戝揩</text>
<image class="dingwei" src="/static/icon/home_ic_location@2x.png" mode="widthFix"></image>
- <text>瑗挎箹鍥介檯骞垮満</text>
+ <text>{{location.address || address || '鑾峰彇鍦板潃澶辫触'}}</text>
<image class="qu" src="/static/icon/home_ar_next@2x.png" mode="widthFix"></image>
</view>
<view class="index-c-cate">
<view
+ v-if="type"
:class="typeId === item.id ? 'index-c-cate-item active' : 'index-c-cate-item'"
v-for="(item, index) in type"
:key="index"
@@ -146,133 +114,86 @@
</view>
</view>
+ <!-- 璁㈤ -->
<template v-if="typeId === 2">
<view class="list">
<view class="list-item">
<view class="list-item-label">鏃堕棿鍦扮偣</view>
- <view class="list-item-row">
+ <view class="list-item-row" @click="show = true">
<view class="list-item-row-label">鐢ㄩ鏃ユ湡<b>*</b></view>
<view class="list-item-row-val">
- <text>璇烽�夋嫨</text>
+ <text>{{ form.startDate ? form.startDate + ' 鑷� ' + form.endDate + '锛�' + form.days + '澶╋級' : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
<view class="list-item-row">
<view class="list-item-row-label">鐢ㄩ鏃堕棿<b>*</b></view>
<view class="list-item-row-radio">
- <view class="radio-item">
- <view class="radio-item-label">鏃╅</view>
+ <view class="radio-item" v-if="orderFood" v-for="(item, index) in orderFood" :key="index">
+ <view class="radio-item-label">{{item.name}}</view>
<view class="radio-item-list">
<view class="radio-item-list-l">
- <view class="radio-item-list-item active">5鍏�</view>
- <view class="radio-item-list-item">8鍏�</view>
- <view class="radio-item-list-item">10鍏�</view>
+ <view v-if="item.list" :class="child.active ? 'radio-item-list-item active' : 'radio-item-list-item'" v-for="(child, childIndex) in item.list" :key="childIndex" @click="selectMenu(index, childIndex)">{{child.price||0}}鍏�</view>
</view>
<view class="radio-item-list-data">
- <text>浠芥暟锛�</text>
- <input type="number" placeholder="0">
+ <text style="flex-shrink: 0;">浠芥暟锛�</text>
+ <input type="number" v-model="item.num" placeholder="璇疯緭鍏�">
<text style="color: #999999;">浠�</text>
- </view>
- </view>
- </view>
- <view class="radio-item">
- <view class="radio-item-label">鍗堥</view>
- <view class="radio-item-list">
- <view class="radio-item-list-l">
- <view class="radio-item-list-item active">5鍏�</view>
- <view class="radio-item-list-item">8鍏�</view>
- <view class="radio-item-list-item">10鍏�</view>
- </view>
- <view class="radio-item-list-data">
- <text>浠芥暟锛�</text>
- <input type="number" placeholder="0">
- <text style="color: #999999;">浠�</text>
- </view>
- </view>
- </view>
- <view class="radio-item">
- <view class="radio-item-label">鏅氶</view>
- <view class="radio-item-list">
- <view class="radio-item-list-l">
- <view class="radio-item-list-item active">5鍏�</view>
- <view class="radio-item-list-item">8鍏�</view>
- <view class="radio-item-list-item">10鍏�</view>
- </view>
- <view class="radio-item-list-data">
- <text>浠芥暟锛�</text>
- <input type="number" placeholder="0">
- <text style="color: #999999;">浠�</text>
+ <view class="radio-item-list-data-btn" @click="clear(index)">鍙栨秷</view>
</view>
</view>
</view>
</view>
</view>
- <view class="list-item-row">
+ <view class="list-item-row" @click="selectAddress(1)">
<view class="list-item-row-label">鐢ㄩ鍦扮偣<b>*</b></view>
<view class="list-item-row-val">
- <text>璇烽�夋嫨</text>
+ <text>{{form.address ? form.address : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
<view class="list-item-row">
<view class="list-item-row-label">鍦扮偣鎻忚堪</view>
<view class="list-item-row-val">
- <input type="text" placeholder="璇疯緭鍏�" />
+ <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
</view>
</view>
- </view>
- <view class="list-item">
- <view class="list-item-label">闇�姹�</view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄩ浜烘暟<b>*</b></view>
- <view class="list-item-row-user">
- <view class="user-item">
- <text>鏃╅</text>
- <input type="text" placeholder="璇疯緭鍏�" />
- <text>浠�</text>
- </view>
- <view class="user-item">
- <text>鍗堥</text>
- <input type="text" placeholder="璇疯緭鍏�" />
- <text>浠�</text>
- </view>
- </view>
- </view>
- <view class="list-item-row">
+ <view class="list-item-row" >
<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
<view class="list-item-row-val">
- <textarea cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
+ <textarea v-model="form.supplement" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
</view>
</view>
- <view class="list-item-row">
+ <view class="list-item-row" >
<view class="list-item-row-label">鍥剧墖</view>
<view class="list-item-row-upload">
- <view class="upload-item">
- <image src="/static/logo.png" mode="widthFix"></image>
+ <view class="upload-item" v-if=" form.multifileList" v-for="(item, index) in form.multifileList" :key="index">
+ <image :src="item.url" mode="widthFix"></image>
+ <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
</view>
- <view class="upload-item">
+ <view class="upload-item" @click="uploadImg">
<u-icon name="plus" color="#999999" size="24"></u-icon>
<text>鐐瑰嚮涓婁紶</text>
</view>
</view>
</view>
- <view class="list-item-zk">
- <text>琛ュ厖闇�姹�</text>
- <u-icon name="arrow-down" color="#00BC12" size="16"></u-icon>
- </view>
+ <!-- <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
+ <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
+ </view> -->
</view>
<view class="list-item">
<view class="list-item-label">鑱旂郴浜轰俊鎭�</view>
<view class="list-item-row">
<view class="list-item-row-label">鑱旂郴浜�</view>
<view class="list-item-row-val">
- <input type="text" placeholder="璇疯緭鍏�" />
+ <input type="text" v-model="form.linkName" placeholder="璇疯緭鍏�" />
</view>
</view>
<view class="list-item-row">
<view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
<view class="list-item-row-val">
- <input type="number" placeholder="璇疯緭鍏�" maxlength="11" />
+ <input type="number" v-model="form.linkPhone" placeholder="璇疯緭鍏�" maxlength="11" />
</view>
</view>
</view>
@@ -282,19 +203,13 @@
<view class="footer-price">
<view class="footer-price-info">棰勪及鎬昏垂鐢�</view>
<view class="footer-price-num">
- <text>0</text>
+ <text>{{totalPrice}}</text>
<text>鍏�</text>
</view>
</view>
- <view class="footer-bottom">
- <view class="footer-bottom-kf">
- <image src="/static/logo.png" mode="widthFix"></image>
- <text>瀹㈡湇</text>
- </view>
- <div class="footer-bottom-btn">
- <text>绔嬪嵆涓嬪崟</text>
- <text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
- </div>
+ <view class="box-hz-btn" :style="{ backgroundImage: 'url(' + btn + ')' }">
+ <view class="box-hz-btn-kf" @click="contactPhone()">瀹㈡湇</view>
+ <view class="box-hz-btn-next" @click="submit">绔嬪嵆涓嬪崟</view>
</view>
</view>
</template>
@@ -305,7 +220,7 @@
<!-- 鐢ㄥ伐 -->
<template v-if="typeId === 0">
<view class="box-hz-cate">
- <view :class="form.workType === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in typeWork" :key="index" @click="clickTypeWork(item.id)">
+ <view v-if="typeWork" :class="form.workType === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in typeWork" :key="index" @click="clickTypeWork(item.id)">
<text>{{item.name}}</text>
<view class="box-hz-cate-item-x" v-if="form.workType === item.id"></view>
</view>
@@ -323,10 +238,10 @@
</view>
<view class="box-hz-list-item" @click="selectAddress(1)">
<view class="box-hz-list-item-label"><text>鐢ㄥ伐鍦扮偣锛�</text></view>
- <view :class="form.location ? 'box-hz-list-item-val active' :'box-hz-list-item-val'">
+ <view :class="form.address ? 'box-hz-list-item-val active' :'box-hz-list-item-val'">
<view class="box-hz-list-item-val-left">
<image class="icon" src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
- <text>{{form.location ? form.location : '璇烽�夋嫨鐢ㄥ伐鍦扮偣'}}</text>
+ <text>{{form.address ? form.address : '璇烽�夋嫨鐢ㄥ伐鍦扮偣'}}</text>
</view>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
@@ -336,12 +251,13 @@
<!-- 杩愯揣 -->
<template v-if="typeId === 1">
- <view class="box-hz-cate">
- <view :class="form.categoryId === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in car" :key="index" @click="clickCar(item)">
+ <scroll-view class="nav-scroll" scroll-x="true">
+ <view v-if="car" :class="form.categoryId === item.id ? 'nav-item active' : 'nav-item'" v-for="(item, index) in car" :key="index" @click="clickCar(item)">
<text>{{item.name}}</text>
- <view class="box-hz-cate-item-x" v-if="form.categoryId === item.id"></view>
+ <view class="nav-item-x" v-if="form.categoryId === item.id"></view>
</view>
- </view>
+ </scroll-view>
+
<view class="box-hz-car">
<view class="box-hz-car-image">
<image :src="carImage" mode="widthFix"></image>
@@ -356,14 +272,14 @@
<view :class="form.startDate ? 'box-hz-list-item-val active' : 'box-hz-list-item-val'">
<view class="box-hz-list-item-val-left">
<image class="icon" src="/static/icon/ic_time@2x.png" mode="widthFix"></image>
- <text>{{ form.startDate ? form.startDate + ' 鑷� ' + form.endDate : '璇烽�夋嫨鐢ㄥ伐鏃堕棿'}}</text>
+ <text>{{ form.startDate ? form.startDate + ' 鑷� ' + form.endDate : '璇烽�夋嫨鐢ㄨ溅鏃堕棿'}}</text>
</view>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
<view class="box-hz-list-item">
<view class="box-hz-list-item-label">
- <text>鐢ㄨ溅鏃堕棿锛�</text>
+ <text>鐢ㄨ溅鍦扮偣锛�</text>
<text @click="addAddr">+澧炲姞閫旂粡鐐�</text>
</view>
<view class="item-d">
@@ -376,7 +292,7 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="item-d-row" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
+ <view class="item-d-row" v-if="form.wayInfoDTOList" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
<view class="item-d-row-icon">
<image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
</view>
@@ -401,44 +317,106 @@
</view>
</view>
</template>
-
<view class="box-hz-btn" :style="{ backgroundImage: 'url(' + btn + ')' }">
- <view class="box-hz-btn-kf">瀹㈡湇</view>
- <view class="box-hz-btn-next" @click="jump()">涓嬩竴姝�</view>
+ <view class="box-hz-btn-kf" @click="contactPhone()" >瀹㈡湇</view>
+ <view class="box-hz-btn-next" @click="jump()" v-if="typeId == 2">绔嬪嵆涓嬪崟</view>
+ <view class="box-hz-btn-next" @click="jump()" v-if="typeId !== 2">涓嬩竴姝�</view>
</view>
</view>
</view>
</view>
<!-- 閫夋嫨鏃ユ湡鑼冨洿 -->
- <u-calendar :show="show" color="#00BC12" mode="range" @close="show = false" @confirm="confirmDate"></u-calendar>
+ <u-calendar :show="show" color="#00BC12" :allowSameDay="true" mode="range" @close="show = false" @confirm="confirmDate"></u-calendar>
+ <u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true" @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
+ <view class="phone">
+ <view class="phone-head">
+ <view></view>
+ <text>鑱旂郴瀹㈡湇</text>
+ </view>
+ <view class="phone-item">
+ <view>
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <button open-type="contact" plain="true" bindcontact="handleContact">鍦ㄧ嚎瀹㈡湇</button>
+ </view>
+ <view class="line" v-if="serverPhone && serverPhone.length"></view>
+ </view>
+ <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
+ <view>
+ <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
+ <text>{{item}}</text>
+ </view>
+ <view class="line" v-if="index<serverPhone.length-1"></view>
+ </view>
+ <view style="width: 100%; height: 30rpx;"></view>
+ <!-- <view class="phone-botton" @click="contactPhone()" >鍏抽棴</view> -->
+ </view>
+ </u-popup>
+
+ <u-modal
+ title="娓╅Θ鎻愮ず"
+ :show="show1"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 鏄惁纭鎶㈠崟锛�
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show1 = false">鍙栨秷</view>
+ <view class="btn2" @click="getaccept1">纭</view>
+ </view>
+ </u-modal>
+ <u-modal
+ title="鏀粯鏈垚鍔�"
+ :show="show2"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 璇风‘璁ゆ槸鍚﹀彇娑堟敮浠樻垨鏌ョ湅璁㈠崟缁х画鏀粯锛�
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show2 = false;payOrderId=null">鍙栨秷鏀粯</view>
+ <view class="btn2" @click="goOrderDetail(payOrderId)">鏌ョ湅璁㈠崟</view>
+ </view>
+ </u-modal>
</view>
</template>
<script>
import { mapState } from 'vuex'
import sunuiMverify from '@/components/sunui-mverify/sunui-mverify.vue';
+ var QQMapWX = require('@/utils/qqmap-wx-jssdk.js');
export default {
components: { sunuiMverify },
computed: {
- ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid'])
- },
- onShow(options){
- this.typeViewId = 0
- if(this.token &&this.token!='' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
- this.isLogin=true
+ ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude','address']),
+ totalPrice() {
+ return this.form.estimatedAccount / 100
}
- if (this.userInfo && this.userInfo.useIdentity == 1) {
- this.typeViewId = 1
- }
},
data() {
return {
+ showPhone:false,
+ serverPhone:[],
show: false,
isLogin: false,
typeId: 0,
+ qqmapsdk: null,
+ location:{
+ latitude:null,
+ longitude:null,
+ address:null,
+ },
type: [
+ { name: '鐢ㄥ伐', id: 0 },
+ { name: '杩愯揣', id: 1 },
+ { name: '璁㈤', id: 2 }
+ ],
+ searchType: [
+ { name: '鍏ㄩ儴', id: '' },
{ name: '鐢ㄥ伐', id: 0 },
{ name: '杩愯揣', id: 1 },
{ name: '璁㈤', id: 2 }
@@ -448,11 +426,19 @@
{ name: '鍒嗘嫞宸�', id: 1 },
{ name: '鍖呰宸�', id: 2 }
],
+ sortList: [
+ { name: '鏈�鏂板彂甯�', id: 0 },
+ { name: '璺濈浼樺厛', id: 1 },
+ { name: '浠锋牸浠庨珮鍒颁綆', id: 2 }
+ ],
car: [],
btn: require('@/static/image/btn.png'),
typeViewId: 0,
carImage: '',
carRemark: '',
+
+ orderFood: [],
+ viewStatus: true,
form: {
startDate: '',
@@ -465,14 +451,407 @@
workType: 0,
categoryId: '',
categoryName: '',
- days: ''
+ days: '',
+ locationRemark: '',
+ supplement: '',
+ multifileList: [],
+ linkName: '',
+ linkPhone: '',
+ estimatedAccount: '',
+ price: '',
+ address: ''
+ },
+ sortType: 0,
+ orderList: [],
+ typeVal: '',
+ page: 1,
+ next: true,
+
+ isOnce: true,
+ show1: false,
+ show2: false,
+ orderId: null,
+ payOrderId:null
+ }
+ },
+ async onLoad() {
+ await this.$onLaunched;
+ console.log('2')
+ // if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
+ // this.getOrderList()
+ // }
+
+ this.getCategoryLists()
+ this.getDictInfo()
+
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ this.form.linkPhone = this.userInfo.telephone || ''
+ this.form.linkName = this.userInfo.name || ''
+ }
+
+ this.qqmapsdk = new QQMapWX({
+ key: '4PXBZ-JLBC7-LCLXG-P2SZX-C4HYE-LDBLQ'
+ });
+
+ uni.$on('clear', (data) => {
+ this.form.startDate = ''
+ this.form.endDate = ''
+ this.form.latitude = ''
+ this.form.longitude = ''
+ this.form.location = ''
+ this.form.locationEnd = ''
+ this.form.wayInfoDTOList = []
+ this.form.workType = 0
+ this.form.days = ''
+ this.form.locationRemark = ''
+ this.form.supplement = ''
+ this.form.multifileList = []
+ this.form.estimatedAccount = ''
+ this.form.price = ''
+ this.form.address = ''
+ this.clearAll()
+ })
+ // 鍒锋柊棣栭〉鏁版嵁
+ uni.$on('refresh', () => {
+ this.getCategoryLists()
+ this.getDictInfo()
+
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ this.form.linkPhone = this.userInfo.telephone
+ }
+ })
+ },
+ async onShow(options) {
+ await this.$onLaunched;
+ if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ console.log('宸茬櫥闄�')
+ this.isLogin = true
+
+ // this.typeViewId = this.userInfo.useIdentity
+ // !this.isOnce &&
+ if (this.userInfo.useIdentity === 1) {
+ console.log('宸茬櫥闄�111')
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ }
+
+ } else {
+ this.isLogin = false
+ console.log('鏈櫥闄�')
+ }
+ // this.payOrderId=null
+ },
+ watch: {
+ typeId: {
+ handler(news, old) {
+ this.clearFormParam()
+ }
+ },
+ orderFood: {
+ deep: true,
+ handler(news, old) {
+ let price = 0
+ news.forEach(item => {
+ let num = 0
+ item.list.forEach(child => {
+ if (child.active) {
+ num = Number(child.price)
+ }
+ })
+ if (item.num && num > 0) {
+ price += num * item.num
+ }
+ })
+ console.log("========================",price)
+ this.form.price = price
+ }
+ },
+ 'form.price': {
+ handler(news, old) {
+ console.log(news,"==========",old)
+ if (news != old) {
+ this.getPrice()
+ }
}
}
},
- onLoad() {
- this.getCategoryLists()
+ onReachBottom() {
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
+ this.getOrderList()
+ }
},
methods: {
+ goOrderDetail(id){
+ uni.navigateTo({
+ url: '/pages/order-details/order-details?id='+id
+ })
+ var that =this
+ setTimeout(function(){
+ that.orderId=null
+ that.payOrderId=null
+ that.show2=false
+ },1000)
+
+ },
+ clearFormParam(){
+ this.form.startDate = ''
+ this.form.address = ''
+ this.form.endDate = ''
+ this.form.latitude = ''
+ this.form.longitude = ''
+ this.form.location = ''
+ this.form.locationEnd = ''
+ this.form.wayInfoDTOList = []
+ this.form.workType = 0
+ this.form.days = ''
+ this.form.locationRemark = ''
+ this.form.supplement = ''
+ this.form.multifileList = []
+ this.form.estimatedAccount = ''
+ this.form.price = ''
+ this.viewStatus = false
+ this.clearAll()
+ },
+ clear(index) {
+ this.orderFood[index].num = ''
+ this.orderFood[index].list.forEach(item => {
+ item.active = false
+ })
+ },
+ clearAll() {
+ this.orderFood.forEach(p=>{
+ p.num=null
+ p.list.forEach(item => {
+ item.active = false
+ })
+ })
+ },
+ getDictInfo(){
+ var that = this;
+ this.$u.api.getPlatformAboutUs({}).then(res =>{
+ that.serverPhone = (res.data.serverPhone||'').split(",")
+ })
+ },
+ contactPhone(){
+ this.showPhone = !this.showPhone
+ console.log("==================================",this.showPhone)
+ },
+ contactPhoneDo(phone){
+ if(phone !=null && phone!=''){
+ uni.makePhoneCall({
+ phoneNumber: phone
+ })
+ }
+ },
+ // 鎵嬪姩鎺ュ崟
+ getaccept() {
+ var that = this;
+ that.$u.api.accept({ orderId: this.orderId })
+ .then(res1 => {
+ if (res1.code === 200) {
+ uni.showToast({ title: '鎶㈠崟鎴愬姛锛�', icon: 'success', duration: 2000 })
+ setTimeout(() => {
+ that.page = 1
+ that.next = true
+ that.orderList = []
+ that.getOrderList()
+ that.goOrderDetail(that.orderId)
+ }, 2000)
+ }
+ })
+ },
+ getaccept1() {
+ var that = this;
+ this.show1 = false
+ uni.requestSubscribeMessage({
+ tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8','3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
+ success(res) {
+ that.getaccept()
+ },
+ fail(err) {
+ that.getaccept()
+ }
+ })
+ },
+ clickSort(id) {
+ this.sortType = id
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ },
+ clickCate(id) {
+ this.typeVal = id
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ },
+ // 璁㈠崟鍒嗛〉
+ getOrderList() {
+ if (!this.next) return;
+ this.$u.api.orderPage({
+ capacity: 10,
+ page: this.page,
+ model: {
+ queryMyOrderType: 2,
+ type: this.typeVal,
+ sortType: this.sortType,
+ queryLat: uni.getStorageSync('address').latitude,
+ queryLgt: uni.getStorageSync('address').longitude
+ }
+ }).then(res => {
+ if (res.code !== 200) return;
+ this.isOnce = false
+ res.data.records.forEach(item => {
+ // 璁㈤鍗�
+ if (item.type === 2) {
+ item.wayInfoCopy = JSON.parse(item.wayInfo).map(item => {
+ return `${item.name}${item.price / 100}鍏�(${item.num}浠�)`
+ }).join(' | ')
+ // 杩愯揣
+ } else if (item.type === 1) {
+ item.wayInfo = JSON.parse(item.wayInfo)
+ }
+ })
+ this.orderList = [...this.orderList, ...res.data.records]
+
+ if (this.orderList.length === res.data.total) {
+ this.next = false
+ } else {
+ this.page += 1
+ }
+ })
+ },
+ // 鎻愪氦璁㈠崟
+ submit() {
+ var that = this
+ this.payOrderId=null
+ if (!this.form.startDate) {
+ return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鏃堕棿', icon: 'none' })
+ }
+ let cateringDTOList = []
+ let valid = true
+ let msg ='璇烽�夋嫨'
+ that.orderFood.forEach(item => {
+ item.list.forEach(child => {
+ if (child.active) {
+ // (Number(child.price) * Number(item.num))
+ if( !item.num){
+ msg =msg +'銆�'+item.name+'銆�';
+ valid =false
+ }
+ cateringDTOList.push({
+ id:item.id,
+ name: item.name,
+ num: item.num,
+ price: child.price * 100
+ })
+ }
+ })
+ })
+ if(!valid){
+ return uni.showToast({ title: msg+'鐢ㄩ浠芥暟', icon: 'none' })
+ }
+ if (cateringDTOList.length === 0) {
+ return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鏍囧噯', icon: 'none' })
+ }
+ if (!this.form.address) {
+ return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鍦扮偣', icon: 'none' })
+ }
+ if (!this.form.linkPhone) {
+ return uni.showToast({ title: '璇疯緭鍏ヨ仈绯荤數璇�', icon: 'none' })
+ }
+ uni.requestSubscribeMessage({
+ tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
+ success(res) {
+ that.$u.api.release({
+ ...that.form,
+ type: 2,
+ price: Number(that.form.price) * 100,
+ priceNum1: that.form.days,
+ location: that.form.address,
+ lat: that.form.latitude,
+ lgt: that.form.longitude,
+ cateringDTOList
+ }).then(res => {
+ if (res.code == 200) {
+ that.clearFormParam();
+ wx.requestPayment({
+ timeStamp: res.data.object.timeStamp,
+ nonceStr: res.data.object.nonceStr,
+ package: res.data.object.packageVal,
+ signType: res.data.object.signType,
+ paySign: res.data.object.paySign,
+ success (res1) {
+ if (res1.errMsg = 'requestPayment:ok') {
+ uni.showToast({ title: '鏀粯鎴愬姛', icon: 'success', duration: 2000 });
+ setTimeout(() => {
+ uni.navigateTo({
+ url: `/pages/success/success?orderId=${res.data.id}`
+ })
+ }, 1500)
+ }
+ },
+ fail(err) {
+ that.payOrderId = res.data.id
+ that.show2=true
+ console.log("=====================", res.data.id,that.payOrderId,err)
+ }
+ })
+ }
+ })
+ console.log(cateringDTOList)
+ },
+ fail(err) {
+ console.log(err)
+ }
+ })
+ },
+ uploadImg() {
+ uni.chooseImage({
+ success: (chooseImageRes) => {
+ for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: chooseImageRes.tempFilePaths[i],
+ name: 'file',
+ formData: {
+ 'folder': 'orders'
+ },
+ success: (uploadFileRes) => {
+ const res = JSON.parse(uploadFileRes.data)
+ this.form.multifileList.push({
+ fileurl: res.data.imgaddr,
+ name: res.data.originname,
+ url: res.data.url,
+ type: 0
+ })
+ }
+ });
+ }
+ }
+ });
+ },
+ // 璁＄畻閲戦
+ getPrice() {
+ var that = this
+ if (that.form.price && that.form.days) {
+ that.$u.api.getTotal({
+ price: Number(that.form.price) * 100,
+ priceNum1: that.form.days,
+ type: 2
+ }).then(res => {
+ if (res.code === 200) {
+ that.form.estimatedAccount = res.data
+ }
+ })
+ }else{
+ that.form.estimatedAccount = 0
+ }
+ },
addAddr() {
this.form.wayInfoDTOList.push({
lat: '',
@@ -483,30 +862,54 @@
confirmDate(e) {
this.form.startDate = e[0]
this.form.endDate = e[e.length - 1]
- this.form.days = e.length;
+
+ let time = this.form.startDate == this.form.endDate ? 1 : 0
+
+ this.form.days = e.length - time;
this.show = false
+ if (this.typeId === 2) {
+ this.getPrice()
+ }
},
selectAddress(type, index) {
uni.chooseLocation({
- success: (res) => {
+ success: (res) => {
+ console.log("==================",res)
if ([1,2].includes(type)) {
this.form.latitude = res.latitude
this.form.longitude = res.longitude
- this.form.address = res.address
+ this.form.address = res.name ||res.address
} else if (type === 3) {
- this.form.locationEnd = res.address
+ this.form.locationEnd = res.name ||res.address
this.form.latEnd = res.latitude
this.form.lgtEnd = res.longitude
} else if (type === 4) {
- this.form.wayInfoDTOList[0].lat = res.latitude
- this.form.wayInfoDTOList[0].lgt = res.longitude
- this.form.wayInfoDTOList[0].location = res.address
- }
+ this.form.wayInfoDTOList[index].lat = res.latitude
+ this.form.wayInfoDTOList[index].lgt = res.longitude
+ this.form.wayInfoDTOList[index].location = res.name|| res.address
+ }else if (type == -1) {
+ console.log(res)
+ this.location.latitude = res.latitude
+ this.location.longitude = res.longitude
+ this.location.address =res.name || res.address
+ }
}
});
},
clickType(e) {
+ if (!this.token) {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ return
+ }
this.typeId = e
+ if (e === 2) {
+ this.form.categoryId = this.car[0].id
+ this.form.categoryName = this.car[0].name
+ this.carRemark = this.car[0].remark
+ this.carImage = this.car[0].iconFull
+ }
},
clickTypeWork(e) {
this.form.workType = e
@@ -539,17 +942,17 @@
// 閲囨憳宸�
if (this.form.workType === 0) {
uni.navigateTo({
- url: `/pages/using-workers/using-workers?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/using-workers/using-workers?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
// 鍒嗘嫞宸�
} else if (this.form.workType === 1) {
uni.navigateTo({
- url: `/pages/sorting/sorting?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/sorting/sorting?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
// 鍖呰宸�
} else if (this.form.workType === 2) {
uni.navigateTo({
- url: `/pages/packaging-worker/packaging-worker?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/packaging-worker/packaging-worker?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
}
// 杩愯揣
@@ -585,17 +988,41 @@
})
}
},
- mverify(e){
- console.log('楠岃瘉缁撴灉:',e);
+ // 閫夋嫨濂楅
+ selectMenu(a, b) {
+ this.orderFood.forEach((item, index) => {
+ if (index === a) {
+ item.list.forEach((child, childIndex) => {
+ child.active = b === childIndex
+ })
+ }
+ })
},
getCategoryLists() {
this.$u.api.getCategoryList({ type: 1 })
.then(res => {
- this.car = res.data
- this.form.categoryId = res.data[0].id
- this.form.categoryName = res.data[0].name
- this.carRemark = res.data[0].remark
- this.carImage = res.data[0].iconFull
+ if (res.code === 200) {
+ this.car = res.data
+ this.form.categoryId = res.data[0].id
+ this.form.categoryName = res.data[0].name
+ this.carRemark = res.data[0].remark
+ this.carImage = res.data[0].iconFull
+ }
+ })
+ this.$u.api.getCategoryList({ type: 2 })
+ .then(res => {
+ if (res.code === 200) {
+ res.data.forEach(item => {
+ item.num = ''
+ item.list = item.detailList.map(child => {
+ return {
+ active: false,
+ price: child
+ }
+ })
+ })
+ this.orderFood = res.data
+ }
})
}
}
@@ -611,7 +1038,64 @@
<style lang="scss" scoped>
.index {
width: 100%;
+ .slot-content {
+ width: 100%;
+ text-align: center;
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #333333;
+ margin: 30rpx 0;
+ }
+ .btn1 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #666666;
+ border-radius: 44rpx;
+ border: 1rpx solid #B2B2B2;
+ }
+ .btn2 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ }
.index-j {
+ .kefubtn{
+ background-color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: fixed;
+ bottom: 100rpx;
+ flex-direction: column;
+ right:30rpx;
+ height: 88rpx;
+ width: 88rpx;
+ border: 1rpx solid #f2f2f2;
+ border-radius: 50%;
+ image{
+ width: 36rpx;
+ width: 36rpx;
+ }
+ text{
+ width: 44rpx;
+ height: 32rpx;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #222222;
+ line-height: 32rpx;
+ text-align: center;
+ }
+ }
width: 100%;
.index-j-head {
width: 100%;
@@ -699,6 +1183,13 @@
width: 100%;
padding: 24rpx 30rpx;
box-sizing: border-box;
+ .more{
+ width: 100%;
+ margin-top: 40rpx;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ }
.index-list-item {
width: 100%;
padding: 30rpx;
@@ -717,6 +1208,17 @@
display: flex;
align-items: center;
justify-content: center;
+ .eidt-btn {
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ background: #00BC12;
+ border-radius: 44rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ }
// background: #00BC12;
// border-radius: 50rpx;
// text {
@@ -863,7 +1365,7 @@
padding: 0 30rpx;
box-sizing: border-box;
display: flex;
- align-items: center;
+ align-items: center;
.index-c-title-logo {
font-weight: bold;
font-size: 40rpx;
@@ -880,6 +1382,10 @@
font-size: 32rpx;
color: #ffffff;
margin-right: 12rpx;
+ max-width: 280rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.qu {
width: 22rpx;
@@ -978,12 +1484,16 @@
padding: 30rpx 0;
box-sizing: border-box;
flex-direction: column;
- border-bottom: 1rpx solid #E5E5E5;
+ // border-bottom: 1rpx solid #E5E5E5;
.radio-item {
width: 100%;
display: flex;
- align-items: center;
+ align-items: flex-start;
margin-bottom: 30rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+ &:last-child {
+ border: none;
+ }
&:last-child {
margin: 0 !important;
}
@@ -1002,6 +1512,8 @@
width: 100%;
display: flex;
align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
.active {
background: #00BC12 !important;
color: #ffffff !important;
@@ -1016,9 +1528,15 @@
font-weight: 400;
font-size: 28rpx;
color: #111111;
- margin-right: 30rpx;
- &:last-child {
- margin: 0 !important;
+ margin-top: 30rpx;
+ &:nth-child(1) {
+ margin-top: 0 !important;
+ }
+ &:nth-child(2) {
+ margin-top: 0 !important;
+ }
+ &:nth-child(3) {
+ margin-top: 0 !important;
}
}
}
@@ -1028,6 +1546,19 @@
align-items: center;
justify-content: flex-end;
margin-top: 42rpx;
+ margin-bottom: 34rpx;
+ .radio-item-list-data-btn {
+ width: 110rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ margin-left: 20rpx;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ text-align: center;
+ border: 1rpx solid #B2B2B2;
+ border-radius: 34rpx;
+ }
text {
font-weight: 400;
font-size: 30rpx;
@@ -1040,6 +1571,10 @@
color: #222222;
text-align: right;
margin: 0 30rpx;
+ &::-webkit-input-placeholder {
+ color: #999999;
+ font-weight: 400;
+ }
}
}
}
@@ -1063,6 +1598,7 @@
border-radius: 8rpx;
margin-right: 20rpx;
border: 2rpx solid #EEEEEE;
+ position: relative;
&:last-child {
margin: 0 !important;
}
@@ -1074,6 +1610,14 @@
font-size: 26rpx;
color: #666666;
margin-top: 16rpx;
+ }
+ .upload-item-dele {
+ position: absolute;
+ top: -20rpx;
+ right: -20rpx;
+ width: 40rpx;
+ height: 40rpx;
+ z-index: 9;
}
}
}
@@ -1171,52 +1715,82 @@
}
}
}
- .footer-bottom {
+ .box-hz-btn {
width: 100%;
+ height: 88rpx;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
display: flex;
align-items: center;
justify-content: space-between;
- .footer-bottom-kf {
+ .box-hz-btn-kf {
flex-shrink: 0;
- margin-right: 40rpx;
+ width: 188rpx;
+ height: 100%;
display: flex;
- flex-direction: column;
align-items: center;
justify-content: center;
- image {
- width: 36rpx;
- height: 36rpx;
- }
- text {
- font-weight: 400;
- font-size: 24rpx;
- color: #222222;
- margin-top: 8rpx;
- }
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #8B2300;
}
- .footer-bottom-btn {
+ .box-hz-btn-next {
flex: 1;
- height: 88rpx;
+ height: 100%;
display: flex;
align-items: center;
justify-content: center;
- background: #00BC12;
- box-shadow: 0rpx 8rpx 12rpx 0rpx rgba(91,190,56,0.16);
- border-radius: 44rpx;
- text {
- &:nth-child(1) {
- font-weight: 500;
- font-size: 32rpx;
- color: #FFFFFF;
- }
- &:nth-child(2) {
- font-weight: 500;
- font-size: 26rpx;
- color: #FFFFFF;
- }
- }
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
}
}
+ // .footer-bottom {
+ // width: 100%;
+ // display: flex;
+ // align-items: center;
+ // justify-content: space-between;
+ // .footer-bottom-kf {
+ // flex-shrink: 0;
+ // margin-right: 40rpx;
+ // display: flex;
+ // flex-direction: column;
+ // align-items: center;
+ // justify-content: center;
+ // image {
+ // width: 36rpx;
+ // height: 36rpx;
+ // }
+ // text {
+ // font-weight: 400;
+ // font-size: 24rpx;
+ // color: #222222;
+ // margin-top: 8rpx;
+ // }
+ // }
+ // .footer-bottom-btn {
+ // flex: 1;
+ // height: 88rpx;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
+ // background: #00BC12;
+ // box-shadow: 0rpx 8rpx 12rpx 0rpx rgba(91,190,56,0.16);
+ // border-radius: 44rpx;
+ // text {
+ // &:nth-child(1) {
+ // font-weight: 500;
+ // font-size: 32rpx;
+ // color: #FFFFFF;
+ // }
+ // &:nth-child(2) {
+ // font-weight: 500;
+ // font-size: 26rpx;
+ // color: #FFFFFF;
+ // }
+ // }
+ // }
+ // }
}
.box {
width: 100%;
@@ -1259,6 +1833,44 @@
border-radius: 16rpx;
margin-top: 30rpx;
}
+ }
+ .nav-scroll {
+ white-space: nowrap; /* 闃叉瀵艰埅椤规崲琛� */
+ margin-bottom: 50rpx;
+ height: 66rpx;
+ overflow: auto; /* 鍏佽婊氬姩鏉″嚭鐜� */
+ .nav-item {
+ display: inline-block; /* 浣垮鑸」姘村钩鎺掑垪 */
+ margin-right: 60rpx;
+ position: relative;
+ text {
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #666666;
+ }
+ .nav-item-x {
+ width: 40rpx;
+ height: 6rpx;
+ position: absolute;
+ bottom: -10rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ background: #FF5A40;
+ border-radius: 3rpx;
+ }
+ // padding: 10px 20px; /* 璁剧疆鍐呰竟璺� */
+ // margin-right: 10px; /* 璁剧疆鍙宠竟璺� */
+ // background-color: #f0f0f0; /* 璁剧疆鑳屾櫙鑹� */
+ // border: 1px solid #ddd; /* 璁剧疆杈规 */
+ // border-radius: 5px; /* 璁剧疆鍦嗚 */
+ }
+ .active {
+ text {
+ font-weight: 600 !important;
+ font-size: 32rpx !important;
+ color: #222222 !important;
+ }
+ }
}
.box-hz-cate {
width: 100%;
@@ -1392,7 +2004,7 @@
flex-shrink: 0;
}
text {
- flex: 1;
+ width: 470rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -1447,5 +2059,68 @@
}
}
}
+ .phone {
+ width: 100%;
+ padding-top: 40rpx;
+ box-sizing: border-box;
+ .phone-botton {
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ margin-top: 60rpx;
+ }
+ .phone-head {
+ width: 100%;
+ text-align: center;
+ justify-content: space-between;
+ margin-bottom: 40rpx;
+ text {
+ font-weight: 800;
+ font-size: 32rpx;
+ color: #222222;
+ }
+ }
+
+ .phone-item {
+ width: 100%;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ // border-bottom: 1rpx solid #eeeeee;
+ line-height: 78rpx;
+ button{
+ border: 1rpx white solid;
+ display: inline;
+ width: 300rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ color: #222222;
+ }
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 30rpx;
+ }
+ .line{
+ width: 100%;
+ height: 1rpx;
+ background-color: #f2f2f2
+ }
+ text {
+ font-weight: 500;
+ font-size: 28rpx;
+ line-height: 28rpx;
+ color: #222222;
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.3