From 2d77fe2ee8750449795c978935206cfc1f1d1d69 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 17 Feb 2022 17:59:48 +0800 Subject: [PATCH 1/5] del file --- src/pages.json | 12 -- src/pages/write_off/confirm/confirm.vue | 284 -------------------------------- src/pages/write_off/list/list.vue | 219 ------------------------ 3 files changed, 515 deletions(-) delete mode 100644 src/pages/write_off/confirm/confirm.vue delete mode 100644 src/pages/write_off/list/list.vue diff --git a/src/pages.json b/src/pages.json index 4c5beba..543507a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -176,18 +176,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/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 @@ - - - - - \ No newline at end of file From f31523089e1510f472d790096749c75dd8e3a4f0 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 18 Feb 2022 18:00:58 +0800 Subject: [PATCH 2/5] add write off events --- src/pages.json | 6 + .../write_off/confirm_order/confirm_order.vue | 1 + src/pages/write_off/events_order/events_order.vue | 138 +++++++++++++++++++++ src/pages/write_off/operate/operate.vue | 6 +- 4 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 src/pages/write_off/events_order/events_order.vue diff --git a/src/pages.json b/src/pages.json index 543507a..e51516c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -134,6 +134,12 @@ } }, { + "path": "pages/write_off/events_order/events_order", + "style": { + "navigationBarTitleText": "核销订单" + } + }, + { "path": "pages/write_off/mall/success/success", "style": { "navigationBarTitleText": "核销订单" diff --git a/src/pages/write_off/confirm_order/confirm_order.vue b/src/pages/write_off/confirm_order/confirm_order.vue index dc2dd20..2768698 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 @@ 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 From 507a333e51a4a9182293b0e6a713b278c3a384eb Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 23 Feb 2022 18:01:45 +0800 Subject: [PATCH 4/5] add write off success --- src/js/api.js | 2 +- src/pages/write_off/events_order/events_order.vue | 2 +- src/pages/write_off/success/success.vue | 85 ++++++++++++++++++++++- 3 files changed, 86 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index cfedf10..b4956ca 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -110,7 +110,7 @@ API['writeOff'] = { setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`, // 商家助手散客人数校正 // 20220222 新增赛事核销 - matchOrderVerify: `${ORIGIN}/admin/assistant/matchOrder/verify`, // 赛事订单确认核销 + // matchOrderVerify: `${ORIGIN}/admin/assistant/matchOrder/verify`, // 赛事订单确认核销 /用回之前的核销 } diff --git a/src/pages/write_off/events_order/events_order.vue b/src/pages/write_off/events_order/events_order.vue index 4cb025a..96aa31b 100644 --- a/src/pages/write_off/events_order/events_order.vue +++ b/src/pages/write_off/events_order/events_order.vue @@ -65,7 +65,7 @@ export default { methods: { confirmWriteOff: util.debounce(function(){ servers.post({ - url: API.writeOff.matchOrderVerify, + url: API.writeOff.assistantVerify, data: {}, isDefaultGet: false, }) diff --git a/src/pages/write_off/success/success.vue b/src/pages/write_off/success/success.vue index f93460c..f92e304 100644 --- a/src/pages/write_off/success/success.vue +++ b/src/pages/write_off/success/success.vue @@ -1,7 +1,21 @@ @@ -19,7 +33,76 @@ export default { } .write-off-success{ .wos-stadium{ + padding: 0 24upx; + .ws-name{ + padding: 40upx 0 30upx; + font-size: 32upx; + font-weight: 500; + color: #1a1a1a; + border-bottom: 2upx solid #D8D8D8; + @include textHide(1); + } + } + .wos-main{ + padding: 134upx 64upx 124upx; + .wm-icon{ + display: block; + margin: 0 auto 46upx; + width: 100upx; + height: 100upx; + } + .wm-txt{ + margin-bottom: 90upx; + text-align: center; + line-height: 66upx; + font-size: 48upx; + font-weight: 500; + color: #333; + } + .wm-btn{ + line-height: 108upx; + height: 112upx; + text-align: center; + font-size: 32upx; + border-radius: 10upx; + border: 2upx solid $themeColor; + color: $themeColor; + } + } + .wos-gate-ls{ + padding: 0 24upx; + border-top: 24upx solid #f2f1f6; + .wgl-tit{ + padding: 30upx 0; + line-height: 40upx; + font-size: 28upx; + color: #9c9c9f; + border-bottom: 2upx solid #D8D8D8; + } + .wgl-ls{ + .wl-item{ + height: 126upx; + border-bottom: 2upx solid #D8D8D8; + @include centerFlex(space-between); + .wi-name{ + flex-grow: 1; + font-size: 28upx; + color: #333; + @include textHide(1); + } + .wi-btn{ + margin-left: 24upx; + line-height: 68upx; + text-align: center; + flex-shrink: 0; + width: 156upx; + color: #fff; + border-radius: 10upx; + background-color: $themeColor; + } + } + } } } \ No newline at end of file From 20a132e1bb7a0d6d1d6a116c1fb499538e35d1a7 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 25 Feb 2022 18:00:18 +0800 Subject: [PATCH 5/5] events order --- src/js/api.js | 2 + src/pages/write_off/events_order/events_order.vue | 21 +++++- src/pages/write_off/success/success.vue | 87 +++++++++++++++++++++-- 3 files changed, 101 insertions(+), 9 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index b4956ca..e721007 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -111,6 +111,8 @@ API['writeOff'] = { // 20220222 新增赛事核销 // matchOrderVerify: `${ORIGIN}/admin/assistant/matchOrder/verify`, // 赛事订单确认核销 /用回之前的核销 + matchOrderGateLs: `${ORIGIN}/admin/assistant/matchOrderGate/list`, // 商家助手-赛事订单核销后获取门 + matchOrderGateOpen: `${ORIGIN}/admin/assistant/matchOrderGate/open`, // 商家助手-赛事订单核销后-开门 } diff --git a/src/pages/write_off/events_order/events_order.vue b/src/pages/write_off/events_order/events_order.vue index 96aa31b..1364e5f 100644 --- a/src/pages/write_off/events_order/events_order.vue +++ b/src/pages/write_off/events_order/events_order.vue @@ -6,7 +6,7 @@ 订单编号： - {{ orderInfo.verify_code || '-' }} + {{ orderInfo.order_no || '-' }} (赛事) @@ -64,17 +64,32 @@ export default { }, methods: { confirmWriteOff: util.debounce(function(){ + let { orderInfo, type } = this; servers.post({ url: API.writeOff.assistantVerify, - data: {}, + data: { + verify_type: type == 'verify_code'? 5 : 6, + brand_id: orderInfo.brand_id, + stadium_id: orderInfo.stadium_id, + verify_code: orderInfo.verify_code, + }, isDefaultGet: false, }) .then(res=>{ if(res.data.code == 0){ - + util.showNone(res.data.message || '操作成功！'); + let _query = { + order_no: orderInfo.order_no || '', + brand_id: orderInfo.brand_id || '', + stadium_name: orderInfo.stadium_name || '', + } + setTimeout(_=>util.routeTo(`/pages/write_off/success/success?query=${util.jsonStr(_query)}`, 'rT'), 1200); + // setTimeout(_=>util.routeTo(`/pages/write_off/success/success`, 'nT'), 1200); }else{ util.showNone(res.data.message || '操作失败！'); } + + }) }, 300, true) } diff --git a/src/pages/write_off/success/success.vue b/src/pages/write_off/success/success.vue index f92e304..ff4e916 100644 --- a/src/pages/write_off/success/success.vue +++ b/src/pages/write_off/success/success.vue @@ -1,19 +1,19 @@