diff --git a/common/js/request.js b/common/js/request.js
index 561726c..cf8c0e3 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -11,9 +11,9 @@ export default {
title: '加载中'
})
// request 触发前拼接 url
- args.url = 'https://www.opsoul.com' + args.url;
+ // args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://192.168.2.20:80' + args.url;
- // args.url = 'http://127.0.0.1:80' + args.url;
+ args.url = 'http://127.0.0.1:80' + args.url;
if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
args.data.deptId = globalData.deptId;
args.data.from = globalData.from;
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 6e19f30..a688f29 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -82,7 +82,7 @@
待付款
-
+
+
+
+
+ {{myInfo.serOrderNum.processing}}
+
+
+ 待服务
-
+
- 服务中
+ 进行中
-
+
+
{{myInfo.serOrderNum.afterServ}}
@@ -130,7 +138,7 @@
售后中
-
+
{{myInfo.serOrderNum.wait2Forward}}
@@ -300,22 +308,29 @@
servOrderTabList: [{
// type: -1,
name: '待付款'
+ },
+ // {
+ // type: 0,
+ // name: '待接单'
+ // }, {
+ // type: 1,
+ // name: '待排期'
+ // }, {
+ // type: 2,
+ // name: '待上门'
+ // },
+ {
+ type: '0,1,2',
+ name: '待服务'
}, {
- type: 0,
- name: '待接单'
- }, {
- type: 1,
- name: '待排期'
- }, {
- type: 2,
- name: '待上门'
- }, {
- type: 3,
+ type: '3,4',
name: '服务中'
- }, {
- type: 4,
- name: '待确认'
- }, {
+ },
+ // {
+ // type: 4,
+ // name: '待确认'
+ // },
+ {
// type: 4,
name: '售后中'
}, {
diff --git a/pages/my/components/modal/apply-after-service.vue b/pages/my/components/modal/apply-after-service.vue
index 5ee2b4e..9550e82 100644
--- a/pages/my/components/modal/apply-after-service.vue
+++ b/pages/my/components/modal/apply-after-service.vue
@@ -207,13 +207,13 @@
});
}
if (updateStatusRes && updateStatusRes.code === 0) {
+ this.hideModal();
+ this.$emit('confirmFeedback');
uni.showToast({
title: '已发起售后，进度可在订单详情内查看',
icon: 'none',
duration: 2000
})
- this.hideModal();
- this.$emit('confirmFeedback');
return;
}
}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index d7f085c..2931470 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -37,32 +37,18 @@
总价{{shopOrder.totalMoney}}
优惠{{shopOrder.discountMoney}}
+
+ 加价{{shopOrder.changeMoney}}
需付款{{shopOrder.payMoney}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -78,7 +64,7 @@
约定服务时间：
@@ -180,13 +166,18 @@
try {
params.customerId = this.curUserInfo.customerId;
params.orderType = this.orderType;
- params.orderStatus = this.tabHeaderList[this.tabCur].type;
+ let orderStatus = this.tabHeaderList[this.tabCur].type;
+ if (typeof orderStatus == 'string' && orderStatus.indexOf(",") > 0) {
+ params.orderStatuses = orderStatus;
+ } else {
+ params.orderStatus = orderStatus;
+ }
if (this.tabCur === 0) {
params.payStatus = 0;
params.exceptOrderStatus = 6;
}
let res = null;
- if (this.tabCur === 6) {
+ if (this.tabCur === 3) {
res = await this.$request.getAfterList({
customerId: params.customerId
});
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 3d367ae..148cd18 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -106,6 +106,23 @@
完成时间：{{item.workFinishTime}}
+
+
+
+
+ 加价记录
+
+
+
+
+ 加价金额：
+ {{item.financialChangeRecord.changeMoney}}
+
+
+ 加价备注：
+ {{item.financialChangeRecord.remark}}
+
+
@@ -131,10 +148,8 @@
-
- 客户发起
-
+
+ 客户发起
退单退款已提交至商家，其最大时限24小时内需完成操作！
@@ -187,9 +202,13 @@
:data-url="imgObj.imgUrl" mode="aspectFill">
+
+
+
-
+
师傅反馈
@@ -244,7 +263,7 @@
@click="afterServiceFinalCheck(afterServiceRecord.id, 0)">不同意
-
+
客户最终确认
{{afterServiceRecord.customerFinalCheck === 1 ? '同意' : '不同意'}}