From 430b419e3dde0de91a8583e4c9c842a5b78deaf5 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 17 Nov 2021 15:04:19 +0800 Subject: [PATCH] add&fix ymorder --- src/js/api.js | 1 + src/js/once_name.js | 2 + .../write_off/ym_card_gated/ym_card_gated.vue | 54 +++++++++++++++++++--- src/pages/write_off/ym_confirm/ym_confirm.vue | 16 +++++-- 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index bfcdd59..69858b0 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -102,6 +102,7 @@ API['writeOff'] = { enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`, // 商家助手-核销查询-输入验证码 assistantVerify: `${ORIGIN}/admin/stadium/order/assistantVerify`, // 商家助手-核销查询-核销 userMonthlyCardVerify: `${ORIGIN}/admin/userMonthlyCard/verify`, // 年月卡核销-后台 + userMonthlyCardOpenGate: `${ORIGIN}/admin/userMonthlyCard/openGate`, // 年月卡开门-后台 } export default { ORIGIN, API }; diff --git a/src/js/once_name.js b/src/js/once_name.js index d32a5a4..4ffcda7 100644 --- a/src/js/once_name.js +++ b/src/js/once_name.js @@ -3,8 +3,10 @@ export const WRITE_OFF_STORE_INFO = 'stadium_list'; export const WRITE_OFF_ORDER_INFO = 'order_info'; +export const WRITE_OFF_YM_ORDER_INFO = 'ym_order_info'; // 年月卡订单核销 export default { WRITE_OFF_STORE_INFO, WRITE_OFF_ORDER_INFO, + WRITE_OFF_YM_ORDER_INFO } \ No newline at end of file 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 index 29c61c0..00a4d44 100644 --- a/src/pages/write_off/ym_card_gated/ym_card_gated.vue +++ b/src/pages/write_off/ym_card_gated/ym_card_gated.vue @@ -1,21 +1,61 @@ diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue index 4d6509a..522ef7c 100644 --- a/src/pages/write_off/ym_confirm/ym_confirm.vue +++ b/src/pages/write_off/ym_confirm/ym_confirm.vue @@ -3,9 +3,9 @@ {{ orderInfo.extension.stadium_name || '-' }} - 今天剩余可使用:2次 + 今天剩余可使用:{{ orderInfo.extension.rest_number || '0' }}次 进场状态:{{ orderInfo.enter_status == 0?'离场':orderInfo.enter_status == 1?'进场':'' }} - 进场时间:2021-09-24 15:06:45 + 进场时间:{{ orderInfo.latest_enter_time || '-' }} @@ -37,7 +37,7 @@ import util from '../../../utils/util'; import { API } from '../../../js/api'; import { servers } from '../../../js/server'; -import { WRITE_OFF_ORDER_INFO } from '../../../js/once_name'; +import { WRITE_OFF_YM_ORDER_INFO, WRITE_OFF_ORDER_INFO } from '../../../js/once_name'; export default { data(){ return { @@ -71,7 +71,15 @@ export default { .then(res=>{ if(res.data.code == 0){ util.showNone(res.data.message || '操作成功!'); - setTimeout(_=>util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT'), 1200); + let { orderInfo } = this; + let _ls = res.data.data&&res.data.data.gates || []; + setTimeout(_=>{ + util.$_emit(WRITE_OFF_YM_ORDER_INFO, { + orderInfo, + gates: _ls + }); + util.routeTo(`/pages/write_off/ym_card_gated/ym_card_gated`, 'nT'); + }, 1200); }else{ util.showNone(res.data.message || '操作失败!'); }