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

---
 small-program/pages/order-details/order-details.vue |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 5 deletions(-)

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 });

--
Gitblit v1.9.3