diff --git a/pages/my/master-settled-info.vue b/pages/my/master-settled-info.vue
index 1d3ea60..08011ec 100644
--- a/pages/my/master-settled-info.vue
+++ b/pages/my/master-settled-info.vue
@@ -71,7 +71,7 @@
},
methods: {
loadData() {
- this.curUserInfo = this.$request.getCurUserInfo();
+ this.curUserInfo = this.$request.getCurUserNoCache();
this.loadServAreas();
this.loadServSkills();
this.loadSpecialSkills();
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 42e056d..d45fba4 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -94,9 +94,9 @@
服务时间:{{order.serverTime}}
-
+
- 上门时间:{{order.doorTime}}
+ 上门时间:{{order.workBeginTime}}
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index 1b507bf..5da76f3 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -58,7 +58,7 @@
-->
- 上门时间:{{servDetail.mainServOrder.doorTime}}
+ 上门时间:{{servDetail.workBeginTime}}
@@ -109,7 +109,7 @@
发送急报
- 立即上门
+ 立即上门
@@ -177,14 +177,14 @@
id: orderDetailId
});
this.servDetail = servDetailRes.data;
- this.finishList4Show = this.servDetail.finishRecord;
- for (let i = 0; i < this.finishList4Show.length; i++) {
- let finishList = this.finishList4Show[i].finishList;
- for (let j = 0; j < finishList.length; j++) {
- finishList[j].secondColumnNum = finishList[j].servedNum;
- }
- this.finishList4Show[i].finishList = finishList;
- }
+ // this.finishList4Show = this.servDetail.finishRecord;
+ // for (let i = 0; i < this.finishList4Show.length; i++) {
+ // let finishList = this.finishList4Show[i].finishList;
+ // for (let j = 0; j < finishList.length; j++) {
+ // finishList[j].secondColumnNum = finishList[j].servedNum;
+ // }
+ // this.finishList4Show[i].finishList = finishList;
+ // }
},
changePopupState(e) {
this.ifShowPageMeta = e.show;
@@ -211,6 +211,21 @@
url: '/pages/order-manage/cancel-order?params=' + encodeURIComponent(JSON.stringify(params))
})
},
+ async workBegin() {
+ let curDate = new Date();
+ let formatCurDate = curDate.getFullYear() + '-' + (curDate.getMonth() + 1) + '-' + curDate.getDate()
+ + ' ' + curDate.getHours() + ':' + curDate.getMinutes() + ':' + curDate.getSeconds();
+ let params = {
+ id: this.servDetail.orderDetailId,
+ orderStatus: 3,
+ workBeginTime: formatCurDate
+ }
+ console.log(params)
+ let res = await this.$request.updateDetailOrder(params);
+ if (res && res.code === 0) {
+ this.loadData(this.servDetail.orderDetailId);
+ }
+ },
showModal(e) {
this[e.currentTarget.dataset.modal] = true;
},