diff --git a/common/js/request.js b/common/js/request.js
index d4396d4..514e521 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,8 +13,8 @@ export default {
})
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
- args.url = 'https://www.opsoul.com' + args.url;
- // args.url = 'http://127.0.0.1:80' + args.url;
+ // args.url = 'https://www.opsoul.com' + args.url;
+ args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
if (!args.data) {
@@ -650,5 +650,12 @@ export default {
}
})
return res[1].data;
- }
+ },
+ async wxGetLocation() {
+ let res = await wx.getLocation({
+ type: 'gcj02'
+ })
+ // res.latitude, res.longitude
+ return res;
+ },
}
diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue
index ecd3897..e41525a 100644
--- a/pages/order-manage/modal/new-serv-price-offline.vue
+++ b/pages/order-manage/modal/new-serv-price-offline.vue
@@ -23,7 +23,7 @@
加单总额：
元
- 修改报价
确认报价
@@ -38,7 +38,7 @@
报价总额：
元
- 修改报价
确认报价
@@ -96,6 +96,9 @@
},
methods: {
init(priceObj) {
+ if (!priceObj || priceObj.payStatus == 1) {
+ return;
+ }
this.priceObj = priceObj;
if (priceObj && priceObj.type) {
this.remark = priceObj.remark;
@@ -130,7 +133,16 @@
changePayAction(payAction) {
this.payAction = payAction;
},
- async changeOrderPrice(newPrice) {
+ async changeOrderPrice(newPrice) {
+ if (this.payAction != this.priceObj.type) {
+ uni.showToast({
+ icon: 'none',
+ title: '你有加价未付款，请客户支付后再加或在原加价上增加金额！',
+ duration: 3500
+ })
+ return;
+ }
+
let res = await this.$request.changeOrderPrice({
orderDetailId: this.data.orderDetailId,
changeMoney: newPrice,
diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue
index 03bbd18..4bc9851 100644
--- a/pages/order-manage/modal/new-serv-price-online.vue
+++ b/pages/order-manage/modal/new-serv-price-online.vue
@@ -23,7 +23,7 @@
加单总额：
元
- 修改报价
确认报价
@@ -38,7 +38,7 @@
报价总额：
元
- 修改报价
确认报价
@@ -96,6 +96,9 @@
},
methods: {
init(priceObj) {
+ if (!priceObj || priceObj.payStatus == 1) {
+ return;
+ }
this.priceObj = priceObj;
if (priceObj && priceObj.type) {
this.remark = priceObj.remark;
@@ -130,7 +133,16 @@
changePayAction(payAction) {
this.payAction = payAction;
},
- async changeOrderPrice(newPrice) {
+ async changeOrderPrice(newPrice) {
+ if (this.payAction != this.priceObj.type) {
+ uni.showToast({
+ icon: 'none',
+ title: '你有加价未付款，请客户支付后再加或在原加价上增加金额！',
+ duration: 4500
+ })
+ return;
+ }
+
let res = await this.$request.changeOrderPrice({
orderDetailId: this.data.orderDetailId,
changeMoney: newPrice,
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 7f6ed6c..bd33e43 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -94,6 +94,11 @@
确
完
+
+ 到付单
+ 有待付款
+ 款已付清
+
超时未接单
@@ -108,7 +113,7 @@
超时未完单
-
+
售后发起中
售后已同意
售后已拒绝
@@ -182,8 +187,9 @@
-
-
+
+
+
@@ -311,9 +317,12 @@
订单交由平台协商处理
- 本单退款，系统已发起原路退回
- {{afterServiceRecord.originalRefund}}
- 元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。
+
+ 本单退款，系统已发起原路退回
+ {{afterServiceRecord.originalRefund}}
+ 元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。
+
+ 支付时间：{{afterServiceRecord.refundApplyTime}}
本单未支付，实际退回0.00元
@@ -1038,7 +1047,30 @@
urls: imgList,
current: e.currentTarget.dataset.url
});
- },
+ },
+ async recordClockInLocation(order) {
+ let res = await this.$request.wxGetLocation();
+ if (!res || !res.latitude) {
+ uni.showToast({
+ title: '定位获取失败，打卡失败，请稍后重试',
+ icon: 'error',
+ duration: 2500
+ })
+ } else {
+ let params = {
+ id: order.orderDetailId,
+ clockInLocation: res.longitude + "," + res.latitude
+ }
+ let updateOrderRes = await this.$request.updateDetailOrder(params);
+ if (updateOrderRes && updateOrderRes.code === 0) {
+ this.reloadMasterOrderPage();
+ uni.showToast({
+ icon: 'success',
+ duration: 1000
+ })
+ }
+ }
+ }
}
}