From 2ad8087bfd9f26f5ba2dc563e0f4014a6d97e395 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 21 Nov 2022 01:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E6=8A=A5/=E8=B6=85=E6=97=B6/=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E4=B8=89=E4=B8=AA=E7=8A=B6=E6=80=81=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=85=A8=E9=83=A8=E8=87=AA=E5=B7=B1=E6=89=BF=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E7=9B=91=E6=8E=A7=E5=8D=95=EF=BC=9B=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=88=86=E8=B4=A6=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/order-manage.vue | 31 +++++++++++++++++++----------
 pages/order-manage/serv-detail.vue  |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index eaf4e5d..e7ce632 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -163,14 +163,14 @@
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
 				<text>完成时间：{{order.workFinishTime}}</text>
 			</view>
-			<view class="margin-top-sm flex justify-start align-center" v-if="order.subState === 4 && order.chargeReachDate">
+			<view class="margin-top-sm flex justify-start align-center" v-if="order.orderDetailId != null && tabCur === 3">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
-				<text>距到帐：</text>
-				<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
-					:day="$dateUtil.countDownDiff(order.chargeReachDate).day" 
-					:hour="$dateUtil.countDownDiff(order.chargeReachDate).hour" 
-					:minute="$dateUtil.countDownDiff(order.chargeReachDate).min" 
-					:second="$dateUtil.countDownDiff(order.chargeReachDate).seconds">
+				<text>距完单分帐：</text>
+				<uni-countdown :show-colon="false" :backgroundColor="'#e35b33'" :color="'#faf3f0'"
+					:day="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).day" 
+					:hour="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).hour" 
+					:minute="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).min" 
+					:second="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).seconds">
 				</uni-countdown>
 			</view>
 			<!-- 不同状态订单支持不同操作按钮 -->
@@ -583,6 +583,8 @@
 					} else if (this.stateList[this.stateCur].code === 104) {
 						// 搁置单
 						params.shelveStatus = 1;
+						params.isMonitoredOrder = true;
+						params.allSelfAssigned = 0;
 					} else if (this.stateList[this.stateCur].code === 105) {
 						// 监控单
 						// params.orderStatuses = "2,3,4,5";
@@ -590,10 +592,19 @@
 					} else if (this.stateList[this.stateCur].code === 103) {
 						// 超时单
 						params.isMonitoredOrder = true;
+						params.allSelfAssigned = 0;
+					}
+					//  else if (this.stateList[this.stateCur].code === 100) {
+					// 	// 急报单
+					// 	params.isMonitoredOrder = true;
+					// 	params.allSelfAssigned = 0;
+					// }
+				} else if (this.tabCur != null) {
+					if (this.tabCur === 4) {
+						// 售后中的单
+						params.isMonitoredOrder = true;
+						params.allSelfAssigned = 0;
 					}
-				} else if (this.tabCur != null && this.tabCur === 4) {
-					// 售后中的单
-					params.isMonitoredOrder = true;
 				}
 				try {
 					let res = null;
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index f8203b5..4102da5 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -33,7 +33,7 @@
 			<view class="flex align-center">
 				<text class="text-xl margin-right">{{servDetail.goodsName}}</text>
 				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 5">已完成</view>
-				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">待确认</view>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">确认中</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 1">未约/未排</view>