From f70a1f03dec860ca60767a9c8575a95019deb7e9 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 13 Sep 2024 18:28:59 +0800 Subject: [PATCH] add shower order --- src/components/order_refund/fixed.vue | 4 +- .../order/pages/order_manage/order_manage.vue | 2 +- .../order/pages/ym_card/detail/detail.vue | 8 +- src/subpackage/shower/js/api.js | 5 +- src/subpackage/shower/pages/order/detail.vue | 203 ++++++++++++++++++--- src/subpackage/shower/pages/order/list.vue | 120 ++++++++++-- 6 files changed, 289 insertions(+), 53 deletions(-) diff --git a/src/components/order_refund/fixed.vue b/src/components/order_refund/fixed.vue index 0980267..57b7bd0 100644 --- a/src/components/order_refund/fixed.vue +++ b/src/components/order_refund/fixed.vue @@ -33,10 +33,10 @@ export default { return +refund_amount || 0 }, isShow(){ - console.log('brandInfo', this.brandInfo) let { payAmount, refundAmount, refund_times, brandInfo } = this; + console.log('payAmount:', payAmount, 'refundAmount:', refundAmount, 'refund_times:', refund_times) if( - payAmount - refundAmount > 0 + +payAmount - +refundAmount > 0 &&[0, 1].includes(refund_times) &&brandInfo?.permission?.['1018'] // 退款权限 ){ diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue index 2e83782..8745960 100644 --- a/src/subpackage/order/pages/order_manage/order_manage.vue +++ b/src/subpackage/order/pages/order_manage/order_manage.vue @@ -36,7 +36,7 @@ export default { // 20240910 浴室订单独立 md0726 if([16].includes(ele.key)){ let _qryStr = `brand_id=${brandInfo?.brand?.id || ''}`; - return util.routeTo(`/subpackage/shower/pages/device/use_record?${_qryStr}`, 'nT'); + return util.routeTo(`/subpackage/shower/pages/order/list?${_qryStr}`, 'nT'); } // 20240813 计时订单入口拆分 tid1553 if([22, 23].includes(ele.key)){ diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue index 204b2d6..73a3675 100644 --- a/src/subpackage/order/pages/ym_card/detail/detail.vue +++ b/src/subpackage/order/pages/ym_card/detail/detail.vue @@ -55,6 +55,7 @@ + - + { this.userMonthlyCardRefundFixed({ @@ -289,6 +290,9 @@ export default { .ym-card-info{ @include isPd; } + .ym-space{ + padding-top: 24upx; + } .yci-box{ padding: 30upx; margin-bottom: 24upx; diff --git a/src/subpackage/shower/js/api.js b/src/subpackage/shower/js/api.js index f00552c..c74bcf5 100644 --- a/src/subpackage/shower/js/api.js +++ b/src/subpackage/shower/js/api.js @@ -9,8 +9,9 @@ export const SHOWER_API = { waterOrderList:`${ORIGIN}/admin/stadiumWaterCardUseRecord/list`, // 后台-水阀订单-列表 waterOrderDetails:`${ORIGIN}/admin/stadiumWaterCardUseRecord/details`, // 后台-水阀订单-详情 endOfUseWaterWave:`${ORIGIN}/admin/stadiumWaterCardUseRecord/endOfUseWaterWave`, // 后台-水卡使用记录-详情 - // CardList:`${ORIGIN}/admin/stadiumWaterCardUseRecord/list`, // 后台-水卡使用记录-列表 - // CardListOfCard:`${ORIGIN}/admin/stadiumWaterCardUseRecord/listOfCard`, // 后台-水卡使用记录-(某张水卡的)列表 + cardOrderList:`${ORIGIN}/admin/stadiumWaterCardOrder/list`, // 后台-水阀订单-列表 + cardOrderDetails:`${ORIGIN}/admin/stadiumWaterCardOrder/details`, // 后台-水阀订单-详情 + orderRefund:`${ORIGIN}/admin/stadium/order/refund`, // A订单管理-场馆预订订单-订单退款 } export default SHOWER_API; \ No newline at end of file diff --git a/src/subpackage/shower/pages/order/detail.vue b/src/subpackage/shower/pages/order/detail.vue index 2987af1..b51bbf0 100644 --- a/src/subpackage/shower/pages/order/detail.vue +++ b/src/subpackage/shower/pages/order/detail.vue @@ -2,70 +2,220 @@ - - 欧轩智能场馆(羽毛球永泰店) + + {{ orderInfo.stadium_name || '-' }} - - + + - yiming + {{ orderInfo.created_at || '-' }} + {{ orderInfo.mobile || '-' }} + {{ orderInfo.nick_name || '-' }} + {{ orderInfo.source || '-' }} - 商品详情 + 订单信息 - 沐浴 - 10分钟 - ¥4 + {{ orderInfo.water_card_name || '-' }} + {{ orderInfo.water_card_no || '-' }} + {{ orderInfo.duration_text || '-' }} + {{ orderInfo.desc || '-' }} - ¥4 - -¥0.5 - -¥0 - -¥0 + ¥{{ orderInfo.amount || 0 }} + -¥{{ orderInfo.deduction_amount || 0 }} + -¥{{ orderInfo.discount_amount || 0 }} + -¥{{ orderInfo.coupons_amount || 0 }} - 合计支付:¥3.5 + 合计支付:¥{{ orderInfo.pay_amount || 0 }} - 支付详情 + 支付信息 - - - - - 微信支付 - 2020-08-22 10:12:25 - 202009181255364564612622 + {{ _extension.pay_type_text || '-' }} + {{ orderInfo.pay_time || '-' }} + {{ orderInfo.trade_no || '-' }} + + + + + + + + + +