From bd3532fe7a9c0dea5afc85bceae6ca2e733c42cc Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 30 Nov 2022 02:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=95=E8=AF=A6=E6=83=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=A0=E4=BB=B7=E5=8F=8A=E8=B6=85=E6=97=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=9B=E5=AE=8C=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95-?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=AD=EF=BC=9B=E5=AD=90=E5=8D=95=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=A1=AE=E8=AE=A4=E4=B8=AD=E6=88=96=E8=80=85=E4=BB=8E?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=AD=E5=9B=9E=E5=88=B0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E6=9B=B4=E6=96=B0=E5=BE=85=E6=9C=8D=E5=8A=A1=E5=8F=8A?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=8D=E5=8A=A1=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                |  2 +-
 pages/order-manage/finish-order.vue | 14 +++++----
 pages/order-manage/order-manage.vue |  7 +++--
 pages/order-manage/serv-detail.vue  | 45 ++++++++++++++++++++---------
 4 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 3550045..98c9d9f 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -665,5 +665,5 @@ export default {
 		})
 		// res.latitude, res.longitude
 		return res;
-	},
+	}
 }
diff --git a/pages/order-manage/finish-order.vue b/pages/order-manage/finish-order.vue
index f66162d..62401fd 100644
--- a/pages/order-manage/finish-order.vue
+++ b/pages/order-manage/finish-order.vue
@@ -163,14 +163,16 @@
 					assessLabels: this.checkIndexArr
 				});
 				if (res && res.code === 0) {
-					uni.navigateBack({
-						delta: -1
-					})
 					uni.showToast({
-						icon: 'none',
-						title: '提交成功，请在我的订单-确认中查看',
-						duration: 2500
+						icon: 'success',
+						title: '提交成功',
+						duration: 1500
 					})
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/order-manage/order-manage?tabCur=3'
+						})
+					}, 1500);
 				} else if (res && res.msg) {
 					uni.showToast({
 						icon: 'none',
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 2209306..1467278 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -506,7 +506,10 @@
 				orderStatistics: {}
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			if (option && option.tabCur) {
+				this.tabCur = option.tabCur;
+			}
 			this.loadData();
 			this.bindEvent();
 		},
@@ -940,7 +943,7 @@
 					// TODO:更新此订单信息
 					uni.showToast({
 						icon: 'none',
-						title: '订单编码：' + order.orderDetailCode + '已进入分账中，请重新进入确认中栏目',
+						title: '订单编码：' + order.orderDetailCode + '已进入分账中，请再次点击确认中栏目',
 						duration: 3000
 					})
 				}
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index 4102da5..e99b81e 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -75,21 +75,21 @@
 				<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
 				<text>订单金额：</text>
 				<text class="text-price">{{servDetail.totalMoney}}</text>
-			</view>
-			<view class="margin-top-sm">
-				<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
-				<text>服务金额：</text>
-				<text class="text-price" v-if="servDetail.orderDetailId != null">{{servDetail.payMoney}}</text>
-				<text class="text-price" v-else>{{servDetail.serverMoney}}</text>
 			</view>
 			<view class="margin-top-sm" v-if="servDetail.customerRemark">
 				<text class="cuIcon-message text-main-color margin-right-xs"></text>
 				<text>备注：{{servDetail.customerRemark}}</text>
+			</view>
+			<view class="margin-top-sm">
+				<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
+				<text>服务金额：</text>
+				<text class="text-price" v-if="servDetail.orderDetailId != null">{{servDetail.payMoney}}</text>
+				<text class="text-price" v-else>{{servDetail.serverMoney}}</text>
 			</view>
-			<!-- <view class="margin-top-xs text-sm text-gray"
+			<view class="text-sm text-gray margin-left-lg"
 				v-for="(item, index) in servDetail.orderTimeoutRecords">
-				超时扣款：<text class="text-price">{{item.price}}</text>
-			</view> -->
+				超时扣款：<text class="text-price margin-top-xs">-{{item.payMoney}}</text>[{{item.fineStatus == 1 ? '已扣款' : '未扣款'}}]
+			</view>
 		</view>
 		<!-- 待服务列 -->
 		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
@@ -102,6 +102,24 @@
 				<product-picked :product="servDetail" :pickedList="servDetail.standardList" :columnTitleArr="servingColumnHeaders" :valFieldArr="servingValFields"></product-picked>
 			</view>
 		</view>
+		<!-- 加价记录 子单详情展示 -->
+		<view v-if="servDetail.orderDetailId != null && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
+			<view class="cu-bar solid-bottom">
+				<view class="action bar-first-action">
+					<text class="cuIcon-titles text-main-color"></text> 加价记录
+				</view>
+			</view>
+			<view class="padding-tb-sm" v-for="(changeRecord, changeRecordIndex) in servDetail.financialChangeRecords">
+				<view>
+					<text>加价金额：</text>
+					<text>{{changeRecord.changeMoney}}</text>
+				</view>
+				<view>
+					<text>加价备注：</text>
+					<text v-if="changeRecord.remark">{{changeRecord.remark}}</text>
+				</view>
+			</view>
+		</view>
 		<!-- 完工图片 子单详情展示 -->
 		<view v-if="servDetail.orderDetailId != null && servDetail.orderStatus > 3 && servDetail.finishImgList && servDetail.finishImgList.length" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
 			<view class="cu-bar solid-bottom">
@@ -118,13 +136,13 @@
 				<text>备注：{{servDetail.workerRemark}}</text>
 			</view>
 		</view>
-		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
+		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-if="servDetail.orderDetailId != null && servDetail.afterServiceRecordList && servDetail.afterServiceRecordList.length > 0">
 			<view class="cu-bar solid-bottom">
 				<view class="action bar-first-action">
 					<text class="cuIcon-titles text-main-color"></text> 售后记录
 				</view>
 			</view>
-			<view v-for="(afterServiceRecord, afterServiceRecordIndex) in servDetail.afterServiceRecordList" v-if="servDetail.orderDetailId != null">
+			<view v-for="(afterServiceRecord, afterServiceRecordIndex) in servDetail.afterServiceRecordList">
 				<view v-if="afterServiceRecord.createBy == 1" class="padding-tb-sm solid-top">
 					<view class='cu-tag bg-main-color radius light'>售后发起中</view>
 					<view v-if="afterServiceRecord.operType === 1">
@@ -312,7 +330,7 @@
 					</view>
 					<view>
 						<text>加价备注：</text>
-						<text>{{changeRecord.remark}}</text>
+						<text v-if="changeRecord.remark">{{changeRecord.remark}}</text>
 					</view>
 				</view>
 			</view>
@@ -540,7 +558,8 @@
 					name: '申请退单',
 					action: 'applyCancelOrder'
 				}],
-				sendUrgentMsgModal: false
+				sendUrgentMsgModal: false,
+				overtimeRecords: null
 			}
 		},
 		onLoad(options) {