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 @@
-
-
-
-
- {{orderInfo.stadium_name || '-'}}
-
-
- 订单编号:
-
- {{orderInfo.order_no || '-'}}
-
-
-
- 用户昵称:
-
- {{orderInfo.nickname || '-'}}
-
-
-
- 支付时间:
-
- {{orderInfo.pay_time || '-'}}
-
-
-
- 预定日期:
-
- {{ZH_order_date((orderInfo&&orderInfo.date) || '') || '-'}}
-
-
-
- 预定场次:
-
- {{e.venue_name + ' ' }} {{ ' '+e.duration}}
-
-
-
-
-
-
- 确认核销
- 不核销
-
-
-
-
- {{errorTip}}
- 返回
-
-
-
-
-
-
-
\ 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 @@
+
{{orderInfo.stadium_name || '-'}}
diff --git a/src/pages/write_off/events_order/events_order.vue b/src/pages/write_off/events_order/events_order.vue
new file mode 100644
index 0000000..1364e5f
--- /dev/null
+++ b/src/pages/write_off/events_order/events_order.vue
@@ -0,0 +1,187 @@
+
+
+
+
+ {{ orderInfo.stadium_name || '-' }}
+
+
+ 订单编号:
+ {{ orderInfo.order_no || '-' }}
+ (赛事)
+
+
+ 用户昵称:
+ {{ orderInfo.nickname || '-' }}
+
+
+ 验证码:
+ {{ orderInfo.verify_code || '-' }}
+
+
+ 赛事名称:
+ {{ orderInfo.match_name || '-' }}
+
+
+ 赛事类型:
+ {{ orderInfo.match_type || '-' }}
+
+
+ 进场时间:
+ {{ orderInfo.in_time || '-' }}
+
+
+
+
+
+
+
+ 确认核销
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/write_off/list/list.vue b/src/pages/write_off/list/list.vue
deleted file mode 100644
index 91df60b..0000000
--- a/src/pages/write_off/list/list.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
- 今日核销订单({{orderList.length || 0}})
-
-
-
-
-
- 订单编号:
-
- {{e.order_no || '-'}}
-
-
-
- 用户昵称:
-
- {{e.nickname || '-'}}
-
-
-
- 支付时间:
-
- {{e.pay_time || '-'}}
-
-
-
- 预定日期:
-
- {{ZH_order_date(e.date || '') || '-'}}
-
-
-
- 预定场次:
-
- {{k.venue_name+' '}}{{' '+k.duration}}
-
-
-
-
- 核销时间:{{e.verify_time || '-'}}
- 共{{e.sessions.length || 0}}场次
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index 03c3764..8a810fe 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -111,11 +111,6 @@ export default {
let { iptCode } = this;
if(!iptCode)return util.showNone('请输入核销码!');
this.analysisOrder({ verify_code: this.iptCode });
- return
- let _timeSta = new Date().getTime();
- if(_timeSta%3 == 0)return util.routeTo(`/pages/write_off/confirm_order/confirm_order`, 'nT');
- if(_timeSta%2 < 1)return util.routeTo(`/pages/write_off/null/null`, 'nT');
- return util.routeTo(`/pages/write_off/confirm_order/confirm_order`, 'nT');
}, 300, true),
@@ -139,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();
@@ -168,7 +165,10 @@ export default {
})
.catch(util.hideLoad)
},
- // 场地/ 年月卡
+
+ // 场地/ 年月卡 / 赛事
+ // @vType verify_code(扫码)/ decrypt_text(输入)
+
siteGet({ query = {}, vType = '', }){
util.showLoad();
servers.get({
@@ -181,11 +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..ff4e916
--- /dev/null
+++ b/src/pages/write_off/success/success.vue
@@ -0,0 +1,183 @@
+
+
+
+ {{ optionsQuery.stadium_name || '-' }}
+
+
+
+ 核销成功
+ 返回继续核销
+
+
+ 如需开门,请点击
+
+
+ {{ e.hardware_name || '-' }}
+ 开门
+
+
+
+
+
+
+
+
+
\ No newline at end of file