From d7c630319b0476602eac576f06ec75e1e3834dfa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 10:39:01 +0800
Subject: [PATCH] 前端

---
 small-program/pages/order-details/order-details.vue |  128 ++++++++++++++++++++++++++++++++----------
 1 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index cef62de..d73a0a0 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -5,16 +5,16 @@
 		</view> -->
 		<view class="order-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
 			<view class="order-head-status">{{info.statusName || ''}}</view> 			
-			<view class="order-head-info" v-if="userInfo.id === info.acceptMemberId && info.isUpdate ==1" style="color: red;">
+			<view class="order-head-info" v-if="isAcceptor && info.isUpdate ==1" style="color: red;">
 				璁㈠崟淇℃伅宸蹭慨鏀癸紝璇峰強鏃剁‘璁わ紝{{timeInfo}}鍚庡皢鑷姩鍚屾剰
 			</view> 
 			<view class="order-head-info" v-else >{{getStatusInfo()}}</view> 
 		</view>
 		<view class="order-quxiao">
-			<view class="order-quxiao-btn" @click="show = true" v-if="(userInfo.id === info.acceptMemberId && info.status ===2) || (userInfo.id === info.releaseMemberId  &&  info.isUpdate!=1 &&  info.status ===2)">鍙栨秷璁㈠崟</view>
-			<view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && info.type!=2 &&  info.isUpdate!=1 &&   info.status ===2 " @click="jumpEdit()">淇敼璁㈠崟</view>
+			<view class="order-quxiao-btn" @click="show = true" v-if="(isAcceptor && info.status ===2) || (isPushlishor  &&  info.isUpdate!=1 &&  info.status ===2)">鍙栨秷璁㈠崟</view>
+			<view class="order-quxiao-btn1" v-if="isPushlishor && info.type!=2 &&  info.isUpdate!=1 &&   info.status ===2 " @click="jumpEdit()">淇敼璁㈠崟</view>
 		</view>
-		<view class="order-user"  v-if="userInfo.id === info.releaseMemberId && info.acceptMemberId">
+		<view class="order-user"  v-if="isPushlishor && info.acceptMemberId">
 			<view class="order-user-info">
 				<view class="user-info-l">
 					<view class="user-info-l-image">
@@ -105,7 +105,7 @@
 					</view>
 				</view>
 				
-				<view class="price-row" v-if="userInfo.id === info.acceptMemberId">
+				<view class="price-row" v-if="isAcceptor">
 					<view class="price-row-label">瀹為檯鍒拌处(鍏�)</view>
 					<view class="price-row-val" style="color: #FF0000;">
 						楼{{((info.estimatedAccount * (1 - (info.platformRata || 0))) / 100).toFixed(2) }}
@@ -122,7 +122,7 @@
 				{{ info.commentInfo || '-'}}
 			</view>
 		</view>
-		<view class="order-ren" v-if="userInfo.id === info.acceptMemberId">
+		<view class="order-ren" v-if="isAcceptor">
 			<view class="order-ren-left">
 				<view class="order-ren-left-img">
 					<image v-if="info.releaseCoverImage" :src="info.releaseCoverImage" mode="widthFix"></image>
@@ -178,20 +178,20 @@
 		</view>
 		<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
 		<view class="order-footer" v-if="![99].includes(info.status)">
-			<template v-if="(userInfo.id === info.releaseMemberId) && info.isUpdate!=1 &&info.status ===2">
+			<template v-if="isPushlishor && info.isUpdate!=1 &&info.status ===2">
 				<sunui-mverify hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
 			</template>
 			<view class="order-footer-btn" v-else> 
-				<view class="order-footer-btn-a" @click="show = true" v-if="1==2&& userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
-				<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
-				<view class="order-footer-btn-b" @click="show2=true" v-if="userInfo.id === info.releaseMemberId && (info.status ===4 && info.commentStatus!=1)">鍘昏瘎浠�</view>
-				<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId &&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '瀹屾垚骞舵敮浠�'}}</view>
-				<view class="order-footer-btn-a" @click="show7 = true" v-if=" info.type!==2 && userInfo.id === info.acceptMemberId && info.status ===3">纭璐圭敤</view>
-				<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && ((info.status ===3 && info.type===2))" @click="payment1">瀹屾垚浣滀笟</view>
-				<view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
-				<view class="order-footer-btn-b" @click="show5 =true" v-if="userInfo.id === info.acceptMemberId && (info.isUpdate==1 && info.status ===2)">淇敼纭</view>
+				<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-a" @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>
+				<view class="order-footer-btn-b" @click="show5 =true" v-if="isAcceptor&& (info.isUpdate==1 && info.status ===2)">淇敼纭</view>
 				<!-- <view class="order-footer-btn-b" @click="startJobs()" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">寮�濮嬩綔涓�</view> -->
-				<view class="order-footer-btn-b"  @click="show6 =true" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">鎶㈠崟</view>
+				<view class="order-footer-btn-b"  @click="show6 =true" v-if="!isPushlishor && (info.status ===1)">鎶㈠崟</view>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
 		</view>
@@ -289,27 +289,18 @@
 					<viem class=" money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
 				</view>
 				<view class="querenfee-c" >					 
-					<view class="querenfee-c-info1" v-if="info.type ==1 && info.carType ==0"><text style="color: red;">*</text>瀹為檯鐢ㄨ溅澶╂暟锛�</view>
-					<view class="querenfee-c-info1" v-if="info.type ==1 && info.carType ==1"><text style="color: red;">*</text>瀹為檯鐢ㄨ溅娆℃暟锛�</view>
-					<view class="querenfee-c-info1" v-if="info.type ==0 && info.workType ==0"><text style="color: red;">*</text>瀹為檯閲囨憳閲嶉噺锛�</view>
-					<view class="querenfee-c-info1" v-if="info.type ==0 && info.workType ==1"><text style="color: red;">*</text>瀹為檯鐢ㄥ伐澶╂暟锛�</view>
-					<view class="querenfee-c-info1" v-if="info.type ==0 && info.workType ==2"><text style="color: red;">*</text>瀹為檯鐢ㄨ溅娆℃暟锛�</view>
+					<view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam1.name}}锛�</view>
 					<view class="querenfee-c-input"> 
 						<input type="number" v-model="feeForm.priceNum1"   placeholder="璇疯緭鍏�" />
 					</view>
-					<text class="querenfee-c-info1" v-if="info.type ==1 && info.carType ==0">澶�</text>
-					<text class="querenfee-c-info1" v-if="info.type ==1 && info.carType ==1">娆�</text>
+					<text class="querenfee-c-info1" >{{feeFrom.priceParam1.unit}}</text>
 				</view>
-				<view class="querenfee-c"  v-if="info.type ==0 && (info.workType ==1 ||info.workType ==2)">
-					<view class="querenfee-c-info1" v-if="info.workType ==1"><text style="color: red;">*</text>瀹為檯鐢ㄥ伐浜烘暟锛�</view>
-					<view class="querenfee-c-info1" v-if="info.workType ==2 && info.carType ==0"><text style="color: red;">*</text>瀹為檯鐢ㄥ伐浜烘暟锛�</view>
-					<view class="querenfee-c-info1" v-if="info.workType ==2 && info.carType ==1"><text style="color: red;">*</text>瀹為檯鐢ㄥ伐鏃堕棿锛�</view>
-					<view class="querenfee-c-info1" v-if="info.workType ==2 && info.carType ==1"><text style="color: red;">*</text>瀹為檯鐢ㄥ伐鏃堕棿锛�</view>
+				<view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null">
+					<view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam2.name}}锛�</view>
 					<view class="querenfee-c-input"> 
 						<input type="number" v-model="feeForm.priceNum2"   placeholder="璇疯緭鍏�" />
 					</view>
-					<text class="querenfee-c-info1" v-if="info.workType ==1">浜�</text>
-					<text class="querenfee-c-info1" v-if="info.workType ==2 && ">娆�</text>
+					<text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text>
 				</view>
 				<view class="querenfee-c">
 					<view class="querenfee-c-info1">鍏朵粬璐圭敤锛�</view>
@@ -369,6 +360,8 @@
 		},
 		data() {
 			return {
+				isPushlishor:false,
+				isAcceptor:false,
 				show: false,
 				show1: false,
 				show2: false,
@@ -391,6 +384,14 @@
 				amount: '',
 				confirmPayFee:0.00,
 				feeFrom:{
+					priceParam1:{
+						name:null,
+						unit:null
+					},
+					priceParam2:{
+						name:null,
+						unit:null
+					}
 					priceNum1:null,
 					priceNum2:null,
 					confirmFeeRemark:null,
@@ -658,10 +659,26 @@
 			getOrderData(){
 				var that = this
 				var param ={ orderId:that.id}
+				this.isPushlishor =false
+				this.isAcceptor =false
 				this.$u.api.getDetail(param).then(res =>{
 					if(res.code ===200){
-						if(that.userInfo.id === res.data.releaseMemberId || that.userInfo.id === res.data.acceptMemberId ){
+						if(that.userInfo.id === res.data.releaseMemberId ){
+							//濡傛灉鏄彂鍗曟柟
+							that.isPushlishor =true
+						}else if(that.userInfo.id ===res.data.acceptMemberId ){
+							//濡傛灉鏄帴鍗曟柟
+							that.isAcceptor =true
+						}
+						if(that.isAcceptor ||that.isAcceptor ){
 							that.info = res.data
+							if(that.userInfo.id === that.info.releaseMemberId ){
+								//濡傛灉鏄彂鍗曟柟
+								that.isPushlishor =true
+							}else if(that.userInfo.id === that.info.acceptMemberId ){
+								//濡傛灉鏄帴鍗曟柟
+								that.isAcceptor =true
+							}
 							that.amount = ((that.info.estimatedAccount || 0) / 100).toFixed(2)
 							if(that.info.wayInfo){
 								that.wayList = JSON.parse(that.info.wayInfo)
@@ -669,11 +686,60 @@
 							if(res.data.isUpdate == 1){
 								that.updateTimeInfo()
 							}
+							that.initPriceNumParam()
 						}else{
 							uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
 						}
 					}
 				 }) 
+			},
+			initPriceNumParam(){
+				this.feeFrom.priceParam1.name =null
+				this.feeFrom.priceParam1.unit =null
+				this.feeFrom.priceParam2.name =null
+				this.feeFrom.priceParam2.unit =null
+				if(this.info.type==0 && this.info.workType==1){
+					//鍒嗘嫞宸�
+					this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐澶╂暟锛�'
+					this.feeFrom.priceParam1.unit ='澶�'
+					this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+					this.feeFrom.priceParam2.unit ='浜�'
+				}else if(this.info.type==0 && this.info.workType==0){
+					//閲囨憳宸�
+					this.feeFrom.priceParam1.name ='瀹為檯閲囨憳閲嶉噺锛�'
+					this.feeFrom.priceParam1.unit ='鏂�'
+					this.feeFrom.priceParam2.name =null
+					this.feeFrom.priceParam2.unit =null
+				}else if(this.info.type==0 && this.info.workType==2){
+					//鍖呰宸�
+					if(this.info.carType==0){
+						//鎸夊ぉ
+						this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐澶╂暟锛�'
+						this.feeFrom.priceParam1.unit ='澶�'
+						this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+						this.feeFrom.priceParam2.unit ='浜�'
+					}else if(this.info.carType==1){
+						//鎸夊皬鏃�
+						this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐鏃堕棿锛�'
+						this.feeFrom.priceParam1.unit ='鏃�'
+						this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+						this.feeFrom.priceParam2.unit ='浜�'
+					}else if(this.info.carType==1){
+						//鎸夊皬鏃�
+						this.feeFrom.priceParam1.name ='瀹為檯鍖呰閲嶉噺锛�'
+						this.feeFrom.priceParam1.unit ='鏂�'
+						this.feeFrom.priceParam2.name =null
+						this.feeFrom.priceParam2.unit =null
+					}					 
+				}else if(this.info.type==1 && this.info.carType==0){
+					//杩愯揣鍗� 鎸夊ぉ鏁�
+					this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅澶╂暟锛�'
+					this.feeFrom.priceParam1.unit ='澶�' 
+				}else if(this.info.type==1 && this.info.carType==1){
+					//杩愯揣鍗� 鎸夋鏁�
+					this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅娆℃暟锛�'
+					this.feeFrom.priceParam1.unit ='娆�' 
+				}
 			}
 		}
 	}

--
Gitblit v1.9.3