From d176480e4039819d12619075475c4dae44934230 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 18 Jun 2024 18:16:40 +0800 Subject: [PATCH] add tid1523 refund permission condition --- src/components/order_refund/fixed.vue | 11 +- src/components/order_refund/modal.vue | 17 +- src/components/order_refund_modal/index.vue | 215 --------------------- .../reservation_site_detail.vue | 1 - .../device/pages/order_details/order_details.vue | 125 +----------- src/subpackage/order/js/api.js | 2 +- .../order/pages/retail/detail/detail.vue | 62 ++++-- 7 files changed, 77 insertions(+), 356 deletions(-) delete mode 100644 src/components/order_refund_modal/index.vue diff --git a/src/components/order_refund/fixed.vue b/src/components/order_refund/fixed.vue index 8265be8..0980267 100644 --- a/src/components/order_refund/fixed.vue +++ b/src/components/order_refund/fixed.vue @@ -9,6 +9,7 @@ - - \ No newline at end of file diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue index 02ad2a1..c8cc4e9 100644 --- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue +++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue @@ -198,7 +198,6 @@ export default { return _obj[`${_status}`] || '-' }, refunndBtn(){ - // this.$emit('refundbtn'); this.$emit('click:refund'); } } diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue index 737eeae..bc8d1cd 100644 --- a/src/subpackage/device/pages/order_details/order_details.vue +++ b/src/subpackage/device/pages/order_details/order_details.vue @@ -5,7 +5,6 @@ - - - - 退款 - - {{ pageInfo.stadium_name || '-' }} - 订单编号：{{ pageInfo.order_no || '-' }} - 手机号码：{{ pageInfo.mobile || '-' }} - - - *退款金额 - - - - 最多可退{{ (pageInfo.extension&&pageInfo.extension.refundable_amount) || 0 }}元 - - 确认退款 - - + { - if(res.data.code == 0){ - util.showNone(res.data.message || '操作成功！'); - setTimeout(this.refreshPage, 1200); - }else{ - util.showNone(res.data.message || '操作失败！'); - } - }) - .catch(util.hideLoad) - }, 300, true), // 次卡恢复二维码状态刷新订单 peopleRecoverBtn(){ this.okChange(); // 逻辑一样，刷新 @@ -238,82 +192,5 @@ } -.refund-mask{ - position: fixed; - left: 0; - top: 0; - bottom: 0; - right: 0; - background-color: rgba($color: #000, $alpha: .5); - .rm-content{ - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - padding: 80upx; - background-color: #fff; - width: 620upx; - border-radius: 10upx; - .rc-tit{ - margin-bottom: 30upx; - text-align: center; - font-size: 32upx; - font-weight: 500; - color: #1A1A1A; - } - .rc-info{ - margin-bottom: 34upx; - .ri-view{ - line-height: 40upx; - font-size: 28upx; - color: #9C9C9F; - @include textHide(1); - &:first-child{ - font-weight: 500; - color: #1A1A1A; - } - } - } - .rc-price{ - margin-bottom: 32upx; - .rp-name{ - margin-bottom: 8upx; - font-size: 28upx; - line-height: 48upx; - color: #1A1A1A; - .rn-txt{ - color: #EA5061; - } - } - .rp-frame{ - padding: 0 20upx; - height: 88upx; - border-radius: 10upx; - border: 2upx solid #D8D8D8; - .rf-ipt{ - width: 100%; - height: 100%; - font-size: 28upx; - color: #1A1A1A; - } - } - .rp-tip{ - font-size: 24upx; - color: #EA5061; - } - } - .ri-btn{ - margin: 0 auto; - width: 240upx; - line-height: 88upx; - text-align: center; - border-radius: 10upx; - font-size: 32upx; - font-weight: 500; - color: #fff; - background-color: $themeColor; - } - } -} diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index 40d6591..4597f0a 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -40,7 +40,7 @@ export const ORDER_API = { userValueCardRefundFixed:`${ORIGIN}/admin/userValueCard/refundFixed`, // 储值卡订单-退款 timeOrderDetail:`${ORIGIN}/admin/assistant/timeOrder/detail`, //k-订单管理-计时订单详情 timeOrderComplete:`${ORIGIN}/admin/assistant/timeOrder/complete`, //【20220208】k-订单管理-计时订单完结 - orderRefund:`${ORIGIN}/admin/stadium/order/refund`, // A订单管理-场馆预订订单-订单退款 + orderRefund:`${ORIGIN}/admin/stadium/order/refund`, // A订单管理-场馆预订订单-订单退款 (零售订单、场地、次卡) userMonthlyCardRefundFixed:`${ORIGIN}/admin/userMonthlyCard/refundFixed`, // 年月卡订单-订单退款 } diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue index f853c78..aef10cf 100644 --- a/src/subpackage/order/pages/retail/detail/detail.vue +++ b/src/subpackage/order/pages/retail/detail/detail.vue @@ -146,26 +146,63 @@ export default { }, onLoad(options){ this.getOrderInfo(options.order_no); + this.retailOrderInfoRefundList({ + order_no: options.order_no, + brand_id: this.brandInfo.brand.id + }) }, methods: { refunndBtn(){ let { orderInfo, refundList } = this; this.$refs.orderRefundModal.show({ - stadium_name: orderInfo?.refundList ?? '', + stadium_name: orderInfo?.stadium_name ?? '', order_no: orderInfo?.order_no ?? '', - mobile: orderInfo?.refundList ?? '', + mobile: orderInfo?.mobile ?? '', refundable_amount: orderInfo?.extension?.refundable_amount ?? 0, refundable_integral: orderInfo?.extension?.refundable_integral ?? 0, refund_times: refundList?.length || 0, confirm: e => { + console.log('refund' , e) // this.venueCourseOrderRefund({ // order_no: orderInfo?.order_no ?? '', // amount: e.refund_amount || 0, // integral: e.refund_integral || 0 // }) + this.confirmRefundReq({ + order_no: orderInfo?.order_no || '', + amount: e.refund_amount || 0, + integral: e.refund_integral || 0 + }) } }); }, + confirmRefundReq({ order_no = '', amount = 0, integral = 0}){ + util.showLoad(); + server.get({ + url: ORDER_API.orderRefund, + data: { order_no, amount, integral }, + isDefaultGet: false + }) + .then(res=>{ + util.hideLoad(); + if(res.data.code == 0){ + util.showNone(res.data.message || '操作成功！'); + }else{ + util.showNone(res.data.message || '操作失败！'); + } + }) + .then(_=>{ + setTimeout(_=>{ + let { orderInfo } = this; + this.getOrderInfo(orderInfo?.order_no || ''); + this.retailOrderInfoRefundList({ + order_no: orderInfo?.order_no || '', + brand_id: orderInfo?.brand_id || '' + }) + }, 1200); + }) + .catch(util.hideLoad) + }, // payTypeTxt: util.order_pay_type_txt, payTypeTxt(payType, cardNo) { let _obj = { @@ -197,17 +234,20 @@ export default { // { refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason }, // { refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason } // ]; - server.get({ - url: ORDER_API.retailOrderInfoRefundList, - data: { order_no, brand_id: this.brandInfo.brand.id }, - failMsg: '加载失败！' - }) - .then(res=>{ - util.hideLoad(); - this.refundList = res?.list || []; - }); + }); }, + retailOrderInfoRefundList({ order_no, brand_id }){ + server.get({ + url: ORDER_API.retailOrderInfoRefundList, + data: { order_no, brand_id }, + failMsg: '加载失败！' + }) + .then(res=>{ + util.hideLoad(); + this.refundList = res?.list || []; + }); + } } }