From acb05239afb477efc73874fd88bdc502ce94c2b2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 17:20:43 +0800
Subject: [PATCH] 前端

---
 small-program/pages/packaging-worker/packaging-worker.vue |   10 +-
 small-program/pages/demand-hall/demand-hall.vue           |   31 ++++---
 small-program/pages/sorting/sorting.vue                   |    6 
 small-program/pages/using-workers/using-workers.vue       |    6 
 small-program/pages/index/index.vue                       |   50 ++++++++++-
 small-program/pages/order-details/order-details.vue       |   47 ++++++++++-
 small-program/pages/freight/freight.vue                   |   33 +++++--
 7 files changed, 136 insertions(+), 47 deletions(-)

diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 4d610ed..6bbf0a1 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -45,13 +45,13 @@
 							<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">杩愯揣鍗�</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" v-if="item.status === 1">寰呮帴鍗曟柟鎺ュ崟</view>
+						<view class="index-list-item-head-r" v-if="item.status === 0 || item.status === 5">寰呮敮浠�</view>
+						<view class="index-list-item-head-r" v-if="item.status === 1">寰呮帴鍗�</view>
 						<view class="index-list-item-head-r" v-if="item.status === 2&& item.isUpdate != 1">宸叉帴鍗�</view>
 						<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
-						<view class="index-list-item-head-r" v-if="item.status === 2 && item.isUpdate == 1">宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</view>
 						<view class="index-list-item-head-r hui" v-if="item.status === 4 && item.commentStatus !== 0">宸插畬鎴�</view>
 						<view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
 						<view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">寰呰瘎浠�</view>
@@ -66,10 +66,7 @@
 						{{item.categoryName}}锝渰{item.priceNum1}}浜�
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.categoryName}}-{{item.carUnit}}  
-					</view>
-					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+						{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 2">
 						{{item.wayInfoCopy}}
@@ -98,7 +95,13 @@
 						<text>楼{{item.estimatedAccount / 100}}</text>
 					</view>
 					<view class="eidt">
-						<view></view>
+						<view>
+							<view class="eidt-tips" v-if="item.status === 2 && item.isUpdate == 1"><text>宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</text></view>
+							<view class="eidt-tips" v-if="item.status === 5">
+								<image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
+								<text>鎺ュ崟鏂瑰凡纭璐圭敤锛岃鏀粯</text>
+							</view>
+					 	</view>
 						<view class="eidt-right">
 							<view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click.stop="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
 							<view class="eidt-phone" v-if="[2].includes(item.status)">鑱旂郴甯堝倕</view>
@@ -106,7 +109,7 @@
 							<view class="eidt-btn" v-if="[0,1,2].includes(item.status) && item.type !== 2 &&  item.isUpdate!=1" @click.stop="jumpEdit(item)">淇敼璁㈠崟</view>
 							<view class="eidt-btn" v-if="(item.type  == 2 && item.status === 0)" @click.stop="jumpEdit(item)">缁х画鏀粯</view>
 							<!-- <view class="eidt-btn" v-if="item.status === 2" @click.stop="startJobs(item.id)">寮�濮嬩綔涓�</view> -->
-							<view class="eidt-btn" v-if="item.type != 2 && item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚骞舵敮浠�</view>
+							<view class="eidt-btn" v-if="item.type != 2 && item.status === 5" @click.stop="jumpDesc(item)">绔嬪嵆鏀粯</view>
 							<view class="eidt-btn" v-if="item.type == 2 && item.status === 3" @click.stop="jumpDesc(item)">瀹屾垚浣滀笟</view>
 						</view>
 					</view>
@@ -126,9 +129,10 @@
 							<text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
 							<text v-else-if="item.type === 1">杩愯揣鍗�</text>
 							<text v-else-if="item.type === 2">璁㈤鍗�</text>
-							<view class="tips" v-if="item.acceptType === 1">绯荤粺娲惧崟</view>
-							<view class="tips1" v-if="item.acceptType === 0">鑷富鎶㈠崟</view>
+							<view class="tips" v-if="item.acceptType === 1">娲惧崟</view>
+							<view class="tips1" v-if="item.acceptType === 0">鎶㈠崟</view>
 						</view>
+						<view class="index-list-item-head-r" v-if="item.status === 0 || item.status === 5">寰呮敮浠�</view>
 						<view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
 						<view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
 						<view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
@@ -277,8 +281,7 @@
 					{ name: '寰呮敮浠�', id: 0 },
 					{ name: '寰呮帴鍗�', id: 1 },
 					{ name: '宸叉帴鍗�', id: 2 },
-					{ name: '杩涜涓�', id: 3 },
-					{ name: '纭璐圭敤', id: 5 },
+					{ name: '杩涜涓�', id: 3 }, 
 					{ name: '宸插畬鎴�', id: 4 },
 					{ name: '宸插彇娑�', id: 99 },
 					{ name: '寰呰瘎浠�', id: 6 }
@@ -494,7 +497,7 @@
 				margin-top: 40rpx;
 				text-align: center;
 				text {
-					font-size: 30rpx;
+					font-size: 24rpx;
 					color: #666666;
 				}
 			}
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index 216c33f..20d0bfc 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -27,7 +27,7 @@
 				<view class="list-item-row" @click="show2 = true">
 					<view class="list-item-row-label">鐢ㄨ溅鏃堕棿<b>*</b></view>
 					<view class="list-item-row-val">
-						<text :style="{ color: form.startDate ? '#111111' : '' }">{{form.startDate ? form.startDate + ' 鑷� ' + form.endDate + ' (' + form.priceNum1 + '澶�) ' : '璇烽�夋嫨'}}</text>
+						<text :style="{ color: form.startDate ? '#111111' : '' }">{{form.startDate ? form.startDate + ' 鑷� ' + form.endDate + ' (' + form.totalDays + '澶�) ' : '璇烽�夋嫨'}}</text>
 						<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
 					</view>
 				</view>
@@ -130,11 +130,18 @@
 					<view class="list-item-cate">
 						<view :class="item.id === form.carType ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in ff" :key="index" @click="form.carType = item.id">{{item.name}}</view>
 					</view>
-					<view class="list-item-row">
-						<view class="list-item-row-label">澶╂暟</view>
+					<view class="list-item-row" v-if="form.carType==0">
+						<view class="list-item-row-label">鐢ㄨ溅澶╂暟</view>
 						<view class="list-item-row-val">
-							<input type="number" v-model="form.priceNum1" disabled placeholder="璇疯緭鍏�" />
+							<input type="number" v-model="form.totalDays" disabled placeholder="" />
 							<text>澶�</text>
+						</view>
+					</view>
+					<view class="list-item-row" v-if="form.carType==1">
+						<view class="list-item-row-label">鐢ㄨ溅娆℃暟<b>*</b></view>
+						<view class="list-item-row-val">
+							<input type="number" v-model="form.priceNum1"   placeholder="璇疯緭鍏�" />
+							<text>娆�</text>
 						</view>
 					</view>
 					<view class="list-item-row">
@@ -175,10 +182,10 @@
 					<text>鍏�</text>
 				</view>
 			</view>
-			<view class="footer-bottom">
-				<div class="footer-bottom-btn" @click="submit">
-					<text>绔嬪嵆涓嬪崟</text>
-					<text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+			<view class="footer-bottom"> 
+				<div class="footer-bottom-btn" @click="submit" >
+					<text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+					<text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
 				</div>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -262,6 +269,7 @@
 					categoryName: '',
 					wayInfoDTOList: [],
 					priceNum1: '',
+					totalDays:null,
 					priceNum2: 1,
 					transportNum: '',
 					transportTypeId: '',
@@ -307,6 +315,7 @@
 				}).then(res => {
 					if (res.code === 200) {
 						this.info = res.data
+						console.log(res.data.totalDays)
 						for (const key in this.form) {
 							this.form[key] = res.data[key]
 						}
@@ -328,7 +337,8 @@
 				this.form.endDate = res.endDate
 				this.form.lat = res.lat
 				this.form.lgt = res.lgt
-				this.form.priceNum1 = res.days
+				this.form.totalDays = res.days
+				this.form.priceNum1=res.days
 				this.form.categoryId = res.categoryId
 				this.form.categoryName = res.categoryName
 				this.form.location = res.location
@@ -377,6 +387,9 @@
 					uni.requestSubscribeMessage({
 						tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
 						success(res) {
+							if(that.form.carType == 0){
+								that.form.priceNum1 = that.form.totalDays
+							}
 							that.$u.api.release({
 								...that.form,
 								price: Number(that.form.price) * 100,
@@ -523,7 +536,7 @@
 				this.form.startDate = e[0]
 				this.form.endDate = e[e.length - 1]
 				let time = this.form.startDate == this.form.endDate ? 1 : 0
-				this.form.priceNum1 = e.length - time;
+				this.form.totalDays = e.length - time;
 				this.show2 = false
 			},
 			addAddr() {
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 9bd939d..41ec7ff 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -20,19 +20,17 @@
 				</view>
 			</view>
 			<view class="index-j-list">
-				<view class="index-list-item" v-if="orderList" v-for="(item, index) in orderList" :key="index">
+				<view class="index-list-item" v-if="orderList && orderList.length" v-for="(item, index) in orderList" :key="index">
 					<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}}-{{item.carUnit}}</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 class="index-list-item-head-r">{{item.distance}}km</view>
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
 						{{item.categoryName}}锝渰{item.priceNum1}}鏂�
@@ -44,7 +42,7 @@
 						{{item.categoryName}}锝渰{item.priceNum1}}浜�
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 1">
-						{{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+					{{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
 					</view>
 					<view class="index-list-item-info" v-if="item.type === 2">
 						{{item.wayInfoCopy}}
@@ -78,6 +76,8 @@
 						<view class="eidt-btn" @click="show1 = true, orderId = item.id">鎶㈠崟</view>
 					</view>
 				</view>
+				<view v-if="orderList && orderList.length&& !next" class="more">宸插姞杞藉叏閮�</view>
+				<view v-if="(!orderList || !orderList.length)&& !next"  class="more">鏆傛棤璁㈠崟鍝�</view>
 			</view>
 		</view>
 		
@@ -346,6 +346,20 @@
 				<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>
 
@@ -433,7 +447,9 @@
 				
 				isOnce: true,
 				show1: false,
-				orderId: null
+				show2: false,
+				orderId: null,
+				payOrderId:null
 			}
 		},
 		async onLoad() { 
@@ -503,6 +519,7 @@
 				this.isLogin = false
 				console.log('鏈櫥闄�')
 			}
+			this.payOrderId=null 
 		},
 		watch: {
 			typeId: {
@@ -544,6 +561,14 @@
 			}
 		},
 		methods: {
+			goOrderDetail(id){
+				uni.navigateTo({
+					url: `/pages/order-details/order-details?id=`+id
+				})
+				this.orderId=null 
+				this.payOrderId=null 
+				this.show2=false
+			},
 			clearFormParam(){
 				this.form.startDate = ''
 				this.form.address = ''
@@ -606,6 +631,7 @@
 								that.next = true
 								that.orderList = []
 								that.getOrderList()
+								that.goOrderDetail(that.orderId)
 							}, 2000)
 						}
 					})
@@ -676,6 +702,7 @@
 			// 鎻愪氦璁㈠崟
 			submit() {
 				var that = this
+				this.payOrderId=null
 				if (!this.form.startDate) {
 					return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鏃堕棿', icon: 'none' })
 				} 
@@ -743,6 +770,8 @@
 										}
 									},
 									fail(err) {
+										that.payOrderId = res.data.id
+										that.show2=true
 										console.log(err)
 									}
 								})
@@ -1101,6 +1130,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;
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index fcce88d..fd1e830 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -8,6 +8,9 @@
 			<view class="order-head-info" v-if="isAcceptor && info.isUpdate ==1" style="color: red;">
 				璁㈠崟淇℃伅宸蹭慨鏀癸紝璇峰強鏃剁‘璁わ紝{{timeInfo}}鍚庡皢鑷姩鍚屾剰
 			</view> 
+			<view class="order-head-info" v-if="isPushlishor  && info.type ==2 && info.status ==0" style="color: red;">
+				鍓╀綑鏀粯鏀粯鏃堕棿锛寋{timeInfo1}}鍚庡皢鑷姩鍙栨秷
+			</view> 
 			<view class="order-head-info" v-else >{{getStatusInfo()}}</view> 
 		</view>
 		<view class="order-quxiao">
@@ -48,12 +51,12 @@
 			<view class="order-info-title">
 				<view class="x"></view>
 				<text v-if="info.type===0">鐢ㄥ伐鍗�-{{(info.workType===0?'閲囨憳宸�':(info.workType===1?'鍒嗘嫞宸�':'鍖呰宸�')) }}</text> 
-				<text v-if="info.type===1">杩愯揣鍗�-{{info.categoryName || ''}}-{{info.carUnit || ''}}</text>
+				<text v-if="info.type===1">杩愯揣鍗�-{{info.categoryName || ''}}</text>
 				<text v-if="info.type===2">璁㈤鍗�</text>
 				
 			</view>
 			<view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{info.workType === 0?'鏂�':'浜�'}}</view>
-			<view v-if="info.type===1" class="order-info-wz">{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view> 
+			<view v-if="info.type===1" class="order-info-wz">{{info.carUnit || ''}}{{' | '}}{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view> 
 			<view class="order-info-address">
 				<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
 				<view class="order-info-address-info">
@@ -193,7 +196,7 @@
 				<view class="order-footer-btn-a" @click="show = true" v-if="1==2&& isAcceptor && info.status ===2">鍙栨秷璁㈠崟</view>
 				<view class="order-footer-btn-a" @click="show = true" v-if="isPushlishor && (info.status ===0 ||  info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
 				<view class="order-footer-btn-b" @click="show2=true" v-if="isPushlishor && (info.status ===4 && info.commentStatus!=1)">鍘昏瘎浠�</view>
-				<view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '瀹屾垚骞舵敮浠�'}}</view>
+				<view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '绔嬪嵆鏀粯'}}</view>
 				<view class="order-footer-btn-b" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">纭璐圭敤</view>
 				<view class="order-footer-btn-b" v-if="isPushlishor && ((info.status ===3 && info.type===2))" @click="payment1">瀹屾垚浣滀笟</view>
 				<view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& isPushlishor && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
@@ -380,12 +383,15 @@
 				count: 5, 
 				show3:false,
 				timer:null,
+				timer1:null,
 				show4:false,
 				show5:false,
 				show6:false,
 				show7:false,
 				timeInfo:'00:00:00',
+				timeInfo1:'00:00:00',
 				lessTime:null,
+				lessTime1:null,
 				value:0,
 				wayList:[],
 				bgImg: require('@/static/image/bg_green@2x.png'),
@@ -623,6 +629,8 @@
 							return ''
 						}
 						return '鎮ㄥ凡鎺ュ崟锛岃鎸夋椂瀹屾垚璁㈠崟浠诲姟'
+					}else if(this.info.status === 5){
+						return '鎮ㄥ凡纭璐圭敤锛岀瓑寰呭彂鍗曟柟鏀粯'
 					}else if(this.info.status === 3){
 						return '璁㈠崟杩涜涓紝璇锋寜鏃跺畬鎴愯鍗曚换鍔�'
 					}else if(this.info.status === 4){
@@ -636,6 +644,8 @@
 						return '璇峰敖蹇畬鎴愭敮浠橈紝鍙戝竷璁㈠崟'
 					}else if(this.info.status === 1){
 						return '鎮ㄨ鍗曞凡缁忔垚鍔熷彂璧凤紝璇疯�愬績绛夊緟鎺ュ崟'
+					}else if(this.info.status === 5){
+						return '鎺ュ崟鏂瑰凡纭璐圭敤锛岃鏀粯'
 					}else if(this.info.status === 2){
 						if(this.info.isUpdate==1){
 							return '璁㈠崟宸蹭慨鏀癸紝璇风瓑寰呮帴鍗曟柟纭'
@@ -649,6 +659,28 @@
 						return '璁㈠崟宸插彇娑�'
 					}
 				}
+			},
+			updateTimeInfo1(){
+				if(this.timer1){
+					clearInterval(this.timer1)
+				} 
+				var that =this
+				this.lessTime1 = Math.floor( Number(that.info.cancelCountdown || 0)/1000) ;
+				if(this.lessTime1>0){
+					this.timer1 =  setInterval(function(){
+						   let h = Math.floor(that.lessTime1/60/60) ;
+						   let m = Math.floor((that.lessTime1 - h*60*60)/60); 
+						   let s=  Math.floor(that.lessTime1- h*60*60 -m*60);
+						   that.timeInfo1 =(h<10?'0':'')+ h+":"+(m<10?'0':'')+m+":"+(s<10?'0':'')+s;
+						   that.lessTime1 =that.lessTime1-1;
+						   if(that.lessTime1 <=0){
+							    that.timeInfo1 ="00:00:00"
+								clearInterval(that.timer1)
+						   }
+						   // console.log( that.timeInfo)
+					},1000) 
+				} 
+			
 			},
 			updateTimeInfo(){
 				if(this.timer){
@@ -664,6 +696,10 @@
 						   that.timeInfo =(h<10?'0':'')+ h+":"+(m<10?'0':'')+m+":"+(s<10?'0':'')+s;
 						   that.lessTime =that.lessTime-1;
 						   // console.log( that.timeInfo)
+						   if(that.lessTime<=0){
+								that.timeInfo ="00:00:00"
+								clearInterval(that.timer)
+						   }
 					},1000) 
 				}
 			
@@ -674,8 +710,6 @@
 				this.isPushlishor =false
 				this.isAcceptor =false
 				this.$u.api.getDetail(param).then(res =>{
-					console.error("=============================",res.data.releaseMemberId,res.data.acceptMemberId,that.userInfo.id)
-					
 					if(res.code ===200){
 						if(that.userInfo.id === res.data.releaseMemberId ){
 							//濡傛灉鏄彂鍗曟柟
@@ -700,6 +734,9 @@
 							if(res.data.isUpdate == 1){
 								that.updateTimeInfo()
 							}
+							if(res.data.status == 0){
+								that.updateTimeInfo1()
+							}
 							that.initPriceNumParam()
 						}else{
 							uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index f790397..9998066 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -85,8 +85,8 @@
 					</view>
 					<view class="list-item-row">
 						<view class="list-item-row-label" v-if="form.carType === 0">鐢ㄥ伐澶╂暟</view>
-						<view class="list-item-row-label" v-if="form.carType === 1">宸ヤ綔鏃堕暱</view>
-						<view class="list-item-row-label" v-if="form.carType === 2">鍖呰閲嶉噺</view>
+						<view class="list-item-row-label" v-if="form.carType === 1">宸ヤ綔鏃堕暱<b>*</b></view>
+						<view class="list-item-row-label" v-if="form.carType === 2">鍖呰閲嶉噺<b>*</b></view>
 						<view class="list-item-row-val">
 							<input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
 							<text v-if="form.carType === 0">澶�</text>
@@ -134,9 +134,9 @@
 				</view>
 			</view>
 			<view class="footer-bottom">
-				<div class="footer-bottom-btn" @click="submit">
-					<text>绔嬪嵆涓嬪崟</text>
-					<text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+				<div class="footer-bottom-btn" @click="submit" >
+					<text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+					<text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
 				</div>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index f311203..3cdd9aa 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/small-program/pages/sorting/sorting.vue
@@ -126,9 +126,9 @@
 				</view>
 			</view>
 			<view class="footer-bottom">
-				<div class="footer-bottom-btn" @click="submit">
-					<text>绔嬪嵆涓嬪崟</text>
-					<text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+				<div class="footer-bottom-btn" @click="submit" >
+					<text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+					<text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
 				</div>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index 28b762e..e319d7e 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -122,9 +122,9 @@
 				</view>
 			</view>
 			<view class="footer-bottom">
-				<div class="footer-bottom-btn" @click="submit">
-					<text>绔嬪嵆涓嬪崟</text>
-					<text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+				<div class="footer-bottom-btn" @click="submit" >
+					<text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+					<text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
 				</div>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>

--
Gitblit v1.9.3