From 99084cf6beffb574079950824cef0e0b993d5508 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 25 Sep 2022 00:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7/=E5=AE=8C=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/request.js | 20 +- .../modal/new-serv-price-offline.vue | 217 +++++++++++----- .../modal/new-serv-price-online.vue | 243 ++++++++++++------ pages/order-manage/order-manage.vue | 23 +- 4 files changed, 353 insertions(+), 150 deletions(-) diff --git a/common/js/request.js b/common/js/request.js index 3f78cbc..04c14dd 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) { @@ -606,5 +606,21 @@ export default { data: params }) return res[1].data; + }, + async changeOrderPrice(params = {}) { + let res = await uni.request({ + url: '/order/detail/app/change/price', + method: 'POST', + data: params + }) + return res[1].data; + }, + async getChangeOrderPrice(params = {}) { + let res = await uni.request({ + url: '/order/detail/app/getChangePrice', + method: 'POST', + data: params + }) + return res[1].data; } } diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue index 88da474..ada06a4 100644 --- a/pages/order-manage/modal/new-serv-price-offline.vue +++ b/pages/order-manage/modal/new-serv-price-offline.vue @@ -1,66 +1,167 @@ - - + + - - diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue index 642e99f..815c80d 100644 --- a/pages/order-manage/modal/new-serv-price-online.vue +++ b/pages/order-manage/modal/new-serv-price-online.vue @@ -1,94 +1,167 @@ - - + + - - diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index 25e0b26..4f97af4 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -174,8 +174,8 @@ - - + + @@ -246,8 +246,8 @@ - - + + @@ -276,7 +276,7 @@ import editTimeArrange from '@/pages/order-manage/modal/edit-time-arrange.vue'; import dispatchOrder from '@/pages/order-manage/dispatch-order.vue'; import newServPriceOnline from '@/pages/order-manage/modal/new-serv-price-online.vue'; - import newServPriceOffline from '@/pages/order-manage/modal/new-serv-price-online.vue'; + import newServPriceOffline from '@/pages/order-manage/modal/new-serv-price-offline.vue'; import payQrcode from '@/pages/order-manage/modal/pay-qrcode.vue'; import urgentMsg from '@/pages/order-manage/modal/urgent-msg.vue'; import picModal from '@/components/modal/pic-modal.vue'; @@ -917,6 +917,19 @@ title: '拒绝接单失败' }) } + }, + async getChangedPrice(order) { + let res = await this.$request.getChangeOrderPrice(order); + if (res && res.code === 0 && res.data) { + return res.data; + } + return null; + }, + 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); } } }