From 455ad609eaadc578466e152de4d27df977bb4313 Mon Sep 17 00:00:00 2001 From: fanfan Date: Tue, 27 Feb 2024 16:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/newFun.js | 2 +- pages/news3/addressList.vue | 6 +- pages/news3/shopOrder.vue | 5 +- pages/news3/shopOrderDetails.vue | 2 +- pages/order/detail.vue | 22 +- pages/order/index.vue | 73 +++- pages/refund/index.vue | 581 +++++++++++++++++-------------- 7 files changed, 419 insertions(+), 272 deletions(-) diff --git a/api/newFun.js b/api/newFun.js index 4b5931e..e28bbb2 100644 --- a/api/newFun.js +++ b/api/newFun.js @@ -178,7 +178,7 @@ export const updateAddress = (param) => { } //店长 查地址 export const addressList = (param) => { - return request.post('Address/list', param) + return request.post('store/getAddressList', param) } // 店长同意拒绝 export const audit = (param) => { diff --git a/pages/news3/addressList.vue b/pages/news3/addressList.vue index 5096e05..4fad672 100644 --- a/pages/news3/addressList.vue +++ b/pages/news3/addressList.vue @@ -62,9 +62,9 @@ user_id: userInfo.user_id }) .then(result => { - this.addressData = result.data.list[0] - that.addIndex = result.data.list[0].address_id - that.addList = result.data.list + this.addressData = result.data.data[0] + that.addIndex = result.data.data[0].address_id + that.addList = result.data.data }) .catch(reject) }) diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue index 8bb7785..f748de4 100644 --- a/pages/news3/shopOrder.vue +++ b/pages/news3/shopOrder.vue @@ -154,7 +154,7 @@ 退货地址: + :style="{'color': addressData?'#303030':'#ABABAB'}"> {{addressData?addressData.name+addressData.phone:'请选择退货地址'}} @@ -166,7 +166,6 @@ - 确定 @@ -442,7 +441,7 @@ data } = await newFunApi.audit(params); if (status == 200) { - that.$toast(message) + this.$toast(message) this.afterSale = false this.pageNum = 1 this.goodShopsList = []; diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue index f82fa89..cac6ab4 100644 --- a/pages/news3/shopOrderDetails.vue +++ b/pages/news3/shopOrderDetails.vue @@ -196,7 +196,7 @@ 退货地址: - + {{addressData?addressData.name+addressData.phone:'请选择退货地址'}} diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 8764d45..37e1a5c 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -58,7 +58,7 @@ 核销码 - + 点击放大核销码 @@ -239,7 +239,7 @@ {{order.ziti_time}} - + 提货照片: @@ -297,7 +297,7 @@ v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"> 催发货 - @@ -456,7 +456,9 @@ app.isLoading = true OrderApi.detail(app.orderId) .then(result => { - app.onExtractQRCode(result.data.order.order_id) + if (result.data.order.delivery_type == 20) { + app.onExtractQRCode(result.data.order.order_id) + } app.order = result.data.order app.setting = result.data.setting app.isLoading = false @@ -583,7 +585,7 @@ app.qrcodeImage = result.data.qrcode }) }, - onQrcodeImage(){ + onQrcodeImage() { this.showQRCodePopup = true }, // 点击去退款 @@ -613,12 +615,14 @@