diff --git a/src/js/api.js b/src/js/api.js
index ee72a82..bfcdd59 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -101,6 +101,7 @@ API['writeOff'] = {
listVerifyRecord: `${ORIGIN}/admin/stadium/order/listVerifyRecord`, // 核销记录
enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`, // 商家助手-核销查询-输入验证码
assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`, // 商家助手-核销查询-核销
+ userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`, // 年月卡核销-后台
}
export default { ORIGIN, API };
diff --git a/src/pages.json b/src/pages.json
index b51a972..dbc9d29 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -134,6 +134,12 @@
}
},
{
+ "path": "pages/write_off/ym_card_gated/ym_card_gated",
+ "style": {
+ "navigationBarTitleText": "核销订单"
+ }
+ },
+ {
"path": "pages/write_off/ym_confirm/ym_confirm",
"style": {
"navigationBarTitleText": "核销订单"
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index a78cace..078fa54 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -101,7 +101,11 @@ export default {
util.hideLoad();
if(res.data.code == 0){
let _data = res.data.data || {}
- util.$_emit(WRITE_OFF_ORDER_INFO, {..._data})
+ util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
+ if(_data.extension&&_data.extension.verify_order_type === 'monthly_card'){
+ util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${type}`, 'nT');
+ return
+ }
util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${type}`, 'nT');
}else{
util.routeTo(`/pages/write_off/null/null?type=${type}`, 'nT');
diff --git a/src/pages/write_off/ym_card_gated/ym_card_gated.vue b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
new file mode 100644
index 0000000..29c61c0
--- /dev/null
+++ b/src/pages/write_off/ym_card_gated/ym_card_gated.vue
@@ -0,0 +1,87 @@
+
+
+ 场馆
+ 核销成功
+ 返回继续核销
+ 如需开门,请点击
+
+
+ name
+ 开门
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 1fbf4ce..4d6509a 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -1,41 +1,83 @@
持卡人信息
- 手机号码:18316567789
- 用户昵称:yiming
+ 手机号码:{{ orderInfo.mobile || '-' }}
+ 用户昵称:{{ orderInfo.nickname || '-' }}
-
+
照片
-
+
年月卡信息
- 年月卡名称:年卡
- 年月卡卡号:564566
- 验证码:12235 51234
- 生成时间:2021-09-24 15:06:45
- 失效时间:2021-09-25 00:00:00
+ 年月卡名称:{{ orderInfo.card_info.name || '-' }}
+ 年月卡卡号:{{ orderInfo.card_no || '-' }}
+ 验证码:{{ orderInfo.verify_code || '-' }}
+ 生成时间:{{ orderInfo.created_at || '-' }}
+ 失效时间:{{ orderInfo.expired_at || '-' }}
- 确认核销且开门
- 仅核销
+ 确认核销
+
@@ -53,6 +95,8 @@ export default {
border-bottom: 2upx solid #f2f2f7;
.yh-stadium{
padding: 30upx 0;
+ font-size: 32upx;
+ color: #1a1a1a;
border-bottom: 2upx solid #E5E5E5;
}
.yh-info{
@@ -99,7 +143,6 @@ export default {
flex-shrink: 0;
width: 218upx;
height: 218upx;
- background-color: skyblue;
border-radius: 10upx;
}
}