diff --git a/src/js/api.js b/src/js/api.js index 9e91b77..cfedf10 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -109,6 +109,9 @@ API['writeOff'] = { timingNumber: `${ORIGIN}/stadium/person/timing/number`, // 现场人数 setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`, // 商家助手散客人数校正 + // 20220222 新增赛事核销 + matchOrderVerify: `${ORIGIN}/admin/assistant/matchOrder/verify`, // 赛事订单确认核销 + } diff --git a/src/js/once_name.js b/src/js/once_name.js index 4847771..5e54577 100644 --- a/src/js/once_name.js +++ b/src/js/once_name.js @@ -2,7 +2,7 @@ // 避免命名冲突,误触监听器 export const WRITE_OFF_STORE_INFO = 'stadium_list'; -export const WRITE_OFF_ORDER_INFO = 'order_info'; +export const WRITE_OFF_ORDER_INFO = 'order_info'; // 场地核销确认页/ 年月卡核销确认页/ 赛事核销确认页 export const WRITE_OFF_YM_ORDER_INFO = 'ym_order_info'; // 年月卡订单核销 export const WRITE_OFF_MALL_ORDER_INFO = 'mall_order_info'; // 商城订单核销 export const WRITE_OFF_MALL_ORDER_SUCCESS = 'mall_order_success'; // 商城订单核销成功! diff --git a/src/pages.json b/src/pages.json index e51516c..182f9c3 100644 --- a/src/pages.json +++ b/src/pages.json @@ -134,6 +134,12 @@ } }, { + "path": "pages/write_off/success/success", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { "path": "pages/write_off/events_order/events_order", "style": { "navigationBarTitleText": "核销订单" diff --git a/src/pages/write_off/events_order/events_order.vue b/src/pages/write_off/events_order/events_order.vue index c71d93d..4cb025a 100644 --- a/src/pages/write_off/events_order/events_order.vue +++ b/src/pages/write_off/events_order/events_order.vue @@ -2,32 +2,32 @@ - 欧轩智能羽毛球馆(永泰店) + {{ orderInfo.stadium_name || '-' }} 订单编号: - 20195175645666 + {{ orderInfo.verify_code || '-' }} (赛事) 用户昵称: - 周大强 + {{ orderInfo.nickname || '-' }} 验证码: - 200525458978 + {{ orderInfo.verify_code || '-' }} 赛事名称: - 篮球比赛 + {{ orderInfo.match_name || '-' }} 赛事类型: - 个人赛 + {{ orderInfo.match_type || '-' }} 进场时间: - 2019-05-18 11:00-12:00 + {{ orderInfo.in_time || '-' }} @@ -35,15 +35,49 @@ - 确认核销 + 确认核销 diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue index 8ed0a85..8a810fe 100644 --- a/src/pages/write_off/operate/operate.vue +++ b/src/pages/write_off/operate/operate.vue @@ -134,9 +134,11 @@ export default { writeOffType == 'site'&&(_query['decrypt_text'] = decrypt_text); writeOffType == 'mall'&&(_query['vcode'] = decrypt_text); } + if(writeOffType == 'site')return this.siteGet({ query: _query, vType: _vType, }); if(writeOffType == 'mall')return this.mallGet({ query: _query, vType: _vType, }); }, + // 商城订单 mallGet({ query = {}, vType = '', }){ util.showLoad(); @@ -163,7 +165,10 @@ export default { }) .catch(util.hideLoad) }, - // 场地/ 年月卡 + + // 场地/ 年月卡 / 赛事 + // @vType verify_code(扫码)/ decrypt_text(输入) + siteGet({ query = {}, vType = '', }){ util.showLoad(); servers.get({ @@ -176,12 +181,20 @@ export default { if(res.data.code == 0){ let _data = res.data.data || {} + // 年月卡 if(_data.extension&&_data.extension.verify_order_type === 'monthly_card'){ util.$_emit(WRITE_OFF_ORDER_INFO, {..._data}); util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${vType}`, 'nT'); return } + // 赛事 + if(_data.extension&&_data.extension.verify_order_type === 'match_order'){ + util.$_emit(WRITE_OFF_ORDER_INFO, {..._data}); + util.routeTo(`/pages/write_off/events_order/events_order?type=${vType}`, 'nT'); + return + } + util.$_emit(WRITE_OFF_ORDER_INFO, {..._data}); util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${vType}`, 'nT'); }else{ diff --git a/src/pages/write_off/success/success.vue b/src/pages/write_off/success/success.vue new file mode 100644 index 0000000..f93460c --- /dev/null +++ b/src/pages/write_off/success/success.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file