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 @@
订单金额:
{{servDetail.totalMoney}}
-
-
-
- 服务金额:
- {{servDetail.payMoney}}
- {{servDetail.serverMoney}}
备注:{{servDetail.customerRemark}}
+
+
+
+ 服务金额:
+ {{servDetail.payMoney}}
+ {{servDetail.serverMoney}}
-
+ 超时扣款:-{{item.payMoney}}[{{item.fineStatus == 1 ? '已扣款' : '未扣款'}}]
+
@@ -102,6 +102,24 @@
+
+
+
+
+ 加价记录
+
+
+
+
+ 加价金额:
+ {{changeRecord.changeMoney}}
+
+
+ 加价备注:
+ {{changeRecord.remark}}
+
+
+
@@ -118,13 +136,13 @@
备注:{{servDetail.workerRemark}}
-
+
售后记录
-
+
售后发起中
@@ -312,7 +330,7 @@
加价备注:
- {{changeRecord.remark}}
+ {{changeRecord.remark}}
@@ -540,7 +558,8 @@
name: '申请退单',
action: 'applyCancelOrder'
}],
- sendUrgentMsgModal: false
+ sendUrgentMsgModal: false,
+ overtimeRecords: null
}
},
onLoad(options) {