From bae3ccb0290c20f77ed12a82acaefb00e0cf79c1 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 24 Sep 2021 18:01:00 +0800 Subject: [PATCH] add order --- .../order_list/club_rental/club_rental.vue | 86 +++++++++++++++++ .../spectacular_monent/spectacular_monent.vue | 44 +++++++-- src/js/api.js | 2 + src/pages/index/index.vue | 2 +- src/pages/order_list/order_list.vue | 52 +++++++++-- src/subpackage/order/js/api.js | 2 + .../pages/spectacular_monent/detail/detail.vue | 102 +++++++++++++++------ .../order/pages/value_card/detail/detail.vue | 39 +++++--- .../static/images/value_card/success_c098.png | Bin 0 -> 985 bytes 9 files changed, 271 insertions(+), 58 deletions(-) create mode 100644 src/components/order_list/club_rental/club_rental.vue create mode 100644 src/subpackage/order/static/images/value_card/success_c098.png diff --git a/src/components/order_list/club_rental/club_rental.vue b/src/components/order_list/club_rental/club_rental.vue new file mode 100644 index 0000000..7ab026c --- /dev/null +++ b/src/components/order_list/club_rental/club_rental.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue index 1fa009b..c0951d6 100644 --- a/src/components/order_list/spectacular_monent/spectacular_monent.vue +++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue @@ -1,29 +1,61 @@ diff --git a/src/js/api.js b/src/js/api.js index 5c6fe85..3752cb1 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -33,6 +33,8 @@ export const API = { // 20210916 订单列表接口 venueCourseOrderList: `${ORIGIN}/admin/venueCourse/orderList`, // 课程订单 - 列表 userValueCardList: `${ORIGIN}/admin/userValueCard/list`, // 用户储值卡-扣费_copy + momentOrderList: `${ORIGIN}/admin/perfect/moment/order/list`, // 后台-高光时刻订单列表_copy + hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`, // 硬件管理-订单列表_copy // 营业额统计 diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 5589bbf..2910bfd 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -92,7 +92,7 @@ { id: 2, name: '订单管理', - path: '/subpackage/device/pages/order_manage/order_manage', + path: '/subpackage/order/pages/order_manage/order_manage', serverKey: 1012 // 后端对应权限编号 }, { diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index aefc104..9edd378 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -54,6 +54,8 @@ + + + + 储值卡信息 @@ -207,17 +212,19 @@ - - - - - 扣费成功! + + + + + 扣费成功! + 充值成功! - 扣费金额:-¥50 - 当前余额:¥25.25 - 储值卡号:20195171564566 - 手机号码:18316553478 + 扣费金额:-¥{{ operateInfo.decr_amount || '0' }} + 充值金额:¥{{ operateInfo.recharge_amount || '0' }} + 当前余额:¥{{ operateInfo.balance || 0 }} + 储值卡号:{{ operateInfo.card_no || '-' }} + 手机号码:{{ operateInfo.mobile || '-' }} @@ -254,7 +261,7 @@ export default { records: [] }, - + operateInfo: null } }, @@ -286,6 +293,9 @@ export default { util.hideLoad(); if(res.data.code == 0){ this.refreshThis(); + let _data = res.data.data || null; + if(_data&&_data.toString() == '[object Object]')_data['modalType'] = 'recharge'; + this.operateInfo = _data; util.showNone(res.data.message || '操作成功!'); }else{ util.showNone(res.data.message || '操作失败!'); @@ -317,6 +327,7 @@ export default { }, deductConfirmBtn: util.debounce(function(){ let { deductAmount, deductRemark, curConsumeType, orderInfo } = this; + if(!('consume_type' in curConsumeType))return util.showNone('请选择消费场景!'); if(deductAmount<0)return util.showNone('扣除价格有误!'); util.showLoad(); server.post({ @@ -333,6 +344,9 @@ export default { util.hideLoad(); if(res.data.code == 0){ this.refreshThis(); + let _data = res.data.data || null; + if(_data&&_data.toString() == '[object Object]')_data['modalType'] = 'deduct'; + this.operateInfo = _data; util.showNone(res.data.message || '操作成功!'); }else{ util.showNone(res.data.message || '操作失败!'); @@ -445,7 +459,6 @@ export default { top: 0; width: 132upx; height: 132upx; - background-color: skyblue; } } .vc-info{ @@ -661,14 +674,12 @@ export default { top: 30upx; width: 34upx; height: 34upx; - background-color: skyblue; } .tm-icon{ margin: 0 auto 30upx; display: block; width: 100upx; height: 100upx; - background-color: skyblue; } .tm-tit{ margin-bottom: 70upx; diff --git a/src/subpackage/order/static/images/value_card/success_c098.png b/src/subpackage/order/static/images/value_card/success_c098.png new file mode 100644 index 0000000000000000000000000000000000000000..01520342416717494c17d1a09acd8271bccb026b GIT binary patch literal 985 zcmV;~119{5P)*VV8^q|_yh|j>^^6qEEu6xV5u;0`xtBsP>#mP=1-v9sr4RlgYQvl~n z&bBln5{#W~UwHvm>A3&^10G34K~!ko&6-z|<1h?F4F;ugQ?lf>obP|kO;Zco3Is*6 zYTw_~d~`J$pcuUSKPk&yE=sGK%4kgl5NU0yM%kotc5gIh(5A6zEU22W0#z#7L#5$G zS4D(`G7wVRj1r7dTMA_mNL_@+T@iwzeORRko6rH#RM?EvOra5hDe{$yAwkK$5DR&m zd5;8q2_lcD@%qT@r9m>3C-bZ-mXHvdotIK0DP~TjMq(;Y=$T?E2+5(+Q>+{XQ^{?)bYbUwCoQOY2*qaYU!iZJzF=i@@C`=A!L_7 zzsIqiSa~rrLW(Ze_IBNm4=eraA7YH>V(9s9h5PMtgqXc=b2pqE!(-DvAb~e`CHamx zQ+miD$%cD$OlV{A0p%<7V|zddN_Gh1>EO@<8d!Mc(YKS)7gLE3rb8PT2xH|(?5>?` zN5zxKR>WR91jo)+gt^?d7?Iz5^jxfPBWy)5FT++N;?wEbjR=D5hU>xS0|885Y)V3M z^z>~8$x+E)HH6Pw2Fc*g%6R|GS5TQ^;qJ|?LMrFe95+_>2dA%m&y4biMn(BDXRJmP zx)8m^8$?h~<|BFh#F1w!nJIQ5G?dQwE(wLIG|gG46njV_WYxYlMr$Iijj0=D#X0;03)_n`6d=q|00000NkvXX Hu0mjf%qG?} literal 0 HcmV?d00001