From 2aa2b646f2d86f24e6bf137d832f9a715ebee595 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 19 Jun 2023 17:56:44 +0800 Subject: [PATCH 1/9] add md230614 --- src/components/site/order_modal/order_modal.vue | 11 +++++++++++ src/pages/site/confirm/confirm.vue | 22 +++++++++++++++++----- src/pages/site/manage/manage.vue | 14 ++++++++++++-- .../retail/pages/confirm_order/confirm_order.vue | 6 +++--- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index aca5f50..6967c9f 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -124,6 +124,12 @@ 取消订场 + + + 分享给朋友 + 取消占用 + 收款 + @@ -471,6 +477,11 @@ export default { border-color: #EA5061; color: #EA5061; } + &.red2{ + background-color: #EA5061; + border-color: #EA5061; + color: #fff; + } } } } diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index d842700..b770ad4 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -46,10 +46,17 @@ * 占用用途 - + + + {{ e.name || "-" }} + + + + 注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间 @@ -85,8 +92,12 @@ export default { return { ocPrice: '', ocReaon: '', - ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场 + ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场, 4 -> 挂账 light_up: false, + usageLs: [ + { name: '客户订场', type: 1 }, { name: '散客', type: 2 }, + { name: '锁场', type: 3 }, { name: '挂账', type: 4 }, + ] } }, computed: { @@ -310,12 +321,13 @@ export default { .si-usage{ padding: 24upx 0; .su-line{ - @include centerFlex(flex-start); + display: flex; .su-ls{ + flex-wrap: wrap; margin-bottom: 20upx; @include centerFlex(flex-start); >view{ - + margin-bottom: 20upx; padding: 0 10upx; width: 152upx; height: 72upx; diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index deee003..2be72cf 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -133,7 +133,7 @@ {{occupyTip || '-'}} - + @@ -166,6 +166,7 @@ export default { { n: '课程预定', c: 'pistac' }, { n: '固定场锁定', c: 'blue' }, { n: '已占用', c: 'black' }, + { n: '挂账', c: 'red' }, ], // 订场看板信息 boardInfo: null, // { brand_id，stadium_id, venue_id, date, duration } @@ -957,6 +958,11 @@ export default { border-color: #9A9A9D; color: #9A9A9D; } + &.red{ + color: #fff; + background-color: #EA5061; + border-color: #EA5061; + } } } } @@ -1055,7 +1061,7 @@ export default { &:nth-child(2){ line-height: 34upx; text-align: center; - font-size: 28upx; + font-size: 24upx; color: #9a9a9d; } &.green{ @@ -1073,6 +1079,10 @@ export default { background-color: #333333; border-color: #333333; } + &.red{ + background-color: #EA5061; + border-color: #EA5061; + } } } diff --git a/src/subpackage/retail/pages/confirm_order/confirm_order.vue b/src/subpackage/retail/pages/confirm_order/confirm_order.vue index d350b06..cf16f53 100644 --- a/src/subpackage/retail/pages/confirm_order/confirm_order.vue +++ b/src/subpackage/retail/pages/confirm_order/confirm_order.vue @@ -288,9 +288,9 @@ flex-direction: column; width: 100vw; height: 100vh; - padding-bottom: 0rpx; - padding-bottom: calc( 0rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ - padding-bottom: calc( 0rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ + padding-bottom: 112rpx; + padding-bottom: calc( 112rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 112rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ .final-cart-list { display: flex; From a2ebb1b342ac1dc16dfddd4504e157b77c264257 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 20 Jun 2023 18:00:43 +0800 Subject: [PATCH 2/9] add api --- src/components/site/order_modal/order_modal.vue | 11 +++-- src/pages/site/confirm/confirm.vue | 53 +++++++++---------------- src/pages/site/manage/manage.vue | 37 +++++++++++++---- src/store/index.js | 1 + 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 6967c9f..239eddc 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -124,11 +124,11 @@ 取消订场 - - + + 分享给朋友 取消占用 - 收款 + 收款 @@ -168,6 +168,9 @@ export default { this.getOrderInfo(); }, methods: { + toCollections(){ + this.$emit('btn:toCollections', this.orderInfo); + }, releaseBtn(){ util.showModal({ title: '是否确认释放场地', @@ -300,6 +303,8 @@ export default { return '约玩占用' case 'fixed_venue': return '固定场锁定' + case 'take_up_venue_bboc': + return '挂账占用' default: return '-' } }, diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index b770ad4..8b4a543 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -24,7 +24,7 @@ 预定场次： - {{e.parentObj.venue_name || '-'}} {{e.durations || '-'}} (¥{{e.price || '-'}}) + {{e.venue_name || '-'}} {{e.duration || '-'}} (¥{{e.price || '-'}}) @@ -34,13 +34,20 @@ - *是否联动开灯 + + *是否联动开灯 + + 联动开灯开启后，会根据占用时间自动开灯 * 收取金额 - ￥ + ￥ @@ -52,19 +59,6 @@ - 注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间 @@ -72,7 +66,7 @@ 占用原因 - + @@ -101,14 +95,17 @@ export default { } }, computed: { + isOrder(){ + return !!this?.occupyInfo?.orderInfo?.order_no; + }, ...mapState([ 'occupyInfo' ]), totalPrice(){ let { occupyInfo } = this; + if(occupyInfo?.orderInfo?.amount)return occupyInfo.orderInfo.amount; let _list = occupyInfo.venueList || []; if(!_list.length)return 0; let _price = 0; _list.forEach(e=>_price += +e.price); - console.warn(_price) return _price.toFixed(2); } }, @@ -116,8 +113,8 @@ export default { console.log(this.occupyInfo) }, methods: { - switchChange(e){ - this.light_up = e.detail.value + initOrderPage(){ + let { occupyInfo, isOrder }= this; }, confirmOccupy: util.debounce(function(){ let { storeInfo, dateInfo, venueList, typeInfo} = this.occupyInfo; @@ -132,14 +129,7 @@ export default { 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, - } - }), + items: venueList, light_up, }, isDefaultGet: false @@ -152,13 +142,6 @@ export default { let _res = res.data.data || {}; let _qrStr = `?brand_id=${_res.brand_id}&order_no=${_res.order_no}` util.routeTo(`/pages/site/occupy_success/occupy_success${_qrStr}`, 'rT'); - // setTimeout(_=>{ - // util.routeTo(); - // util.previousPageFunction({ // 刷新占用列表 - // fnName: 'refreshList', - // query: null - // }) - // }, 1200) }else{ util.showNone(res.data.message || '操作失败！'); } diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index 2be72cf..39302c0 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -125,7 +125,7 @@ ¥{{totalPrice || '0.00'}} - + {{selectedVenueList.length?'提交订单':'请选择场地'}} @@ -133,7 +133,13 @@ {{occupyTip || '-'}} - + @@ -244,6 +250,8 @@ export default { return { zh_text: info.message || '约玩占用', type: info.type, className: 'black', } case 'fixed_venue': return { zh_text: info.message || '固定场锁定', type: info.type, className: 'blue', } + case 'take_up_venue_bboc': + return { zh_text: info.message || '挂账占用', type: info.type, className: 'red', } default: return {} @@ -534,17 +542,32 @@ export default { this.curTypeInfo = typeList[e.detail.value]; this.$nextTick(_=>this.refreshVenues()); }, - toOrderConfirm(){ - let { curStoreInfo, curTypeInfo, curDateInfo, selectedVenueList } = this; + subOrder(){ + let { selectedVenueList } = this; if(!selectedVenueList.length)return; - + this.toOrderConfirm({ + venueList: selectedVenueList.map(el =>({ + venue_id: el.parentObj.venue_id, + venue_name: el.parentObj.venue_name, + duration: el.durations, + price: el.price, + })), + }); + }, + toConfirmPage(orderInfo){ + this.toOrderConfirm({ + venueList: orderInfo.sessions || [], + orderInfo, + }); + }, + toOrderConfirm(extraObj){ + let { curStoreInfo, curTypeInfo, curDateInfo } = this; this.$store.commit('setOccupyInfo', { storeInfo: curStoreInfo, dateInfo: curDateInfo, typeInfo: curTypeInfo, - venueList: selectedVenueList, + ...extraObj, }) - util.routeTo(`/pages/site/confirm/confirm`, 'rT'); }, // 场馆列表 diff --git a/src/store/index.js b/src/store/index.js index 885237a..cdc5dcc 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,6 +50,7 @@ export default new Vuex.Store({ dateInfo: {}, // 时间信息 typeInfo: {}, // 球场类型 venueList: [], // 选择场地列表 + orderInfo: {}, // 订单信息 // 20230620 新增挂账需求，用于回显确认订单 } }, mutations, From 76a09ef4c61cae1bc2eeda87756b13b6d6d0fc63 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 21 Jun 2023 17:55:47 +0800 Subject: [PATCH 3/9] add common pay select --- src/components/site/order_modal/order_modal.vue | 4 +- src/pages.json | 11 + src/pages/site/confirm/confirm.vue | 102 ++++-- src/pages/site/manage/manage.vue | 7 +- src/subpackage/common/components/card_search.vue | 276 +++++++++++++++ src/subpackage/common/js/api.js | 9 + src/subpackage/common/js/server.js | 10 + src/subpackage/common/pages/pay_type_select.vue | 374 +++++++++++++++++++++ src/subpackage/common/static/images/choose.png | Bin 0 -> 392 bytes src/subpackage/common/static/images/ic_0.png | Bin 0 -> 659 bytes src/subpackage/common/static/images/ic_1.png | Bin 0 -> 627 bytes src/subpackage/common/static/images/ic_2.png | Bin 0 -> 1318 bytes src/subpackage/common/static/images/ic_3.png | Bin 0 -> 764 bytes src/subpackage/common/static/images/ic_4.png | Bin 0 -> 1312 bytes .../store_card_select/store_card_select.vue | 1 - 15 files changed, 769 insertions(+), 25 deletions(-) create mode 100644 src/subpackage/common/components/card_search.vue create mode 100644 src/subpackage/common/js/api.js create mode 100644 src/subpackage/common/js/server.js create mode 100644 src/subpackage/common/pages/pay_type_select.vue create mode 100644 src/subpackage/common/static/images/choose.png create mode 100644 src/subpackage/common/static/images/ic_0.png create mode 100644 src/subpackage/common/static/images/ic_1.png create mode 100644 src/subpackage/common/static/images/ic_2.png create mode 100644 src/subpackage/common/static/images/ic_3.png create mode 100644 src/subpackage/common/static/images/ic_4.png diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 239eddc..8377c60 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -126,9 +126,9 @@ - 分享给朋友 + 分享给朋友 取消占用 - 收款 + 收款 diff --git a/src/pages.json b/src/pages.json index c1e0f13..ba403fa 100644 --- a/src/pages.json +++ b/src/pages.json @@ -694,6 +694,17 @@ } } ] + }, + { + "root": "subpackage/common", + "pages": [ + { + "path": "pages/pay_type_select", + "style" : { + "navigationBarTitleText": "支付订单" + } + } + ] } ], "globalStyle": { diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index 8b4a543..d8ce167 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -38,7 +38,8 @@ *是否联动开灯 @@ -47,14 +48,14 @@ * 收取金额 - ￥ + ￥ * 占用用途 - + {{ e.name || "-" }} @@ -66,13 +67,17 @@ 占用原因 - + - 确定 + {{ nextBtnTxt || '-' }} @@ -95,6 +100,11 @@ export default { } }, computed: { + nextBtnTxt(){ + let { ocUsage, isOrder } = this; + if(ocUsage == 4&&!isOrder)return '确认'; + return '下一步'; + }, isOrder(){ return !!this?.occupyInfo?.orderInfo?.order_no; }, @@ -110,34 +120,88 @@ export default { } }, onLoad(){ - console.log(this.occupyInfo) + console.log(this.occupyInfo); + this.initOrderPage(); }, methods: { initOrderPage(){ let { occupyInfo, isOrder }= this; + if(!occupyInfo|| !isOrder)return; + let _orderInfo = occupyInfo?.orderInfo || {}; + this.ocReaon = _orderInfo.reason || ''; + this.ocPrice = _orderInfo.amount || ''; + this.ocUsage = this.sereverTypeToUsage(_orderInfo.type) || 1; + this.light_up = _orderInfo.light_up || false; + }, + sereverTypeToUsage(type){ + let _obj = { + 'take_up_venue_bboc': 4, + 'fixed_venue': 3, + } + return _obj[type] || 1; + }, + lightChange(e){ + this.light_up = e.detail.value; + }, + usageChange(type){ + let { isOrder } = this; + if(isOrder)return; + this.ocUsage = type; + }, + toOccupyPaySelect(occupyData){ + + }, + toOrderPaySelect(additionalData){ + let { storeInfo } = this.occupyInfo; + let { ocPrice, ocUsage } = this; + let _query ={ + type: ocUsage, + brand_id: storeInfo?.brand_id, + amount: ocPrice, + stadiumInfo: { + id: storeInfo?.id, + name: storeInfo?.name, + logo: storeInfo?.logo, + }, + ...additionalData + } + util.routeTo(`/subpackage/common/pages/pay_type_select?query=${util.jsonStr(_query)}`, 'rT') }, confirmOccupy: util.debounce(function(){ - let { storeInfo, dateInfo, venueList, typeInfo} = this.occupyInfo; - let { ocPrice, ocReaon, light_up, ocUsage } = this; + let { storeInfo, dateInfo, venueList, typeInfo, orderInfo} = this.occupyInfo; + let { ocPrice, ocReaon, light_up, ocUsage, isOrder } = this; + + let occupyData = { + brand_id: storeInfo.brand_id, + group: storeInfo.id, + amount: +ocPrice, + date: dateInfo.dateStr, + take_up_use: ocUsage, + items: venueList, + light_up, + reason: ocReaon, + } + + if(isOrder&&ocUsage == 4)return this.toOrderPaySelect({ + exQuery: { + order_no: orderInfo?.order_no, + reason: ocReaon, + } + }); + + if(ocUsage !== 4)return this.toOrderPaySelect({ + exQuery: occupyData, + }); + util.showLoad(); servers.post({ url: API.venue.venueTakeUp, - data: { - brand_id: storeInfo.brand_id, - reason: ocReaon, - amount: +ocPrice, - group: storeInfo.id, - date: dateInfo.dateStr, - take_up_use: ocUsage, - items: venueList, - light_up, - }, + data: occupyData, isDefaultGet: false }) .then(res=>{ util.hideLoad(); if(res.data.code == 0){ - util.showNone(res.data.message || '操作成功！'); let _res = res.data.data || {}; let _qrStr = `?brand_id=${_res.brand_id}&order_no=${_res.order_no}` diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index 39302c0..4169b8a 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -558,9 +558,10 @@ export default { this.toOrderConfirm({ venueList: orderInfo.sessions || [], orderInfo, - }); + }, 'nT'); + this.$nextTick(_=>this.boardInfo = null); }, - toOrderConfirm(extraObj){ + toOrderConfirm(extraObj, type = 'rT'){ let { curStoreInfo, curTypeInfo, curDateInfo } = this; this.$store.commit('setOccupyInfo', { storeInfo: curStoreInfo, @@ -568,7 +569,7 @@ export default { typeInfo: curTypeInfo, ...extraObj, }) - util.routeTo(`/pages/site/confirm/confirm`, 'rT'); + util.routeTo(`/pages/site/confirm/confirm`, type); }, // 场馆列表 getVenueList({ type_key, stadium_id, date }){ diff --git a/src/subpackage/common/components/card_search.vue b/src/subpackage/common/components/card_search.vue new file mode 100644 index 0000000..9d6c58f --- /dev/null +++ b/src/subpackage/common/components/card_search.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/src/subpackage/common/js/api.js b/src/subpackage/common/js/api.js new file mode 100644 index 0000000..2c68d23 --- /dev/null +++ b/src/subpackage/common/js/api.js @@ -0,0 +1,9 @@ +import { ORIGIN } from '../../../js/api'; + +export const COMMON_API = { + assistantGetValueCardList:`${ORIGIN}/admin/assistant/getValueCardList`, // 搜索储蓄卡 + takeUpBbocPay:`${ORIGIN}/admin/stadium/venue/takeUpBbocPay`, // 挂账收款的接口 + venueTakeUp: `${ORIGIN}/admin/stadium/venue/takeUp`, // 商家助手-占用场地提交 +} + +export default COMMON_API; \ No newline at end of file diff --git a/src/subpackage/common/js/server.js b/src/subpackage/common/js/server.js new file mode 100644 index 0000000..005716d --- /dev/null +++ b/src/subpackage/common/js/server.js @@ -0,0 +1,10 @@ +import { Server } from '../../../js/server'; + +class CommonServer extends Server { + constructor(props){ + super(props) + } +} + + +export default new CommonServer(); \ No newline at end of file diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue new file mode 100644 index 0000000..6936523 --- /dev/null +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -0,0 +1,374 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/common/static/images/choose.png b/src/subpackage/common/static/images/choose.png new file mode 100644 index 0000000000000000000000000000000000000000..be2b30b6145364e1b243c78698fd81ac775808d5 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z`~rMJT!A#h%o2tfa8wHB7BkE$ z0il`243lz!vj6}8-}&gK(EPd!ub*13pImuj+ozx3?|*vRer|8vzU5xq=Dhj-WzF47 zZza!001f0R3GxeOIC=fY>m@TXB3u+jC9Y=$0LAZmx;TbdoSu5+F5e*q9@Yob8Vzh# z%>MuW|Ds(BZZgG90C^#)JnG^=YoCcGcN3CRT?P580k_U}(NscEiOc4A>urC;PfEDo8(IN5QP7qhci z=dS5&(`-j9~3%@+` z>{=!wS!Ubbp!QQjPWrOWhUF*k*S<2)?C5y^q`>>$b>-yu!t7rTC{0bXs@Z9<(MZTL zHR8&X?8TbDD$6D_io!_BUyR!0_V3c3&)=_}e5|rSh;gOXZD%+3jHD=)-oKZ&UWl1? zf&2G{Z6QwI=j}IYiS-PBJe#-o)#+z*s#3(-Q{LS9S8X&y^Q&b0OXKYh2Rd&q71BGS zCV6$|{wXH~;~)I1Dco=UNT+qPwI-K^m*?bN?@}dXiXMvAuJ|_jdnW7QWgC{5p8Td% zxhT|j%?(Aq6N?VNki4F%vOwVCgNd^8i(kdZf0f&K=909Y6_ cFYiBLpU(ZzS3i=q2^irFp00i_>zopr09|Am_5c6? literal 0 HcmV?d00001 diff --git a/src/subpackage/common/static/images/ic_1.png b/src/subpackage/common/static/images/ic_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4640ef9349bc3beaad7bbd62ddf6b0ed779351 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`6$SW&xB_X0mHz~medb^KSpbSY zih#Mi%f0|b_?H32zk(TG_?CU;UH%2E@)Q5EFFeb?@-O`al3My%5KMyEKq(*sYW&K- z9AqX)J;;#Hf*=DwDSj)u4YX9XB*-tAf%W3g{*Ut9*HoS?)T=Kx5q^2bQR2@26*>Oa zN4KQAYtCqk-x;%h+PriI2F7kr7sn8f<8PrpWW$>oe9{*sU~7QWg0#iRFIr^G_Oe3YFCoI|}vBTZ_Kzy=zqv+O6^P zgv_bf^JjN0ZSYWXzjxbU;n|qK7Z2Dy75bBNM3wKOO@!==*yh=%DptPT$DMULGpi(X z?wy&6QrT~<517~*wJqKnIc@G1>DeOe-J#AxerMOpE!wa|;r2^Cxw07nnw#C;`9GJh zi@Y8wb~R*4==6zfH>};3^&6B2R38+XZjtmu%>3mM#f8zoExt_i&}2Ah*JYABsmm#F z*5BS&8;{n?rV5{`FipKLrGqXw@Jqy p6~CHbY1ZRpkz#psrE2~^t@$kpQT0}~sZ&6y$J5o%Wt~$(69A4-9+Ln7 literal 0 HcmV?d00001 diff --git a/src/subpackage/common/static/images/ic_2.png b/src/subpackage/common/static/images/ic_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c95d079604012de984ed54c621180ef4494d1317 GIT binary patch literal 1318 zcmV+>1=;$EP)dZ}+Hf z`Lu8Nu5bIdaFM+B0ssI2Qgl*IQvd=M4hJDsH1j*3QS9fM_ut5!|}BvXzd0e0%!(?d#^>)XT@LpK@=W9C{JS#KaO{4F;f3Ez(wgH zxD>w0Sp^zYr!8sM; zz>KnwmbZ?v&BB+f7F&gq*cS>W36K`fzMK^^1NmU}j{qHS(X-ge=1N#s>%_>VGJmF& z=Q+|AcC3fEg$KU{H^l(VX~xqDS*0NLtYI7|1vC_*#4!A@KL{7L+xY*wETnG1XsRW) zTjPaUvxj7qq>@q4$R)RBoNFNil*H#jbdVbbW8=9doYhE|wG|X`%5FdCG_jY$GbWKl zBySr=RlP9`s5GIUlPY1Kv(+Oib4P2|nR7%f!wnV~=W$A0`>e8bgmqtH7jOrp)H zfa@rEX*610(rz3l+#w2`J6;dR=rr74GWjqar;(DSVZ$_I3grf9FV zclXc-lj+saz~n6PoVj6ObNJ0PuMiO$4lpEVPosB`zf3x=Pgh7fHD`R|$sdFPNL`Qf zTP4P#uoX&Am5mTB0AXCZ7tYTdEe2ss8cxn9Vit!%YPo@TDhU>ctb}!LqsL}5` cjs63F0b15v+hIV~T>t<807*qoM6N<$g1RE8c>n+a literal 0 HcmV?d00001 diff --git a/src/subpackage/common/static/images/ic_3.png b/src/subpackage/common/static/images/ic_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d077fec53552bbe5ee9de13c0e81c82a9be2c6cd GIT binary patch literal 764 zcmVd=;*W8M280wSWkqd>OEf2%vl$vX2j^gA}ZY8nKTStcnt< zhYzNKL)Nw!vyC3Lk`k$g8nKQRt&0_{i5szw5~+q9vyc?6i5aqv4yA$?t&0Ysd=9FE z1Dkh2)UpYneLT>w52u6ynRXDTghSP|6RU^>oq8X(lNGFqKhv@cqkjaPcsP8|RM0g*{WK~zY`?as+|(?Ae~ z;h({l=OK>mkT{Nq%poBIlOZ-%w*aB{e;}&maHxaWbZ?SHzC~9_s@o-=J%;U99=11; zi-ng9iQOG7JRRL}z3_I;$-TD|?gQ{OKv?K|0Dc7EWdNSI7XkPZAT0FFah|u{osA>p!r6T>)3t4l2+e)PWCnAEz31npV-F9pIC-ds6moA1c-!@E{uK zkWpks$C$c|H=DrJn4YYeMpa->&FPRE?;5vnY~ILukYCd?W*50lhcaah^{fNzWcfd4 zO&85F7iz0H5@iJQ_kCHHByHeb;`T+|t%{VEn$sbfkxAffl63Pj;*YIFAy$S!T?V9$ zq#ed>Hu~+Mp3|XxvijpTxE=7O~boBSzA+q>k6A z?3=EOROn%L-jL=-nw#}UIVb-MEwx6uT&}sMCQW16I6jugBIKp78keipa=B96lUDqG u$?S0D>2LgFKP)vYL?KKyyT6v;GV+gj<(^Jz2$|h-kibbin8FC zz2=6k+>*HCnZW0mzU7j*;*YlBl)B?+l+TT{;CrRmY?siT!sm3J)Mk>;jI-ZrmC&BU z=$pXijkMvHz2uX*et=w>$(xAlYo4@C1lFogl*=?86 zfvMYXo6>%&+iI22fT-Gyv*2@_(~z~`fT!Acq1J1c(1NPlb)M8{l+JaZ)Pt(qYn9M? zqtR#({h{AaGKI;md|;k)@+y1d!*N$!suv}&ZrlLxBvhEZgf&kQvfb_ z;UNQhBqs=BClu}t{Oguk9T@r7n3#=AJS`FY_vF^n$j807u&Sq;j*g9dbZ=*8UR6d# zJ~I3J_4M=c@9*y9;^5iW&CSQd!MC=kp`f0SiHCS_Xktt>82R(^=-1TE#KOF?tEq~D zaBWpN@`FGC00PWOL_t(Y$Cc8DU)n$v2k?gyH3}-Cw2FIg>#Wwgcip>c_ntOrY0Hoy z)W5sAdw1cIkP^P1PcFINyO)FaG&(+6EeWygova%jI^5fCZSDfI^1p(G z)y;0tk*8~ObwNm5!L05_ZZ0tCve7n_@57MW3wjUT*LJk(`l<(}uI+JulK~BTHl{97 zWg+Fh6uI?b&6a1Jw5?@U3;>|p3QOv-@95HWt6?GPCc$GNc*3^6 zQcEfuXyRf?B%%&mv@IeSW%t&C2N>*%i#ka1C=$6+siS(Zn@cTMn6*f_KM_`^Beq?M zdVv~e(>i_^5&bFCViF2XVqYhncHm@CsH;OK$zFzZ*73FK=>)&5cUr%Me#vD;A=iq+ z&g>)fs`Fm{)qHd?xMvM)HWAI}1LovL6^)Vu zM|D~P#8aH>>gT|?o&|{;hFtMBmI(D%py>&6J;e08RW4eNdS+<%MO3K$oS9c=cQmFFHER0a9E=wCXP!NNbg WOP|-Luo;;E0000 import util from '../../../../utils/util.js'; - import tools from '../../js/tools.js'; import retailServer from '../../js/retail_server'; import retailApi from '../../js/retail_api'; From a521bf602f681f93b4f3533e12d9cd9da8740377 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Sun, 25 Jun 2023 18:00:29 +0800 Subject: [PATCH 4/9] gx modal --- src/subpackage/common/components/card_search.vue | 417 ++++++++++------------- src/subpackage/common/js/api.js | 1 + src/subpackage/common/pages/pay_type_select.vue | 72 ++-- src/subpackage/common/static/images/x_close.png | Bin 0 -> 233 bytes 4 files changed, 228 insertions(+), 262 deletions(-) create mode 100644 src/subpackage/common/static/images/x_close.png diff --git a/src/subpackage/common/components/card_search.vue b/src/subpackage/common/components/card_search.vue index 9d6c58f..8b66b63 100644 --- a/src/subpackage/common/components/card_search.vue +++ b/src/subpackage/common/components/card_search.vue @@ -1,276 +1,215 @@ + \ No newline at end of file diff --git a/src/subpackage/common/js/api.js b/src/subpackage/common/js/api.js index 2c68d23..e38485a 100644 --- a/src/subpackage/common/js/api.js +++ b/src/subpackage/common/js/api.js @@ -4,6 +4,7 @@ export const COMMON_API = { assistantGetValueCardList:`${ORIGIN}/admin/assistant/getValueCardList`, // 搜索储蓄卡 takeUpBbocPay:`${ORIGIN}/admin/stadium/venue/takeUpBbocPay`, // 挂账收款的接口 venueTakeUp: `${ORIGIN}/admin/stadium/venue/takeUp`, // 商家助手-占用场地提交 + canUseValueCardList: `${ORIGIN}/admin/stadium/canUseValueCard/list`, // 商家助手-占用场地可用储值卡列表 } export default COMMON_API; \ No newline at end of file diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue index 6936523..9be7a6d 100644 --- a/src/subpackage/common/pages/pay_type_select.vue +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -6,9 +6,11 @@ {{ stadiumInfo.name || '-' }} 订场支付金额 - ¥{{ optionsQuery.amount || 0 }} + ¥{{ payAmount || 0 }} - 原价：¥99，折扣金额¥9.9 + + 原价：¥{{ optionsQuery.amount || 0 }}，折扣金额¥{{ discountAmount || 0 }} + @@ -26,41 +28,43 @@ - + - 储值卡卡号：230316000 - 使用会员卡支付9折 + 储值卡卡号：{{ selectedCard.card_no || '-' }} + 使用会员卡支付{{ selectedCard.discount || '-' }}折 - 微信昵称：LLL + 微信昵称：{{ selectedCard.nickname || '-' }} - 手机号码：13711029033 + 手机号码：{{ selectedCard.mobile || '-' }} - 卡名称：1000元送200元卡 + 卡名称：{{ selectedCard.card_name || '-' }} - 卡余额：￥1050 + 卡余额：￥{{ selectedCard.amount || '0' }} - + 立即支付 - - + @@ -68,10 +72,11 @@ import server from '../js/server.js'; import API from '../js/api.js'; import util from '../../../utils/util.js'; -import storeCardSelect from '../components/card_search'; +import cardSearch from '../components/card_search'; +import numeral from 'numeral'; export default { components: { - 'storeCardSelect': storeCardSelect + 'card-search': cardSearch }, computed: { stadiumInfo(){ @@ -79,15 +84,30 @@ export default { }, exQuery(){ return this?.optionsQuery?.exQuery || {}; + }, + discountAmount(){ + let { selectedCard, optionsQuery, payAmount, payMethodsID } = this; + if(selectedCard?.discount && payMethodsID == 3){ + return Math.floor((optionsQuery?.amount * 100) - (payAmount * 100))/100; + } + return 0; + }, + payAmount(){ + let { selectedCard, optionsQuery, payMethodsID } = this; + if(selectedCard?.discount && payMethodsID == 3){ + return Math.floor((optionsQuery?.amount * 100) * (selectedCard?.discount / 10))/100; + } + return optionsQuery?.amount; } }, data() { return { - isCardSearchModalShow: false, + isCardSelectModal: false, payMethodsLs: this.getPayMethodsLs(), payMethodsID: 0, optionsQuery: {}, otherTypeRemark: '', + selectedCard: {} } }, /** @@ -107,9 +127,13 @@ export default { onLoad(option){ let optionsQuery = util.jsonPar(decodeURIComponent(option.query)); this.optionsQuery = optionsQuery; - console.warn(optionsQuery) }, methods: { + cardSelectConfirm(e){ + if(!e?.card_no)return this.payMethodsID = 0; + this.selectedCard = e; + this.payMethodsID = 3; + }, submitBtn: util.debounce(function(){ let _type = this.optionsQuery?.type; if(+_type === 4)return this.takeUpBbocPay(); @@ -117,7 +141,7 @@ export default { }, 300, true), payMethodsChange(e){ - if(e.id == 3)this.isCardSearchModalShow = true; + if(e.id == 3)return this.$refs.cardSearch.show(); this.payMethodsID = e.id; }, getPayMethodsLs(){ @@ -132,7 +156,7 @@ export default { // 挂账订单支付提交 takeUpBbocPay(){ - let { optionsQuery, payMethodsID, otherTypeRemark } = this; + let { optionsQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { brand_id: optionsQuery.brand_id || '', amount: optionsQuery.amount || '', @@ -141,6 +165,7 @@ export default { take_up_pay_type: payMethodsID } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; + if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; server.post({ url: API.takeUpBbocPay, data: _data, @@ -156,12 +181,13 @@ export default { // 1 -> 客户订场， 2-> 散客， 3-> 锁场, 提交 takeUpSubmit(){ - let { exQuery, payMethodsID, otherTypeRemark } = this; + let { exQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { ...exQuery, take_up_pay_type: payMethodsID || '' } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; + if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; util.showLoad(); server.post({ url: API.venueTakeUp, diff --git a/src/subpackage/common/static/images/x_close.png b/src/subpackage/common/static/images/x_close.png new file mode 100644 index 0000000000000000000000000000000000000000..d8cc22ac24bacbd5c363934c456e089a4ddd74d1 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U_3?xrvihTr9q5(c3u0VR$thuvi&jX@av*yj2 zvta)G`J67RB!Cj^B|(0{4FAGcH9K=WdFr_gC{*L=;uxZFe(t1`ybT6CEV}FdFJpSq zz|N|0(ZOrMe=UcuN3OHv|J~TA-hRDv{(aDw8@h9|dXkJ~A6f*TxvDF-f Date: Mon, 26 Jun 2023 17:35:28 +0800 Subject: [PATCH 5/9] fix 230614 bug --- src/pages/site/confirm/confirm.vue | 19 ++++++++++++++----- src/subpackage/common/components/card_search.vue | 2 +- src/subpackage/common/pages/pay_type_select.vue | 16 +++++++++------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index d8ce167..9203127 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -47,12 +47,12 @@ - * 收取金额 - ￥ + 收取金额 + ￥ - * 占用用途 + * 占用用途 @@ -65,7 +65,9 @@ 注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间 - 占用原因 + + * 占用原因必填，占用原因将显示在看板对应占用的场地 + @@ -182,6 +184,8 @@ export default { reason: ocReaon, } + if(ocReaon === '')return util.showNone('请填写占用原因！'); + if(isOrder&&ocUsage == 4)return this.toOrderPaySelect({ exQuery: { order_no: orderInfo?.order_no, @@ -334,9 +338,14 @@ export default { line-height: 40upx; font-size: 28upx; color: #333; - >text{ + >.red{ color: #EA5061; } + .tip{ + margin-left: 16upx; + font-size: 24upx; + color: #9A9A9D; + } } .si-price{ margin-bottom: 12upx; diff --git a/src/subpackage/common/components/card_search.vue b/src/subpackage/common/components/card_search.vue index 8b66b63..e77c733 100644 --- a/src/subpackage/common/components/card_search.vue +++ b/src/subpackage/common/components/card_search.vue @@ -25,7 +25,7 @@ 微信昵称：{{ e.nickname || '-' }} 手机号码：{{ e.mobile || '-' }} 卡名称：{{ e.card_name || '-' }} - 卡余额：￥{{ e.amount || '0' }} + 卡余额：￥{{ e.balance || '0' }} diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue index 9be7a6d..c952a07 100644 --- a/src/subpackage/common/pages/pay_type_select.vue +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -8,7 +8,7 @@ 订场支付金额 ¥{{ payAmount || 0 }} - + 原价：¥{{ optionsQuery.amount || 0 }}，折扣金额¥{{ discountAmount || 0 }} @@ -31,7 +31,7 @@ 储值卡卡号：{{ selectedCard.card_no || '-' }} - 使用会员卡支付{{ selectedCard.discount || '-' }}折 + 使用会员卡支付{{ selectedCard.discount || '-' }}折 微信昵称：{{ selectedCard.nickname || '-' }} @@ -43,7 +43,7 @@ 卡名称：{{ selectedCard.card_name || '-' }} - 卡余额：￥{{ selectedCard.amount || '0' }} + 卡余额：￥{{ selectedCard.balance || '0' }} @@ -73,7 +73,6 @@ import server from '../js/server.js'; import API from '../js/api.js'; import util from '../../../utils/util.js'; import cardSearch from '../components/card_search'; -import numeral from 'numeral'; export default { components: { 'card-search': cardSearch @@ -159,10 +158,10 @@ export default { let { optionsQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { brand_id: optionsQuery.brand_id || '', - amount: optionsQuery.amount || '', + amount: +optionsQuery.amount || '', reason: optionsQuery?.exQuery?.reason || '', order_no: optionsQuery?.exQuery?.order_no || '', - take_up_pay_type: payMethodsID + take_up_pay_type: this.getPayMethodsName(payMethodsID) } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; @@ -184,7 +183,7 @@ export default { let { exQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { ...exQuery, - take_up_pay_type: payMethodsID || '' + take_up_pay_type: this.getPayMethodsName(payMethodsID) || '' } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; @@ -206,6 +205,9 @@ export default { } }) .catch(util.hideLoad) + }, + getPayMethodsName(payMethodsID){ + return this.getPayMethodsLs().find(item=>item.id == payMethodsID)?.name || ''; } } From 4b21442721e2b405ba00c4fa6b0ada67982f1fb1 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 30 Jun 2023 17:18:32 +0800 Subject: [PATCH 6/9] del modal source && vtest 1.1.37 --- src/components/site/order_modal/order_modal.vue | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 8377c60..af290dd 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -39,7 +39,7 @@ - + 是否联动开灯： @@ -61,7 +61,7 @@ 操作人： - {{ orderInfo.operator || ' ' }} + {{ orderInfo.operator || '-' }} @@ -126,9 +126,13 @@ - 分享给朋友 - 取消占用 + + 分享给朋友 + 取消占用 + + 收款 + 已收款 @@ -151,6 +155,14 @@ export default { let { orderInfo } = this; return orderInfo.type == 'mini_program' || orderInfo.type == 'course_venue' || orderInfo.type == 'fixed_venue' + }, + isOverTime(){ + let { orderInfo } = this; + let endTime = orderInfo?.stadium_order?.end_time || new Date().getTime(); + let nowTimeStamp = new Date().getTime(); + let endTimeStamp = new Date(endTime.toString().replace(/\-/g, '/')).getTime(); + return nowTimeStamp > endTimeStamp; + } }, props: { @@ -487,6 +499,10 @@ export default { border-color: #EA5061; color: #fff; } + &.gray{ + border-color: #D8D8D8; + color: #D8D8D8; + } } } } From 802fbb5152aac298cb87ebb429e6347fea4d8da3 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 5 Jul 2023 15:54:46 +0800 Subject: [PATCH 7/9] fix order status --- .../reservation_order/reservation_order.vue | 22 ++++--- src/subpackage/common/pages/pay_type_select.vue | 6 +- .../reservation_site_detail.vue | 69 ++++++++++------------ 3 files changed, 43 insertions(+), 54 deletions(-) diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue index ae59b04..78bc787 100644 --- a/src/components/reservation_order/reservation_order.vue +++ b/src/components/reservation_order/reservation_order.vue @@ -3,7 +3,7 @@ {{orderInfo.stadium_name || '-'}} {{zh_order_status(orderInfo)}} @@ -96,17 +96,6 @@ export default { return _obj[`${status}`] || '-' } }, - zh_pay_type(){ - // 支付类型 0微信支付1支付宝支付2储值卡支付 - return status =>{ - const _obj = { - '0': '微信支付', - '1': '支付宝支付', - '2': '储值卡支付', - } - return _obj[`${status}`] || '-' - } - }, zh_type_name(){ // 预订项目 0场次 1人次 let { orderInfo } = this @@ -130,6 +119,15 @@ export default { // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 let _status = orderInfo.pay_status || ''; if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*' + // 20230705 新增状态 已取消 + // end：如果金额为0而且是已退款的话就显示已取消， 或者是share_pid大于0但是已退款的 + // extension.take_up_bboc && !extension.take_up_bboc_pay 这个表示未收款的挂账订单 + if( + orderInfo.pay_status == 4&& + (orderInfo.share_pid > 0 || + orderInfo.pay_amount == 0 || + (orderInfo?.extension?.take_up_bboc && !orderInfo?.extension?.take_up_bboc_pay)) + )return '已取消'; const _obj = { '-1': '已作废', '0': '未支付', diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue index c952a07..95ec467 100644 --- a/src/subpackage/common/pages/pay_type_select.vue +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -149,7 +149,7 @@ export default { { name: '支付宝支付', id: 1 }, { name: '现金支付', id: 2 }, { name: '储值卡支付', id: 3 }, - { name: '其他', id: 4 }, + { name: '其它', id: 4 }, ] }, @@ -163,7 +163,7 @@ export default { order_no: optionsQuery?.exQuery?.order_no || '', take_up_pay_type: this.getPayMethodsName(payMethodsID) } - if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; + if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; server.post({ url: API.takeUpBbocPay, @@ -185,7 +185,7 @@ export default { ...exQuery, take_up_pay_type: this.getPayMethodsName(payMethodsID) || '' } - if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; + if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; util.showLoad(); server.post({ diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue index 2e04b30..604b630 100644 --- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue +++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue @@ -23,14 +23,21 @@ 订单来源：{{ orderInfo.order_source_text || '-' }} - 订单备注：{{ getMarkTxt || '-' }} + 订单备注：{{ take_up_details.remark || take_up_details.reason || '-' }} 验证信息 验证码： - {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo)}}) + {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo)}}) @@ -100,18 +107,18 @@ 支付信息 支付方式： - {{zh_pay_type(orderInfo.pay_type)}} + {{ getPayTypeText || '-' }} 支付时间： {{orderInfo.pay_time || '-'}} - 微信交易号： - {{orderInfo.trade_no || ''}} + 交易号： + {{orderInfo.trade_no || '-'}} - + 退款时间： {{orderInfo.refund_time || '-'}} @@ -143,41 +150,15 @@ export default { } }, computed: { - zh_verify_type(){ - /** - * 20210527 新增核销方式 - * verify_type: 核销方式 - * 1: 验证码核销(pad)2: 人脸验证(pad)3: 扫码验证(pad)4: 扫码器验证(pad) - * 5: 验证码核销(商家助手)6: 扫码核销(商家助手) 7: 扫码器核销(门闸) - */ - return status =>{ - return [ - '扫码器核销(门闸)', - '验证码核销(pad)', - '人脸验证(pad)', - '扫码验证(pad)', - '扫码器验证(pad)', - '验证码核销(商家助手)', - '扫码核销(商家助手)', - ][status] ||　'-'; - - } - }, - zh_pay_type(){ - // 支付类型 0微信支付1支付宝支付2储值卡支付 - return status =>{ - const _obj = { - '0': '微信支付', - '1': '支付宝支付', - '2': '储值卡支付', - } - return _obj[`${status}`] || '-' - } - }, - getMarkTxt(){ + take_up_details(){ let { orderInfo } = this; - return orderInfo?.extension?.take_up_details?.reason || '' + return orderInfo?.extension?.take_up_details || {} }, + // 已取消只显示 '-' + getPayTypeText(){ + let { orderInfo } = this; + return orderInfo?.extension?.pay_type_text || '-' + } }, data() { return { @@ -188,6 +169,16 @@ export default { // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 let _status = orderInfo.pay_status || ''; if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*' + // 20230705 新增状态 已取消 + // end：如果金额为0而且是已退款的话就显示已取消， 或者是share_pid大于0但是已退款的 + // extension.take_up_bboc && !extension.take_up_bboc_pay 这个表示未收款的挂账订单 + if( + orderInfo.pay_status == 4&& + (orderInfo.share_pid > 0 || + orderInfo.pay_amount == 0 || + (orderInfo?.extension?.take_up_bboc && + !orderInfo?.extension?.take_up_bboc_pay)) + )return '已取消'; const _obj = { '-1': '已作废', '0': '未支付', From 46e04bdad21942fbab3df8ba670da178ea67db76 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 5 Jul 2023 17:07:08 +0800 Subject: [PATCH 8/9] hide turnover && vtest 1.1.38 --- src/pages/turnover/turnover.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue index 1cf2f12..a72be13 100644 --- a/src/pages/turnover/turnover.vue +++ b/src/pages/turnover/turnover.vue @@ -4,7 +4,7 @@ 品牌统计 门店统计 - + From 5ac6f6f46e600dad208b6e8f00070bf7c29823fe Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 10 Jul 2023 11:39:12 +0800 Subject: [PATCH 9/9] v1.1.38 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 555181e..daecf1c 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 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true