From e927acc7946a473affce3a6d9f6b38cfd4512beb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 12:19:35 +0800
Subject: [PATCH] 前端

---
 small-program/pages/order-details/order-details.vue |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index db76e11..bc57561 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -171,9 +171,9 @@
 				<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 ===3 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">鍘绘敮浠�</view>
 				<view class="order-footer-btn-b" v-if="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.releaseMemberId && (info.isUpdate==1 && info.status ===2)">淇敼纭</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-b" @click="show3 =true" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">寮�濮嬩綔涓�</view>
-				<view class="order-footer-btn-b"  @click="show4 =true" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">鎶㈠崟</view>
+				<view class="order-footer-btn-b"  @click="show6 =true" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">鎶㈠崟</view>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
 		</view>
@@ -208,7 +208,7 @@
 		</u-modal>
 		<u-modal
 			title="娓╅Θ鎻愮ず"
-			:show="show5"
+			:show="show6"
 			closeOnClickOverlay
 			showCancelButton
 		>
@@ -216,7 +216,7 @@
 				纭鎶㈠崟鍚楋紵
 			</view>
 			<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
-				<view class="btn1" @click="show4 = false">鎴戝啀鎯虫兂</view>
+				<view class="btn1" @click="show6 = false">鎴戝啀鎯虫兂</view>
 				<view class="btn2" @click="acceptDo">纭鎺ュ崟</view>
 			</view>
 		</u-modal>
@@ -296,6 +296,7 @@
 				show3:false,
 				show4:false,
 				show5:false,
+				show6:false,
 				value:0,
 				wayList:[],
 				bgImg: require('@/static/image/bg_green@2x.png'),
@@ -412,11 +413,15 @@
 			confirmUpdDo(status){
 				var that = this
 				var param = {orderId: this.id,status:status}
-				this.$u.api.confirmUpdDo(param).then(res =>{
+				this.$u.api.confirmUpd(param).then(res =>{
 					if(res.code ===200){
 						that.show5=false
 						uni.showToast({ title: '纭鎴愬姛', icon: 'error', duration: 2000 });
-						that.getOrderData()
+						if(status==1){
+							uni.navigateBack({ delta: 1 })
+						}else{
+							that.getOrderData()
+						} 
 					}
 				}) 
 			},
@@ -425,7 +430,7 @@
 				var param = {orderId: this.id}
 				this.$u.api.accept(param).then(res =>{
 					if(res.code ===200){
-						that.show4=false
+						that.show6=false
 						uni.showToast({ title: '鎶㈠崟鎴愬姛', icon: 'error', duration: 2000 });
 						that.getOrderData()
 					}
@@ -439,6 +444,11 @@
 						that.show=false
 						uni.showToast({ title: '璁㈠崟鍙栨秷鎴愬姛', icon: 'error', duration: 2000 });
 						that.getOrderData()
+						if(that.userInfo.id !== that.info.releaseMemberId){
+							uni.navigateBack({ delta: 1 })
+						}else{
+							that.getOrderData()
+						} 
 					}
 				 }) 
 			},

--
Gitblit v1.9.3