diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index 954677e..2df5dba 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -20,7 +20,7 @@
- 本单可派任务金额：{{totalMoney}}
+ 本单可派任务金额：{{curOrder.serverMoney}}
派单价格
@@ -93,10 +93,6 @@
orderNow: {
type: Boolean,
default: false
- },
- totalMoney: {
- type: Number,
- default: null
}
},
data() {
@@ -128,11 +124,16 @@
this.getCanAssignList(order);
},
async getCanAssignList(order) {
+ // 获取最新的订单信息
+ let getOrderRes = await this.$request.getOrderMasterDetail({
+ id: order.orderMasterId
+ });
+
let res = await this.$request.getCanAssignList({
orderMasterId: order.orderMasterId
});
let pickedList = res.data;
- this.curOrder = order;
+ this.curOrder = getOrderRes.data;
this.pickedList = pickedList;
},
assignWork(member) {
diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue
index 5dc3963..233c963 100644
--- a/pages/order-manage/modal/agree-after-sale.vue
+++ b/pages/order-manage/modal/agree-after-sale.vue
@@ -17,7 +17,7 @@
更改退款金额：
-
+
元
@@ -39,7 +39,7 @@
-
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 8a0859a..98ee3f9 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -184,12 +184,15 @@
-
+
+
+
+
@@ -352,20 +355,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
无可指派的师傅
@@ -373,9 +378,7 @@
-
-
-
+
@@ -584,15 +587,27 @@
// 监控单
// params.orderStatuses = "2,3,4,5";
params.isMonitoredOrder = true;
+ } else if (this.stateList[this.stateCur].code === 103) {
+ // 超时单
+ params.isMonitoredOrder = true;
}
+ } else if (this.tabCur != null && this.tabCur === 4) {
+ // 售后中的单
+ params.isMonitoredOrder = true;
}
try {
let res = null;
+ let tmpStateCur = this.stateCur;
+ let tmpTabCur = this.tabCur;
// 不同状态的单需要请求不同接口
if (this.stateCur != null && [105].indexOf(this.stateList[this.stateCur].code) >= 0) {
// 只查询主单，需要进行分页处理
this.$refs.loadStatusBar.showLoading();
res = await this.$request.qryMasterOrderPage(params);
+ // 如果选中的状态栏已经切换，则直接返回
+ if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
+ return;
+ }
if (res && res.rows) {
let rowsLength = res.rows.length;
if (rowsLength > 0) {
@@ -616,6 +631,10 @@
funName = "qryMixAfterList";
}
res = await this.$request[funName](params);
+ // 如果选中的状态栏已经切换，则直接返回
+ if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
+ return;
+ }
if (res && res.data) {
this.orderList = res.data;
}
@@ -627,6 +646,10 @@
funName = "getAfterList";
}
res = await this.$request[funName](params);
+ // 如果选中的状态栏已经切换，则直接返回
+ if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
+ return;
+ }
if (res && res.rows) {
let rowsLength = res.rows.length;
if (rowsLength > 0) {
@@ -1093,8 +1116,8 @@
async changePrice(e, order) {
let priceObj = await this.getChangedPrice(order);
let refName = e.currentTarget.dataset.ref;
- this.$refs[refName].init(priceObj);
this.showModal(e, order);
+ this.$refs[refName].init(priceObj);
},
viewImage(e, imgList) {
uni.previewImage({
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index 89aa9cb..f8203b5 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -80,8 +80,7 @@
服务金额：
{{servDetail.payMoney}}
- 0
- {{servDetail.finalRecvMoney}}
+ {{servDetail.serverMoney}}
@@ -264,6 +263,7 @@
服务中
待上门
未约/未排
+ 待接单
@@ -288,6 +288,10 @@
联系方式：{{item.workerPhone}}
+
+ 服务金额：
+ {{item.payMoney}}
+
预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}
预约时间：{{item.expectTimeStartFront}}
上门时间：{{item.workBeginTime}}
diff --git a/style/default.css b/style/default.css
index 4b7e3aa..29ad553 100644
--- a/style/default.css
+++ b/style/default.css
@@ -17,7 +17,7 @@
position: relative;
z-index: 1;
}
-
+
.nav-li::after {
content: "";
position: absolute;