diff --git a/src/js/api.js b/src/js/api.js index 370e7ad..a34d5fc 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -114,6 +114,11 @@ API['writeOff'] = { timingOpen:`${ORIGIN}/stadium/person/timing/open`, //凌晨自动清零【开/关】 notLeavingNums:`${ORIGIN}/stadium/person/timing/notLeavingNums`, //凌晨自动清零 - 未离场订单数量 + // 20220222 新增赛事核销 + // matchOrderVerify: `${ORIGIN}/admin/assistant/matchOrder/verify`, // 赛事订单确认核销 /用回之前的核销 + matchOrderGateLs: `${ORIGIN}/admin/assistant/matchOrderGate/list`, // 商家助手-赛事订单核销后获取门 + matchOrderGateOpen: `${ORIGIN}/admin/assistant/matchOrderGate/open`, // 商家助手-赛事订单核销后-开门 + } 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 4c5beba..182f9c3 100644 --- a/src/pages.json +++ b/src/pages.json @@ -134,6 +134,18 @@ } }, { + "path": "pages/write_off/success/success", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { + "path": "pages/write_off/events_order/events_order", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { "path": "pages/write_off/mall/success/success", "style": { "navigationBarTitleText": "核销订单" @@ -176,18 +188,6 @@ } }, { - "path": "pages/write_off/confirm/confirm", - "style": { - "navigationBarTitleText": "确认订单信息" - } - }, - { - "path": "pages/write_off/list/list", - "style": { - "navigationBarTitleText": "扫码核销" - } - }, - { "path": "pages/write_off/search_result/search_result", "style": { "navigationBarTitleText": "核销查询" diff --git a/src/pages/write_off/confirm/confirm.vue b/src/pages/write_off/confirm/confirm.vue deleted file mode 100644 index 2331888..0000000 --- a/src/pages/write_off/confirm/confirm.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/write_off/confirm_order/confirm_order.vue b/src/pages/write_off/confirm_order/confirm_order.vue index 37a8391..4e1af0f 100644 --- a/src/pages/write_off/confirm_order/confirm_order.vue +++ b/src/pages/write_off/confirm_order/confirm_order.vue @@ -1,4 +1,5 @@