子单详情展示加价及超时记录；完单提交后回到我的订单-确认中；子单进入确认中或者从确认中回到服务中更新待服务及已服务商品数量

common/js/request.js

@@ -665,5 +665,5 @@ export default {
 		})
 		// res.latitude, res.longitude
 		return res;
-	},
+	}
 }

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',
+						icon: 'success',
-						title: '提交成功，请在我的订单-确认中查看',
+						title: '提交成功',
-						duration: 2500
+						duration: 1500
 					})
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/order-manage/order-manage?tabCur=3'
+						})
+					}, 1500);
 				} else if (res && res.msg) {
 					uni.showToast({
 						icon: 'none',

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

pages/order-manage/serv-detail.vue

@@ -76,20 +76,20 @@
 				<text>订单金额：</text>
 				<text class="text-price">{{servDetail.totalMoney}}</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-sm" v-if="servDetail.customerRemark">
+			<view class="text-sm text-gray margin-left-lg"
-				<text class="cuIcon-message text-main-color margin-right-xs"></text>
-				<text>备注：{{servDetail.customerRemark}}</text>
-			</view>
-			<!-- <view class="margin-top-xs text-sm text-gray"
 				v-for="(item, index) in servDetail.orderTimeoutRecords">
-				超时扣款：<text class="text-price">{{item.price}}</text>
+				超时扣款：<text class="text-price margin-top-xs">-{{item.payMoney}}</text>[{{item.fineStatus == 1 ? '已扣款' : '未扣款'}}]
-			</view> -->
+			</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) {