From 2d77fe2ee8750449795c978935206cfc1f1d1d69 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 17 Feb 2022 17:59:48 +0800 Subject: [PATCH 01/11] 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 02/11] 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 04/11] 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 05/11] 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 @@ From 8f2b50958b679c030e24139ae0fd1d5128b51020 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 14 Mar 2022 17:59:59 +0800 Subject: [PATCH 06/11] fix cancel btn --- src/components/site/order_modal/order_modal.vue | 3 +-- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index f67ae0a..107c569 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -113,8 +113,7 @@ 订单详情 - - + 取消订场 diff --git a/src/js/api.js b/src/js/api.js index eea9f31..9e91b77 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index a5b378a..98b6d1a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wxf1294b279ad1b845", + "appid" : "wx7106e84614cf0060", "setting" : { "urlCheck" : false }, From 3c18edeec2ef3d3a215be8fa2907548885b9c05f Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 21 Mar 2022 17:58:06 +0800 Subject: [PATCH 07/11] add occupy --- src/components/site/order_modal/order_modal.vue | 13 +++ src/pages/site/confirm/confirm.vue | 116 ++++++++++++++++++++---- src/static/images/icon/selected_tag.png | Bin 0 -> 856 bytes 3 files changed, 109 insertions(+), 20 deletions(-) create mode 100644 src/static/images/icon/selected_tag.png diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 107c569..4144f64 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -14,6 +14,12 @@ {{ orderInfo.order_no || '' }} + + 占用用途： + + {{ orderInfo.take_up_use_text || '' }} + + 创建时间： @@ -60,6 +66,7 @@ + {{ orderInfo.back_stage_take_up_tips || '' }} @@ -398,6 +405,12 @@ export default { height: 2upx; background-color: #D8D8D8; } + .om-take-up-tip{ + line-height: 34upx; + font-size: 24upx; + color: #EA5061; + @include textHide(1); + } .om-total{ margin-top: 20upx; margin-bottom: 40upx; diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index 43095d4..db23b06 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -39,11 +39,31 @@ - 收取金额 - + * 收取金额 + ￥ + + + + * 占用用途 + + + 客户订场 + + + + 散客 + + + + 锁场 + + + + + 注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间 - 占用原因 + 占用原因 @@ -65,6 +85,7 @@ export default { return { ocPrice: '', ocReaon: '', + ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场 light_up: false, } }, @@ -88,7 +109,7 @@ export default { this.light_up = e.detail.value }, confirmOccupy: util.debounce(function(){ - let { storeInfo, dateInfo, venueList, typeInfo } = this.occupyInfo; + let { storeInfo, dateInfo, venueList, typeInfo, ocUsage } = this.occupyInfo; let { ocPrice, ocReaon, light_up } = this; util.showLoad(); servers.post({ @@ -99,12 +120,13 @@ export default { amount: +ocPrice, group: storeInfo.id, date: dateInfo.dateStr, + take_up_use: ocUsage, items: venueList.map(el=>{ return { venue_id: el.parentObj.venue_id, venue_name: el.parentObj.venue_name, duration: el.durations, - price: el.price + price: el.price, } }), light_up, @@ -248,37 +270,91 @@ export default { padding-top: 40upx; padding-bottom: 62upx; width: 682upx; + .si-tit{ + flex-shrink: 0; + margin-right: 28upx; + line-height: 40upx; + font-size: 28upx; + color: #333; + >text{ + color: #EA5061; + } + } .si-price{ margin-bottom: 12upx; @include centerFlex(flex-start); - .sp-tit{ - flex-shrink: 0; - margin-right: 28upx; - line-height: 40upx; - font-size: 28upx; - color: #333; - } + .sp-frame{ padding: 0 20upx; - width: 262upx; - height: 56upx; + width: 434upx; + height: 96upx; border: 2upx solid #D8D8D8; border-radius: 10upx; + @include centerFlex(flex-start); + >text{ + flex-shrink: 0; + flex-grow: 0; + font-size: 32upx; + line-height: 44upx; + color: #333; + + } >input{ - width: 100%; + flex-grow: 1; height: 100%; font-size: 28upx; color: #333; } } } + .si-usage{ + padding: 24upx 0; + .su-line{ + @include centerFlex(flex-start); + .su-ls{ + margin-bottom: 20upx; + @include centerFlex(flex-start); + >view{ + + padding: 0 10upx; + width: 152upx; + height: 72upx; + line-height: 68upx; + text-align: center; + border-radius: 10upx; + border: 2upx solid #D8D8D8; + font-size: 24upx; + color: #9a9a9d; + @include textHide(1); + &:not(:last-child){ + margin-right: 20upx; + } + + } + .active{ + position: relative; + color: $themeColor; + border-color: $themeColor; + >image{ + position: absolute; + right: -2upx; + top: -2upx; + width: 36upx; + height: 36upx; + } + } + } + } + .su-tip{ + font-size: 24upx; + line-height: 34upx; + color: #9a9a9d; + } + + } .si-reason{ - .sr-tit{ - margin-bottom: 18upx; - font-size: 28upx; - color: #333; - } .sr-frame{ + margin-top: 20upx; padding: 20upx 10upx; width: 682upx; height: 260upx; diff --git a/src/static/images/icon/selected_tag.png b/src/static/images/icon/selected_tag.png new file mode 100644 index 0000000000000000000000000000000000000000..f56e247d27a4a16dcf861cba912247a6d3abe7f1 GIT binary patch literal 856 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKSAb85E0AWGp2IM+jA3pW!;Dgf z8C483fn*5?%><%S5D8_MG0XyTOBrT^ME?K(|L5OdhG~TilX6&Ql`Af3nSAA_(EQpj zzkh!G`ThLsr*p2Ky#4X@jH|~Zb}wl?w^w3eqxZHsOK+dG+c-^qY1^jzSJMuze(~*- z{_5U6Pi~hU-?GGV{a&DBgi3<^f*DvEgkDHJ`SRwH;qjddf_p2Rw-{-sFfcG>d%8G= zL>yjo>2=;A1D>{ra%`+@Jaa7cbhiYY+i>^)Tiv!0sjVU|Gq(PHbNae_?UVSRE`mp4PE7P14GON2Uc@=irGwu^mpR7OS($Z_IHu^l) z6laa$8Gm}4$4!rhD>Dv43`=fx=3BQuVKUfO}E}tC!z3*Y>uHuT%&P0+f&ld(F|TxG7$#+80&MJGD^(zzbZy!~}Z zi}0au%db`a+^gt(D1GONwI(MflsMU3?}|^^$|z#jy_k_na*|(5+kWx74{@)46}Yu5 z5pMssmVJ7_FQCFr?aMB1cQ>8Blm$n=I_>nM<3jNA`(dvH*c~J|8WNfm7;irDSjock|G&bb*XQnjY82Go zw*UFpo{q4V7gruh{LTBK=}=T~wo`p!}w%{fgb%nc}C(5Jh8`BEkD&&Sa-kQ!|%e-CrP=j* Date: Thu, 31 Mar 2022 11:14:17 +0800 Subject: [PATCH 08/11] tapd 1000742&1000745 --- .../end_billing_modal/end_billing_modal.vue | 193 +++++++++++++++++++++ src/components/timing_order/timing_order.vue | 45 ++++- src/js/api.js | 5 + src/pages/order_list/order_list.vue | 2 +- .../write_off/confirm_order/confirm_order.vue | 33 +++- .../number_of_people/number_of_people.vue | 154 ++++++++++++++-- .../write_off/search_result/search_result.vue | 52 +++++- src/static/images/icon/selected_ring.png | Bin 0 -> 503 bytes .../order/timing_detail/timing_detail.vue | 144 ++++----------- src/subpackage/device/js/device_api.js | 1 + .../device/pages/order_details/order_details.vue | 34 +++- 11 files changed, 526 insertions(+), 137 deletions(-) create mode 100644 src/components/end_billing_modal/end_billing_modal.vue create mode 100644 src/static/images/icon/selected_ring.png diff --git a/src/components/end_billing_modal/end_billing_modal.vue b/src/components/end_billing_modal/end_billing_modal.vue new file mode 100644 index 0000000..bb92650 --- /dev/null +++ b/src/components/end_billing_modal/end_billing_modal.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/components/timing_order/timing_order.vue b/src/components/timing_order/timing_order.vue index 0536153..d9a96d6 100644 --- a/src/components/timing_order/timing_order.vue +++ b/src/components/timing_order/timing_order.vue @@ -12,7 +12,7 @@ - + 项目： @@ -25,16 +25,29 @@ {{ orderInfo.extension.duration || '-'}} + 结束计费 实付款 ¥{{orderInfo.pay_amount || 0}} + + + @@ -223,22 +309,22 @@ export default { } } .nop-main{ - padding: 8upx 30upx 0; + padding: 8upx 0upx 0; .nm-date{ - margin-bottom: 86upx; + margin: 0 24rpx 86rpx; line-height: 44upx; font-size: 32upx; color: #1a1a1a; } .nm-tit{ - margin-bottom: 48upx; + margin: 0 30rpx 16rpx; text-align: center; font-size: 32upx; font-weight: 500; } .nm-num{ position: relative; - margin: 0 auto 100upx; + margin: 0 auto; display: block; width: 400upx; height: 400upx; @@ -267,8 +353,16 @@ export default { 100% {transform: rotate(0deg);} } } + .nm-txt{ + margin: 10rpx auto 42rpx; + color: #9C9C9F; + font-size: 28rpx; + text-align: center; + line-height: 40rpx; + text-decoration: underline; + } .nm-btn{ - margin: 0 auto 106upx; + margin: 0 auto; width: 618upx; line-height: 112upx; height: 112upx; @@ -278,8 +372,24 @@ export default { color: #fff; background-color: $themeColor; } + .nm-line{ + margin: 46rpx 0 0; + padding: 34rpx 28rpx 20rpx 34rpx; + border-top: 2rpx solid #F2F2F7; + @include centerFlex(space-between); + .nl-txt{ + color: #1A1A1A; + font-size: 32rpx; + line-height: 44rpx; + } + + .nl-switch{ + flex-shrink: 0; + flex-grow: 0; + } + } .nm-tip{ - margin-bottom: 30upx; + margin: 0 32rpx 30rpx 34rpx; font-size: 28upx; line-height: 52upx; color: #9C9C9F; @@ -356,6 +466,30 @@ export default { } } } + .nmm-btm{ + margin-bottom: 8rpx; + } + .nmm-line{ + margin: 78rpx 70rpx 0 74rpx; + @include centerFlex(space-between); + >view{ + &:first-child{ + color: #1A1A1A; + font-size: 28rpx; + line-height: 48rpx; + } + &:nth-child(2){ + width: 156rpx; + height: 68rpx; + border: 2rpx solid #009874; + border-radius: 10rpx; + color: #009874; + font-size: 32rpx; + line-height: 64rpx; + text-align: center; + } + } + } } } diff --git a/src/pages/write_off/search_result/search_result.vue b/src/pages/write_off/search_result/search_result.vue index 346eb28..9547a32 100644 --- a/src/pages/write_off/search_result/search_result.vue +++ b/src/pages/write_off/search_result/search_result.vue @@ -27,10 +27,10 @@ （{{ e.type || '-' }}） - 用户昵称：{{ e.extension.nickname || '-' }} + 用户信息：{{ e.extension.user_phone || '-' }}（{{ e.extension.nickname || '-' }}） - 核销码： {{ e.verify_code || '-' }} + 核销码：　{{e.verify_code || '-' }} 验证方式：{{ e.desc || '-' }} @@ -39,9 +39,10 @@ 核销时间：{{ e.verify_time || '-'}} - 离场时间：{{ e.verify_leave_time || '未扫码离场'}} + 离场时间：{{ e.verify_leave_time || ''}} + 手动离场 核销订单 @@ -162,7 +163,34 @@ export default { let _list = res.list || []; return _list }) - } + }, + + leaveBtn(item){ + let { curStadium } = this; + util.showModal({ + title: '提示', + content: '是否确认手动离场？', + showCancel: true, + success: modalRes=>{ + if(modalRes.confirm){ + util.showLoad(); + servers.get({ + url: API.writeOff.leaveVerifyOrder, + data: { + brand_id: curStadium.brand_id, + id: item.id, + }, + failMsg: '请求失败！' + }) + .then(res=>{ + util.hideLoad(); + util.showNone('操作成功！'); + this.refreshList() + }) + } + } + }) + }, } } @@ -241,6 +269,7 @@ export default { .r-order-list{ padding: 0 24upx; .l-item{ + position: relative; margin-bottom: 24upx; padding: 0 20upx; border-radius: 10upx; @@ -269,9 +298,22 @@ export default { color: $themeColor; } } - + } } + .i-btn{ + position: absolute; + right: 20rpx; + bottom: 32rpx; + background-color: #009874; + border-radius: 10rpx; + width: 156rpx; + height: 68rpx; + color: #FFFFFF; + font-size: 28rpx; + text-align: center; + line-height: 68rpx; + } } } .r-bottom-btn{ diff --git a/src/static/images/icon/selected_ring.png b/src/static/images/icon/selected_ring.png new file mode 100644 index 0000000000000000000000000000000000000000..280cd03ff7ec33225f633ec999e1096bd209bd53 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dynE^f_u0Wb$UOB^z5{6k73^PkW zXjUo1tRk>TB~%0`2vh))Ed`@8h8d+`1;q@rN*HFBG0ZAsm|4s)8?0tVF#`ydGRy`V z2$U*jm{SQ<{BGB;sX)7wN`m}?8QA`aU)(>5@4I~chu5!eT|2#X$%4*MZ+8Q|+WV2= zPPV49a;;DPFfcGmd%8G=Se$MRzP{~<0*A>8&1K&=)&Bdhtez6AT@ z>!Y-0h)W9wANpjpLQItPr_|cC|8hLtmvmq0yola1QC&Sb|J0=~%BMFkZvFf0VZi&} z?#&Fw@6xXn>~`o|e&2w>MZ~Vz{!{0j?jtX3@)_8fZbJMq(WLx9~-o2?= zd?~BxYv(NEgFjew)xrwS)XIEp{+O^mxtGm2`tQ^Wo2%Uxb4C5U#wISY?u=LKq7dVS zdxX5yUQBUm(oj^>j0@J85|Q离场时间：{{orderInfo.end_time || '-'}} 时长合计：{{orderInfo.extension.duration || '-'}} - + 金额小计 ¥{{orderInfo.amount || 0}} @@ -53,26 +53,30 @@ 支付方式：{{zh_pay_type(orderInfo.pay_type)}} 支付时间：{{orderInfo.pay_time || '-'}} - 微信交易号：{{orderInfo.trade_no || ''}} + 微信交易号：{{orderInfo.trade_no || ''}} + 操作人：{{orderInfo.end_bill_operator_name || ''}} - 结束计费 - - - - - - - 结束计费 - 操作人：{{orderInfo.end_bill_operator_name || '-'}} - 时长合计：{{orderInfo.extension.duration || '-'}} - 金额合计：¥{{orderInfo.amount || '-'}} - *请输入金额 - - 确认 + + 退款信息 + + 退款原因：{{orderInfo.refund_reason || '-'}} + 退款时间：{{orderInfo.refund_time || '-'}} + 退款单号：{{orderInfo.refund_no || '-'}} + 结束计费 + 完结订单 + + + + @@ -81,7 +85,11 @@ import util from '@/utils/util'; import deviceServer from '../../../js/device_server'; import deviceApi from '../../../js/device_api'; import { mapState } from 'vuex'; +import end_billing_modal from '../../../../../components/end_billing_modal/end_billing_modal.vue'; export default { + components: { + 'end-billing-modal': end_billing_modal, + }, props: { orderInfo: { type: Object, @@ -92,9 +100,10 @@ export default { ...mapState(['brandInfo']), zh_order_status(){ // 订单状态 0计费中1已完成 + let { orderInfo } = this return status =>{ const _obj = { - '0': '计费中', + '0': orderInfo.early_end_timing==true?'待支付':'计费中', '1': '已完成', '4': '已退款', } @@ -116,30 +125,16 @@ export default { }, data() { return { - isShowEnd: false, - input_amount: "", + isEndBill: false, } }, methods: { - confirmChange(){ - let { brandInfo, orderInfo, input_amount } = this - if(input_amount == '')return util.showNone('请输入金额！'); - util.showLoad(); - deviceServer.get({ - url: deviceApi.timeOrderEnd, - data: { - brand_id: brandInfo.brand.id, - order_no: orderInfo.order_no, - pay_amount: parseFloat(input_amount), - }, - failMsg: '加载失败！' - }) - .then(res=>{ - util.hideLoad() - util.showNone('操作成功！'); - this.isShowEnd = false - setTimeout(()=>uni.navigateBack(),1200); - }) + completeBtn(){ + this.$emit('completeBtn'); + }, + + timeEndBtn(){ + this.$emit('refreshPage'); }, } } @@ -265,77 +260,6 @@ export default { line-height: 112rpx; text-align: center; } - .odm-end-modal{ - position: absolute; - left: 65rpx; - top: 12%; - background-color: #fff; - width: 620rpx; - padding: 30rpx 0rpx 80rpx; - border-radius: 10rpx; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - .oem-close{ - width: 100%; - @include centerFlex(flex-end); - >image{ - width: 32rpx; - height: 32rpx; - margin-right: 30rpx; - } - } - .oem-tit { - color: #333; - font-size: 32rpx; - font-weight: 700; - margin: 16rpx 0rpx 34rpx; - } - .oem-line{ - width: 456rpx; - color: #333; - font-size: 28rpx; - line-height: 48rpx; - .ol-txt1{ - color: #009874; - } - .ol-txt2{ - color: #FF873D; - } - } - .oem-tips{ - width: 456rpx; - margin: 34rpx 0rpx 8rpx; - color: #EA5061; - font-size: 28rpx; - >text{ - color: #333333; - } - } - .oem-ipt{ - width: 456rpx; - border: 2rpx solid #D8D8D8; - border-radius: 10rpx; - & input { - flex-grow: 1; - height: 88rpx; - color: #333; - font-size: 28rpx; - padding: 0rpx 20rpx; - } - } - .oem-btn{ - width: 240rpx; - height: 88rpx; - margin-top: 60rpx; - border-radius: 10rpx; - background-color: #009874; - color: #FFF; - font-size: 32rpx; - line-height: 88rpx; - text-align: center; - } - } + } diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js index 7e9293a..db8d9c1 100644 --- a/src/subpackage/device/js/device_api.js +++ b/src/subpackage/device/js/device_api.js @@ -36,6 +36,7 @@ export const DEVICE_API = { iccardList:`${ORIGIN}/admin/assistant/iccard/list`, //k-ic卡列表 timeOrderDetail:`${ORIGIN}/admin/assistant/timeOrder/detail`, //k-订单管理-计时订单详情 timeOrderEnd:`${ORIGIN}/admin/assistant/timeOrder/end`, //k-订单管理-订单计时结束 + timeOrderComplete:`${ORIGIN}/admin/assistant/timeOrder/complete`, //【20220208】k-订单管理-计时订单完结 // 20210521 恢复次卡核销状态 recoveryToSuccess:`${ORIGIN}/admin/stadium/order/recoveryToSuccess`, // 恢复次卡核销状态 diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue index d1a3325..d7e2bc8 100644 --- a/src/subpackage/device/pages/order_details/order_details.vue +++ b/src/subpackage/device/pages/order_details/order_details.vue @@ -5,7 +5,7 @@ - + @@ -159,6 +159,38 @@ order_no: optionsQuery.order_no, }) }, + + // 计时订单-完结订单 + completeBtn(){ + let { pageInfo } = this + util.showModal({ + title: '提示', + content: '是否确认完结订单？', + showCancel: true, + success: modalRes=>{ + if(modalRes.confirm){ + util.showLoad(); + deviceServer.get({ + url: deviceApi.timeOrderComplete, //计时订单完结 + data: { + brand_id: pageInfo.brand_id, + order_no: pageInfo.order_no, + }, + failMsg: '请求失败！' + }) + .then(res=>{ + util.hideLoad(); + util.showNone('操作成功！'); + this.refreshPage() + util.previousPageFunction({ + fnName: 'refreshList', + query: { isLoad: false}, + }); + }) + } + } + }) + }, } } From 98f106563ca92b12aadc91011b65a2a696b82282 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 31 Mar 2022 16:37:13 +0800 Subject: [PATCH 09/11] fix occupy --- src/components/site/order_modal/order_modal.vue | 2 +- src/pages/site/confirm/confirm.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 4144f64..7f365da 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -14,7 +14,7 @@ {{ orderInfo.order_no || '' }} - + 占用用途： {{ orderInfo.take_up_use_text || '' }} diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index db23b06..b2f5411 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -109,8 +109,8 @@ export default { this.light_up = e.detail.value }, confirmOccupy: util.debounce(function(){ - let { storeInfo, dateInfo, venueList, typeInfo, ocUsage } = this.occupyInfo; - let { ocPrice, ocReaon, light_up } = this; + let { storeInfo, dateInfo, venueList, typeInfo} = this.occupyInfo; + let { ocPrice, ocReaon, light_up, ocUsage } = this; util.showLoad(); servers.post({ url: API.venue.venueTakeUp, From bde858c5c6bc0b29171316ab0bf9bc44be4a3c64 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 31 Mar 2022 17:56:04 +0800 Subject: [PATCH 10/11] vtest 1.1.20 --- src/js/api.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/api.js b/src/js/api.js index a34d5fc..ee07ff2 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -126,3 +126,4 @@ export default { ORIGIN, API }; + From 3805356d25edf03b7af75ba4ffa2a2543c8a406a Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 31 Mar 2022 18:04:12 +0800 Subject: [PATCH 11/11] v1.1.20 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index ee07ff2..eff1d38 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 98b6d1a..a5b378a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false },