From 8ccbd25fe73224b028c7de2a18ac548a43230bf5 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 4 Aug 2022 14:33:53 +0800 Subject: [PATCH 01/11] add club rental autofill amount --- .../order/components/club_rental/end_billing/end_billing.vue | 5 ++++- src/subpackage/order/pages/club_rental/detail/detail.vue | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue index e31d5b0..43b7c89 100644 --- a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue +++ b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue @@ -10,7 +10,7 @@ 结算金额(元) - + @@ -46,6 +46,9 @@ export default { } }, methods: { + setAmount(amount){ + this.amount = amount || ''; + }, close(){ this.$emit('close'); }, diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue index c5b380e..41bae4c 100644 --- a/src/subpackage/order/pages/club_rental/detail/detail.vue +++ b/src/subpackage/order/pages/club_rental/detail/detail.vue @@ -227,7 +227,7 @@ - 结束计费 + 结束计费 @@ -368,6 +369,13 @@ export default { let _order = res.order || { extension: {} }; this.orderInfo = _order; this.isShowEndBilling = isEndBilling; + + // 自动填充金额 + this.$nextTick(_=>{ + if(this.$refs&&this.$refs.endBilling&&this.$refs.endBilling.setAmount){ + this.$refs.endBilling.setAmount(_order.amount || 0); + } + }) }) }, // 20220728 取消退押金操作 From 5d88d474e14f38421876cf6d796e11d6e0f31e53 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 29 Aug 2022 17:59:58 +0800 Subject: [PATCH 02/11] add income api --- src/pages.json | 17 + .../components/details_item/details_item.vue | 87 ++++ src/subpackage/income/js/api.js | 8 + src/subpackage/income/js/server.js | 10 + .../income/pages/details_record/details_record.vue | 561 +++++++++++++++++++++ src/subpackage/income/pages/search/search.vue | 84 +++ src/subpackage/income/static/images/bot_arrow.png | Bin 0 -> 401 bytes src/subpackage/income/static/images/calendar.png | Bin 0 -> 430 bytes src/subpackage/income/static/images/close.png | Bin 0 -> 769 bytes src/subpackage/income/static/images/filter.png | Bin 0 -> 483 bytes src/subpackage/income/static/images/search.png | Bin 0 -> 660 bytes 11 files changed, 767 insertions(+) create mode 100644 src/subpackage/income/components/details_item/details_item.vue create mode 100644 src/subpackage/income/js/api.js create mode 100644 src/subpackage/income/js/server.js create mode 100644 src/subpackage/income/pages/details_record/details_record.vue create mode 100644 src/subpackage/income/pages/search/search.vue create mode 100644 src/subpackage/income/static/images/bot_arrow.png create mode 100644 src/subpackage/income/static/images/calendar.png create mode 100644 src/subpackage/income/static/images/close.png create mode 100644 src/subpackage/income/static/images/filter.png create mode 100644 src/subpackage/income/static/images/search.png diff --git a/src/pages.json b/src/pages.json index 6082199..fe088c7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -278,6 +278,23 @@ ], "subpackages": [ { + "root": "subpackage/income", + "pages": [ + { + "path": "pages/search/search", + "style" : { + "navigationBarTitleText": "收款明细" + } + }, + { + "path": "pages/details_record/details_record", + "style" : { + "navigationBarTitleText": "收款明细" + } + } + ] + }, + { "root": "subpackage/device", "pages": [ { diff --git a/src/subpackage/income/components/details_item/details_item.vue b/src/subpackage/income/components/details_item/details_item.vue new file mode 100644 index 0000000..de8d7ce --- /dev/null +++ b/src/subpackage/income/components/details_item/details_item.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/income/js/api.js b/src/subpackage/income/js/api.js new file mode 100644 index 0000000..6a2e5d5 --- /dev/null +++ b/src/subpackage/income/js/api.js @@ -0,0 +1,8 @@ +import { ORIGIN } from '../../../js/api'; + +export const INCOME_API = { + consumeCountDetailList:`${ORIGIN}/admin/stadium/consumeCountDetail/list`, // 收款明细列表 + consumeRecordSceneLs:`${ORIGIN}/consumeRecordScene/list`, // 收款明细列表 +} + +export default { ORIGIN, INCOME_API }; \ No newline at end of file diff --git a/src/subpackage/income/js/server.js b/src/subpackage/income/js/server.js new file mode 100644 index 0000000..55fd0bf --- /dev/null +++ b/src/subpackage/income/js/server.js @@ -0,0 +1,10 @@ +import { Server } from '../../../js/server'; + +class Servers extends Server { + constructor(props){ + super(props) + } +} + + +export default new Servers(); \ No newline at end of file diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue new file mode 100644 index 0000000..2ced899 --- /dev/null +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -0,0 +1,561 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/income/pages/search/search.vue b/src/subpackage/income/pages/search/search.vue new file mode 100644 index 0000000..5bc197d --- /dev/null +++ b/src/subpackage/income/pages/search/search.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/income/static/images/bot_arrow.png b/src/subpackage/income/static/images/bot_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..832ff960cacdb8ec78601a7bd5188ad25422eff5 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJg8-ipS0KG*%a$EGc5H?LAb0!r z?VC1j0y2;!)#kcGCCtBB5ykf9^^3Zh8 z+VD@jS8Xld9PH+_-&p1S>A?NHn;bu}UX@R-O1HO9{=)cYvZwBB#r=)in*t}FIA|8Y zsuikqT_84K)sc?^XRDWb)v%bnomtW1ktKF`!mC9q)tpv!FPrsZmCKH-MJt6u4MV*< zD}PNsx?~C|E d?q%t0c5Bk*T>gfWwF4MV44$rjF6*2UngEmNv#9_8 literal 0 HcmV?d00001 diff --git a/src/subpackage/income/static/images/calendar.png b/src/subpackage/income/static/images/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..ddceee604c215c9377477f4360e902fe668fceef GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r63?ysp-_HY5S^+*Gt{}nsll~2-{cBG7*PZaM zKM~k)(!cIxK;x;v##4UvK*s3+kjRPkf_)2ss(DL-{DK*Fxrn_y6aO{TY`I4NS%Y2N z3=E8Fo-U3d9>&6kj&t%s=8EiW4QIy1crn2d)DOL)^t?ZQ5`P8 zC-BGgCP(R=)9)WKhDtx+D!=+DxT4lHCh^_fpgUph_xG~#w{5d^OnZ_@{!ruz}q z>|#E1ve%n6T=^a6$Rg8pUa&fwDWt{o+ae~u)_}+&(Nl3Q8ZDm;MIUuI`Lym3VqNC6 zCLu#>PD8Y!de@<}Ff@A*8ist=dK7mge*gE{YwQ2hJQg)8H1I zqGYV0!())))7rV{mQ+*+U|1Bl0ET7p8IW-ufVl#cg$J_gFF?~10O@Z)!2YK( z5KZ?vyZ~YcWA>hfQ>GkWcd5o-0FSM`e-)&TV7|gvw@dIZfF9nS&=Ac2j`x3sch!r8Dv9|IpoQf4~eU#4Sa;2 z;I^|Dq)+xnTn#kBl+f6dtg(;?gzU)+t~53>oD)O?Qr2x!3{oaSvjFKu>%SC%fqTMr z#!7R!57Pg8fZPX$bx{q;Y0WlQ-!})bPgm9rK<2;53rV=x++FkyV*+)7RP$HJrEwr7 zny+6?36wzN%wBQvvwc7fKF<8-CLZKIL@x^p>|OjvckM+Ql(eFn_-_fBL`f3|YnJg} z^CA>kR6`PFUBth2vmZ@|XS8Vs&I(z6z4)?}HrChH&=Sd_{Cwb4AZ+Um+?dx=nj00_d3 zy#UngyOrUqktgHA{TmNmmf%KY^K|TEyqmb>*e4J-=J%s7ry&Cqk4ImrkavsJc#d|@ zVQKt#Tr46PLx{Gpd-wq2t>1bCQlG;7 z)5S3);_%xU2m1~g@UYIkq3Juz;phMPcWoVVt_gXDtlt)8^yt>a=c0NCQjC6je=tzs zO#R3n>6LJQ+8oBr)rXwUN!EDX%`a5bIpJirPFc*U@Jzz;B_F)w<}zkCoN`^~u}^vu zcbr2(>SG~B>qZT^-Cpxeg19btdMv4lnR|C~&Fjy1k0@^ne?Nmc;dpK2`|nY2f41JW zdiQvJ+xop($NiMU=HGdr`&CM6@9I~%QvE+}tSHNQ7hap2oN;e??JSMexAzLpa;Z#y zz3-KEfNa@S>x4T~3oq|m_^S4|rq8DGD<1hhSFeZruD^QAV{3WE@g=<~-=*&xzI>%q zb-et_v4DQLyAxOIcBrh@-BDev+$p;Kq}<@*b`mVe+mmdK II;Vst00GG5G5`Po literal 0 HcmV?d00001 diff --git a/src/subpackage/income/static/images/search.png b/src/subpackage/income/static/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..78220ee0a90689d79a16caf396eec2bfe5af39c8 GIT binary patch literal 660 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB%mREuT!HlT>CV0 z1_B@(C<15C1Oo^cNUE$5bq4AbDhcunX88A3=-852rCUZbt^FG_-MTlk^G=z}z`*$1 z)5S3);_%xUw~Ja8cwAdmVp!k&|DSWdIY>8jLF3G_XK&n(sw&Qop0@qp`h=gSo7M=L zNSiyE1WCEvT9kV5i`0vwLXrAft)c((JPx|G2Z>C2v8XlvgGg8O!lt@8BK(u)o^Wvs zNzvH)IZTB2&{oTspSt_jaD(7R>i7pcMlY&-%kvPbAGq`o7RJ$ zdshoRykmbyNQC!N+jF~Xi^AeW7+F9=^1&AV07AkIz?ztAf*Xi*w5E|CU=| zzpv}*k5h9ttn$h}vG&WAe`-$r0*~(XAKKk8m36aG>_@Q~zZzbOWt1&=%X~{VgKNQ^ z#$Eg?`roH9|5Wt%=eln;x%ce+s?Fl;|2~;kHa^W~+-$D-&&;ZF@pF0CW%AR09N+no z{oJpKJAPU@GxNO-u-x)_ov5+C-JjJn9VALC&uFrJ`}$2wa;Er)NfH*SOY0Py_XD&y%^?{$gL;pQ~y^uN1@abP0l+XkKW-2ug literal 0 HcmV?d00001 From 20bb5e9032b6c80f58ac25f28320bd0619bdfacf Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 30 Aug 2022 16:58:36 +0800 Subject: [PATCH 03/11] add income api --- src/subpackage/income/js/api.js | 1 + .../income/pages/details_record/details_record.vue | 151 ++++++++++++++++++--- src/subpackage/income/pages/search/search.vue | 71 ++++++++-- .../income/static/images/account_null.png | Bin 0 -> 10367 bytes 4 files changed, 193 insertions(+), 30 deletions(-) create mode 100644 src/subpackage/income/static/images/account_null.png diff --git a/src/subpackage/income/js/api.js b/src/subpackage/income/js/api.js index 6a2e5d5..af17381 100644 --- a/src/subpackage/income/js/api.js +++ b/src/subpackage/income/js/api.js @@ -3,6 +3,7 @@ import { ORIGIN } from '../../../js/api'; export const INCOME_API = { consumeCountDetailList:`${ORIGIN}/admin/stadium/consumeCountDetail/list`, // 收款明细列表 consumeRecordSceneLs:`${ORIGIN}/consumeRecordScene/list`, // 收款明细列表 + stadiumList: `${ORIGIN}/admin/stadium/list`, // 店铺列表 } export default { ORIGIN, INCOME_API }; \ No newline at end of file diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue index 2ced899..db3a864 100644 --- a/src/subpackage/income/pages/details_record/details_record.vue +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -14,7 +14,7 @@ - 筛选 + 筛选 @@ -39,7 +39,7 @@ - + 筛选 门店 - + - + @@ -70,13 +70,18 @@ - {{ e.name || '-' }} + {{ e.name || '-' }} - 重置 - 确定 + 重置 + 确定 @@ -100,17 +105,23 @@ }, { name: '联营收款', - eng: ' joint' + eng: 'joint' }, ]; export default { components: { 'details-item': details_item }, + computed: { + isFilter(){ + let { confirmSelectStore, confirmSelectScene } = this + if(confirmSelectStore || confirmSelectScene)return true; + return false + } + }, data(){ return { modalScrollViewHeight: '', - isFilterModal: false, incomeTime: '', incomeLs: [], @@ -121,7 +132,13 @@ incomeTypeLs, incomeTypeInfo: {}, // online 线上收款 offline 线下收款 joint 联营 - sceneLs: [], + isFilterModal: false, + sceneLs: [], // 弹窗场景列表 + storeList: [], // 弹窗店铺列表 + confirmSelectScene: null, // 弹窗选中&确认场景 + confirmSelectStore: null, // 弹窗选中&确认店铺 + modalSelectScene: null, // 弹窗临时选中场景 + modalSelectStore: null, // 弹窗临时选中店铺 } }, onLoad(){ @@ -130,36 +147,117 @@ this.incomeTypeInfo = incomeTypeLs[0]; this.refreshPage(); }, + onReachBottom(){ + let { incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene, page } = this; + this.getRecordLs({ + type: type || '', + time_str: incomeTime || '', + income_type: incomeTypeInfo.eng || '', + stadium_id: (confirmSelectStore&&confirmSelectStore.id) || '', + scene: (confirmSelectScene&&confirmSelectScene.scene + '') || '', + page: ++page, + }); + }, methods: { - filterShow(){ + + // 弹窗重置按钮 + modalResetBtn(){ let { incomeTypeInfo } = this; + this.modalSelectScene = null; + this.modalSelectStore = null; + // 不同店铺场景值不一样 + this.sceneLs = []; + this.getSceneLs({ + income_type: incomeTypeInfo.eng || '', + }); + }, + // 弹窗确认按钮 + modalConfirm(){ + let { modalSelectScene, modalSelectStore } = this; + this.confirmSelectScene = modalSelectScene; + this.confirmSelectStore = modalSelectStore; + this.isFilterModal = false; + this.refreshPage(); + + }, + sceneSelect(e){ + this.modalSelectScene = e || null; + }, + stadiumChange(e){ + let { incomeTypeInfo, storeList, modalSelectStore } = this; + let _idx = e.detail.value; + let _stadium = storeList[_idx] || {}; + if(modalSelectStore&&(modalSelectStore.id == _stadium.id))return; + this.modalSelectStore = _stadium || null; + this.modalSelectScene = null; + // 不同店铺场景值不一样 + this.sceneLs = []; + this.getSceneLs({ + income_type: incomeTypeInfo.eng || '', + stadium_id: _stadium.id + }); + + }, + // 弹窗筛选显示 + filterShow(){ + let { incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; + this.modalSelectScene = confirmSelectScene || null; + this.modalSelectStore = confirmSelectStore || null; + this.isFilterModal = true; - this.$nextTick(_=>{ + this.$nextTick(async _=>{ this.initFilterScrollView(); + if(true)try{ + await this.getStoreList(); + }catch(err){ + console.warn('getStore err ->', err) + }; + this.getSceneLs({ - income_type: incomeTypeInfo.eng || '' - }) + income_type: incomeTypeInfo.eng || '', + stadium_id: (confirmSelectStore&&confirmSelectStore.id) || '' + }); }); }, + // 获取弹窗品牌店铺列表 + getStoreList(){ + util.showLoad(); + return server.get({ + url: INCOME_API.stadiumList, + data: {}, + failMsg: '加载店铺列表失败！', + }) + .then(res=>{ + util.hideLoad(); + // let _list = [res.list[0]] || []; + let _list = res.list || []; + this.storeList = _list; + return _list || []; + }) + }, + // 弹窗场景列表请求 getSceneLs({ brand_id = '', stadium_id = '', income_type = '', - }){ + }){ + util.showLoad(); server.get({ url: INCOME_API.consumeRecordSceneLs, data: { brand_id, - stadium_id, - income_type, + stadium_id, // 空字符全部 -1品牌收款 正常的门店id + income_type, // online线上 offline线下 joint联营 }, failMsg: '加载场景列表失败！' }) .then(res=>{ + util.hideLoad(); this.sceneLs = res || []; }) }, + incomeTypeChange(incomeTypeInfo){ this.incomeTypeInfo = incomeTypeInfo || {}; this.refreshPage(); @@ -173,9 +271,10 @@ this.incomeTime = _time; this.refreshPage(); }, + refreshPage(){ this.$nextTick(_=>{ - let { incomeTime, type, incomeTypeInfo } = this; + let { incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; this.page = 1; this.incomeLs = []; this.incomeMes = {}; @@ -183,9 +282,12 @@ type: type || '', time_str: incomeTime || '', income_type: incomeTypeInfo.eng || '', + stadium_id: (confirmSelectStore&&confirmSelectStore.id) || '', + scene: (confirmSelectScene&&confirmSelectScene.scene + '') || '', }); }) }, + getRecordLs({ brand_id = '', stadium_id = '', // 空字符全部 -1品牌收款 其他门店id @@ -256,6 +358,9 @@ font-size: 28upx; line-height: 40upx; color: #9C9C9F; + &.df-active{ + color: $themeColor + } } .df-date{ @include centerFlex(flex-start); @@ -516,13 +621,19 @@ margin: 14upx 10upx; width: 164upx; height: 64upx; - line-height: 64upx; + line-height: 60upx; text-align: center; - background-color: #F2F2F7; border-radius: 10upx; + border: 2upx solid #F2F2F7; font-size: 24upx; color: #1A1A1A; + background-color: #F2F2F7; @include textHide(1); + &.dsl-active{ + color: $themeColor; + border-color: $themeColor; + background-color: rgba($color: $themeColor, $alpha: .16); + } } } } diff --git a/src/subpackage/income/pages/search/search.vue b/src/subpackage/income/pages/search/search.vue index 5bc197d..5bc82cd 100644 --- a/src/subpackage/income/pages/search/search.vue +++ b/src/subpackage/income/pages/search/search.vue @@ -2,28 +2,81 @@ - - - + + + - - - - + + + + + + @@ -50,7 +103,6 @@ export default { flex-shrink: 0; width: 30upx; height: 30upx; - background-color: skyblue; } .if-search-icon{ margin-right: 24upx; @@ -69,7 +121,6 @@ export default { display: block; width: 370upx; height: 370upx; - background-color: skyblue; } } diff --git a/src/subpackage/income/static/images/account_null.png b/src/subpackage/income/static/images/account_null.png new file mode 100644 index 0000000000000000000000000000000000000000..34aad1f8eae8c9206b88194d6ac753d82a2f1f1d GIT binary patch literal 10367 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 literal 0 HcmV?d00001 From 21e0660b32f926c182b5ca5181ac4c2c65596bf9 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 31 Aug 2022 18:00:30 +0800 Subject: [PATCH 04/11] add income api --- src/pages/turnover/turnover.vue | 189 +++++++++++++-------- src/static/images/icon/triangle_c33.png | Bin 0 -> 339 bytes .../income/pages/details_record/details_record.vue | 5 +- src/subpackage/income/pages/search/search.vue | 65 ++++++- 4 files changed, 175 insertions(+), 84 deletions(-) create mode 100644 src/static/images/icon/triangle_c33.png diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue index afdd859..b09eb70 100644 --- a/src/pages/turnover/turnover.vue +++ b/src/pages/turnover/turnover.vue @@ -5,7 +5,6 @@ 门店统计 - @@ -31,10 +30,30 @@ ¥{{totalData.count_type_actual_income_amount || '0'}} - - 线上 ¥{{totalData.online_actual_income_amount || '0'}} - 线下 ¥{{totalData.offline_actual_income_amount || '0'}} + + + + 线上 + + + ¥{{totalData.online_actual_income_amount || '0'}} + + + + 线下 + + + ¥{{totalData.offline_actual_income_amount || '0'}} + + + + 联营 + + + ¥{{totalData.joint_actual_income_amount || '0'}} + + @@ -57,36 +76,32 @@ 总收入 ¥{{botData.count_type_actual_income_amount || 0}} - - - - - 线上 ¥{{ botData.online_actual_income_amount || '0' }} - - - 收款{{ botData.online_income_num || '0' }}笔 - （ ￥{{ botData.online_income_amount || '0' }} ） - - - 退款{{ botData.online_refund_num || '0' }}笔 - （ ￥ {{ botData.online_refund_amount || '0' }} ） + + 查看收款明细 + + + + + 线上 ¥{{ botData.online_actual_income_amount || '0' }} + + 收款{{ botData.online_income_num || '0' }}笔（￥{{ botData.online_income_amount || '0' }}） + 退款{{ botData.online_refund_num || '0' }}笔（￥{{ botData.online_refund_amount || '0' }}） - - - - 线下 ¥{{ botData.offline_actual_income_amount || '0' }} - - - 收款{{ botData.offline_income_num || '0' }}笔 - （ ￥{{botData.offline_income_amount || '0'}} ） + + 线下 ¥{{ botData.offline_actual_income_amount || '0' }} + + 收款{{ botData.offline_income_num || '0' }}笔（￥{{ botData.offline_income_amount || '0' }}） + 退款{{ botData.offline_refund_num || '0' }}笔（￥{{ botData.offline_refund_amount || '0' }}） - - 退款{{ botData.offline_refund_num || '0' }}笔 - （ ￥{{ botData.offline_refund_amount || '0' }} ） + + + 联营 ¥{{ botData.joint_actual_income_amount || '0' }} + + 收款{{ botData.joint_income_num || '0' }}笔（￥{{ botData.joint_income_amount || '0' }}） + 退款{{ botData.joint_refund_num || '0' }}笔（￥{{ botData.joint_refund_amount || '0' }}） - @@ -387,7 +402,9 @@ export default { background-color: #fff; } .turnover-container{ - + padding-bottom: 40upx; + padding-bottom: calc( 40upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 40upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ } .tc-tab{ height: 134upx; @@ -445,7 +462,6 @@ export default { } .tts-money{ padding-top: 48upx; - >view{ margin-bottom: 34upx; text-align: center; @@ -481,21 +497,39 @@ export default { } } } - .tts-preview{ - padding-bottom: 70upx; + .tts-preview-ls{ + padding-top: 50upx; + padding-bottom: 36upx; @include centerFlex(space-between); - >view{ - width: 50%; - padding: 0 24upx; - line-height: 40upx; - text-align: center; - font-size: 28upx; - font-weight: 500; - color: #1a1a1a; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - + .tpl-item{ + padding: 0 10upx; + flex-shrink: 0; + flex-grow: 1; + width: 33.33%; + .ti-name{ + @include centerFlex(center); + margin-bottom: 6upx; + line-height: 34upx; + font-weight: 500; + font-size: 24upx; + color: #1A1A1A; + >image{ + margin-left: 10upx; + flex-shrink: 0; + width: 28upx; + height: 28upx; + } + } + .ti-price{ + text-align: center; + line-height: 34upx; + font-size: 24upx; + font-weight: 500; + color: #1A1A1A; + @include textHide(1); + } + + } } } @@ -577,37 +611,46 @@ export default { } @include textHide(1); } - .td-detail{ - padding: 0 24upx; - width: 100%; - @include centerFlex(center); - >view{ - max-width: 50%; - flex-shrink: 0; - .td-first{ + .td-check-btn{ + padding-bottom: 12upx; + width: 642upx; + line-height: 40upx; + font-size: 28upx; + border-bottom: 2upx solid #D8D8D8; + color: #9C9C9F; + @include centerFlex(flex-end); + >image{ + margin-left: 6upx; + width: 22upx; + height: 22upx; + } + + } + .td-income-info{ + padding: 40upx 0 0; + width: 642upx; + .tii-line{ + margin-bottom: 50upx; + .tl-tit{ margin-bottom: 24upx; - color: #1A1A1A; - font-weight: 500; + line-height: 40upx; font-size: 28upx; - } - &:first-child{ - margin-right: 24upx; - } - &+view{ - margin-left: 24upx; - } - >view{ - font-size: 24upx; - color: #9C9C9F; + font-weight: 500; + color: #1A1A1A; @include textHide(1); - >text{ - - } - .orange{ - color: #F6843E; - } - .margin{ - margin-right: 12upx; + } + .tl-detail{ + @include centerFlex(space-between); + flex-wrap: nowrap; + .td-item{ + width: 50%; + flex-grow: 0; + flex-shrink: 0; + font-size: 24upx; + color: #9C9C9F; + >text{ + color: #F6843E; + } } } } diff --git a/src/static/images/icon/triangle_c33.png b/src/static/images/icon/triangle_c33.png new file mode 100644 index 0000000000000000000000000000000000000000..26bf1e8d4d47401c96c9b92e5ba37b4afc5897ad GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+*8raoS0F7fFE1q}B`GN>E-o$$ z20$(Z0D02V(lDMBkPQSfGBOYmAOpw+vej;9bO8+#D+%%oX5e`7L!8&>(zZ^OyN6d+ zXGPjgEDrMUvybKjs#xyn;uvCa`t4;)zQYDQE`dQ;p4C48+b?DIu70}G%wugI95|Fc z|NZpZk{0Np`aRTD(=YRM)5hhB#c#ItEE1RHE*Xz^>X|AD?*K;yNC9N`jkb z_VUe-PKt?!HQhgBer#fyYpcleg$X%{FU>Bst^T}CJm&76)fz|sHXP5*d+zam^Kw(2 zIX1DbFKXwN{bReWD50OIn78-X^oN_SO&99dJimLg{5ke5ANUjQzcbGRI+?-K)z4*} HQ$iB}F8g>S literal 0 HcmV?d00001 diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue index db3a864..dd7c473 100644 --- a/src/subpackage/income/pages/details_record/details_record.vue +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -42,8 +42,8 @@ @@ -376,6 +376,7 @@ >input{ flex-grow: 1; height: 100%; + font-weight: 400; font-size: 28upx; color: #1a1a1a; } diff --git a/src/subpackage/income/pages/search/search.vue b/src/subpackage/income/pages/search/search.vue index 5bc82cd..80638dd 100644 --- a/src/subpackage/income/pages/search/search.vue +++ b/src/subpackage/income/pages/search/search.vue @@ -2,20 +2,38 @@ - - - + + + + + + + - + - @@ -32,12 +50,36 @@ export default { data(){ return { incomeLs: [], + isFocus: false, + searchKey: '', + page: 1, + } }, onLoad(){ - this.getRecordLs({}); + }, + onReachBottom(){ + let { searchKey, page } = this; + this.getRecordLs({ + page: ++page, + key: searchKey, + }) }, methods: { + searchConfirm(e){ + console.warn(e); + this.page = 1; + this.incomeLs = []; + this.getRecordLs({ + key: e.detail.value || '' + }) + }, + iptFocus(){ + this.isFocus = true; + }, + iptBlur(){ + this.isFocus = false; + }, getRecordLs({ brand_id = '', stadium_id = '', // 空字符全部 -1品牌收款 其他门店id @@ -47,7 +89,7 @@ export default { income_type = '', // 收款类型 online 线上收款 offline线下收款 joint联营 page = 1, page_size = 20, - order_no= '', + key= '', }){ util.showLoad(); server.get({ @@ -61,7 +103,7 @@ export default { scene, type, income_type, - order_no + key }, failMsg: '加载失败！', }) @@ -99,10 +141,15 @@ export default { font-size: 28upx; color: #1a1a1a; } - >image{ + >view{ flex-shrink: 0; width: 30upx; height: 30upx; + font-size: 0; + >image{ + width: 100%; + height: 100%; + } } .if-search-icon{ margin-right: 24upx; From 60d68de140cfd5b19ad2e488cf27cae81907e83d Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 1 Sep 2022 13:33:59 +0800 Subject: [PATCH 05/11] add income api --- src/pages/turnover/turnover.vue | 31 +++++++++++++++------ src/static/images/icon/toggle.png | Bin 0 -> 393 bytes .../income/pages/details_record/details_record.vue | 29 +++++++++++++------ 3 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 src/static/images/icon/toggle.png diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue index b09eb70..1cf2f12 100644 --- a/src/pages/turnover/turnover.vue +++ b/src/pages/turnover/turnover.vue @@ -12,13 +12,15 @@ + {{curSelectStore.name || '-'}} + {{curSelectStore.name || '-'}} - + @@ -34,21 +36,21 @@ 线上 - + ¥{{totalData.online_actual_income_amount || '0'}} 线下 - + ¥{{totalData.offline_actual_income_amount || '0'}} 联营 - + ¥{{totalData.joint_actual_income_amount || '0'}} @@ -77,7 +79,7 @@ 总收入 ¥{{botData.count_type_actual_income_amount || 0}} - 查看收款明细 + 查看收款明细 @@ -131,7 +133,7 @@ export default { }, data(){ return { - tabID: 4, + tabID: 4, // 4 品牌， 3 门店 timeTabIdx: 0, totalData: {}, @@ -170,6 +172,14 @@ export default { }, methods: { + toDetailsRecord(){ + let { curSelectStore, brandInfo, tabID } = this; + util.$_emit('turnoverToDetailsRecord', { + stadiumInfo: (tabID == 3&&curSelectStore&&curSelectStore.id) ? curSelectStore : null, + brandInfo: brandInfo&&brandInfo.brand ? brandInfo.brand : null, + }); + util.routeTo(`/subpackage/income/pages/details_record/details_record`, 'nT'); + }, /* count_type @@ -184,7 +194,6 @@ export default { 7 统计品牌的某一年 */ getCountType({ tab_id = -1, time_tab_idx = -1 }){ - console.warn(tab_id, time_tab_idx, getType(time_tab_idx) + 5); if(time_tab_idx == -1)return tab_id; let _type = getType(time_tab_idx) @@ -208,11 +217,17 @@ export default { } } }, + incomeQusModal(data){ + util.showModal({ + title: '提示', + content: data || '-', + }) + }, showQuestionModal(){ let { totalData } = this util.showModal({ title: totalData.income_record_name|| '提示', - content: totalData.income_record_tips || '总收入为：线上（微信支付）+ 线下的总收入（退款已删除）', + content: totalData.income_record_tips || '-', showCancel: true, success: mRes => { diff --git a/src/static/images/icon/toggle.png b/src/static/images/icon/toggle.png new file mode 100644 index 0000000000000000000000000000000000000000..45567fcd17e7deebdcc6306001a9f162a4b27fdc GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJg8-ipS0KG<)27XvHv>rs*s^5{ zkP8Gr#@4M{fr3C1!Uc+$|2L=y>Jcaj@(X78_ikCF*tUjgURoCv4rf}p-?aS(l>6c7 z;uvCaI$1*Gfwi6I@*tZ@eXrO*cyMifG*Lvvy1{*Uf}PylrX=AHFGTJ%xi4REA=qY8 z(<}A@X>FA&tw8<_CLsU2;~RnGkc2`(CC#@CQ`U$b;ZnF4=proKWGv$_sVjp)hgBq$ z-$A0AQ|BSyA(q^^Jcl`SDjzj**Cc#6D(f_p=TE1F>Q+gKFb<}}aU2~jQvwYf27hSslLco?v2vYjeVZnH&?3@P$1v zoYuIUqu;Nsz}03FPyYwcA}ysiM_7tCzHX^x?^ii&R5QtD+7F>KL2V0p85X|xe!SD5 S_!Te=7(8A5T-G@yGywq0DxT8- literal 0 HcmV?d00001 diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue index dd7c473..4b2d684 100644 --- a/src/subpackage/income/pages/details_record/details_record.vue +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -121,6 +121,7 @@ }, data(){ return { + brandInfo: {}, modalScrollViewHeight: '', incomeTime: '', @@ -145,11 +146,17 @@ let _timeStr = util.formatDate({}); this.incomeTime = _timeStr; this.incomeTypeInfo = incomeTypeLs[0]; - this.refreshPage(); + util.$_once('turnoverToDetailsRecord', data=>{ + let { brandInfo, stadiumInfo } = data; + this.confirmSelectStore = stadiumInfo || null; + this.brandInfo = brandInfo || {}; + this.refreshPage(); + }) }, onReachBottom(){ - let { incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene, page } = this; + let { brandInfo, incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene, page } = this; this.getRecordLs({ + brand_id: brandInfo.id || '', type: type || '', time_str: incomeTime || '', income_type: incomeTypeInfo.eng || '', @@ -162,12 +169,13 @@ // 弹窗重置按钮 modalResetBtn(){ - let { incomeTypeInfo } = this; + let { brandInfo, incomeTypeInfo } = this; this.modalSelectScene = null; this.modalSelectStore = null; // 不同店铺场景值不一样 this.sceneLs = []; this.getSceneLs({ + brand_id: brandInfo.id || '', income_type: incomeTypeInfo.eng || '', }); }, @@ -184,7 +192,7 @@ this.modalSelectScene = e || null; }, stadiumChange(e){ - let { incomeTypeInfo, storeList, modalSelectStore } = this; + let { brandInfo, incomeTypeInfo, storeList, modalSelectStore } = this; let _idx = e.detail.value; let _stadium = storeList[_idx] || {}; if(modalSelectStore&&(modalSelectStore.id == _stadium.id))return; @@ -193,6 +201,7 @@ // 不同店铺场景值不一样 this.sceneLs = []; this.getSceneLs({ + brand_id: brandInfo.id || '', income_type: incomeTypeInfo.eng || '', stadium_id: _stadium.id }); @@ -200,7 +209,7 @@ }, // 弹窗筛选显示 filterShow(){ - let { incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; + let { brandInfo, incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; this.modalSelectScene = confirmSelectScene || null; this.modalSelectStore = confirmSelectStore || null; @@ -208,12 +217,13 @@ this.$nextTick(async _=>{ this.initFilterScrollView(); if(true)try{ - await this.getStoreList(); + await this.getStoreList(brandInfo.id || '',); }catch(err){ console.warn('getStore err ->', err) }; this.getSceneLs({ + brand_id: brandInfo.id || '', income_type: incomeTypeInfo.eng || '', stadium_id: (confirmSelectStore&&confirmSelectStore.id) || '' }); @@ -221,11 +231,11 @@ }, // 获取弹窗品牌店铺列表 - getStoreList(){ + getStoreList(brand_id){ util.showLoad(); return server.get({ url: INCOME_API.stadiumList, - data: {}, + data: { brand_id }, failMsg: '加载店铺列表失败！', }) .then(res=>{ @@ -274,11 +284,12 @@ refreshPage(){ this.$nextTick(_=>{ - let { incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; + let { brandInfo, incomeTime, type, incomeTypeInfo, confirmSelectStore, confirmSelectScene } = this; this.page = 1; this.incomeLs = []; this.incomeMes = {}; this.getRecordLs({ + brand_id: brandInfo.id || '', type: type || '', time_str: incomeTime || '', income_type: incomeTypeInfo.eng || '', From 430d58e8ed344fb1ef8d27395c53d6f89d2b43ee Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 6 Sep 2022 18:02:22 +0800 Subject: [PATCH 06/11] del index record --- src/js/server.js | 2 +- src/pages/index/index.vue | 9 ++++++++- src/subpackage/income/pages/details_record/details_record.vue | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/js/server.js b/src/js/server.js index 9abf488..7d1ba43 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -17,7 +17,7 @@ export class Server { url, data, method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {...header}, // 设置请求的 header // {'custom-header': 'application/json'} + header: {...header, pc_assistant: 2}, // 设置请求的 header // {'custom-header': 'application/json'} success: res=>{ if(islog)console.log('req success---->',{ link: url, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 05f22e9..796e6c5 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -86,7 +86,7 @@ { id: 1, name: '收款记录', - path: '/pages/collection/list/list', + path: '/subpackage/income/pages/details_record/details_record', serverKey: 1002 // 后端对应权限编号 }, { @@ -208,6 +208,13 @@ if(!tabInfo.path)return util.showNone('暂未开放！'); //if(tabInfo.id == 2)return util.routeTo(tabInfo.path,'nT'); //测试 if(!_permission[tabInfo.serverKey])return util.showNone('暂无权限，请联系管理员开启！') + + if(tabInfo.id === 1){ + util.$_emit('turnoverToDetailsRecord', { + stadiumInfo: null, + brandInfo: indexData&&indexData.brand ? indexData.brand : null, + }); + } util.routeTo(tabInfo.path,'nT'); }, diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue index 4b2d684..7b149ec 100644 --- a/src/subpackage/income/pages/details_record/details_record.vue +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -242,6 +242,7 @@ util.hideLoad(); // let _list = [res.list[0]] || []; let _list = res.list || []; + _list.unshift({ name: '全部', id: '' }); this.storeList = _list; return _list || []; }) From 7c8041cd6f76d711084d5a48a2f20adba2211630 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 8 Sep 2022 14:36:50 +0800 Subject: [PATCH 07/11] fix && change header --- src/js/server.js | 2 +- src/subpackage/income/components/details_item/details_item.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/server.js b/src/js/server.js index 7d1ba43..2c2579d 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -17,7 +17,7 @@ export class Server { url, data, method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {...header, pc_assistant: 2}, // 设置请求的 header // {'custom-header': 'application/json'} + header: {...header, Pcassistant: 2}, // 设置请求的 header // {'custom-header': 'application/json'} success: res=>{ if(islog)console.log('req success---->',{ link: url, diff --git a/src/subpackage/income/components/details_item/details_item.vue b/src/subpackage/income/components/details_item/details_item.vue index de8d7ce..2906fe3 100644 --- a/src/subpackage/income/components/details_item/details_item.vue +++ b/src/subpackage/income/components/details_item/details_item.vue @@ -2,7 +2,7 @@ {{ incomeInfo.source || '-' }} - {{ incomeInfo.desc || '-' }} + {{ incomeInfo.scene_name || '-' }} {{ incomeInfo.amount || '-' }} From 6593f0c4bc98f209a39ff831f7f36b60ffd6b214 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 21 Sep 2022 11:12:27 +0800 Subject: [PATCH 08/11] add release btn 1000995 --- src/components/site/order_modal/order_modal.vue | 33 +++++++++++++++++++++++++ src/js/api.js | 4 +++ 2 files changed, 37 insertions(+) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 7f365da..aca5f50 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -109,6 +109,7 @@ + 释放场地 订单详情 @@ -161,6 +162,38 @@ export default { this.getOrderInfo(); }, methods: { + releaseBtn(){ + util.showModal({ + title: '是否确认释放场地', + content: '释放场地仅是释放场地给其他人预订，如需退款请登录后台操作', + showCancel: true, + success: mRes =>{ + if(mRes.confirm)this.releaseReq(); + } + }) + }, + releaseReq(){ + util.showLoad(); + let { orderInfo } = this; + servers.get({ + url: API.venue.releaseVenue, + data: { + id: 0, // 后端：0就可以了 + brand_id: orderInfo.stadium_order.brand_id || '', + order_no: orderInfo.order_no || '' + }, + isDefaultGet: false, + }) + .then(res=>{ + util.hideLoad(); + if(res.data.code == 0){ + util.showNone(res.data.message || '操作成功！'); + setTimeout(_=>this.$emit('refresh'), 1200); + }else{ + util.showNone(res.data.message || '操作失败！'); + } + }) + }, fixedCancelOccupy: util.debounce(function(){ let { orderInfo, queryInfo } = this; util.showLoad(); diff --git a/src/js/api.js b/src/js/api.js index a531af7..555181e 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -105,6 +105,10 @@ API['venue'] = { // 20210806 FixedOccupyCancel: `${ORIGIN}/admin/VenueNumberFixedOccupy/cancel`, // 固定场取消订场 + // 20220921 + releaseVenue: `${ORIGIN}/admin/stadium/order/releaseVenue`, // 【1000995】释放场地 + + } // 2.1 核销 From 433b803a878289bc5f98dac16548d5667a554350 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 30 Sep 2022 10:52:28 +0800 Subject: [PATCH 09/11] fix all --- .../reservation_order/reservation_order.vue | 32 ++++++++-------- .../reservation_site_detail.vue | 43 +++++++++------------- src/subpackage/income/pages/search/search.vue | 1 + 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue index c2f354f..ae59b04 100644 --- a/src/components/reservation_order/reservation_order.vue +++ b/src/components/reservation_order/reservation_order.vue @@ -4,7 +4,7 @@ {{orderInfo.stadium_name || '-'}} {{zh_order_status(orderInfo.pay_status)}} + >{{zh_order_status(orderInfo)}} @@ -107,21 +107,6 @@ export default { return _obj[`${status}`] || '-' } }, - zh_order_status(){ - // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 - return status =>{ - if(status == 8)return '使用中'; // 20210528 新增状态 - const _obj = { - '-1': '已作废', - '0': '未支付', - '1': '待使用', - '2': '已使用', - '3': '已失效', - '4': '已退款', - } - return _obj[`${status}`] || '-' - } - }, zh_type_name(){ // 预订项目 0场次 1人次 let { orderInfo } = this @@ -141,6 +126,21 @@ export default { }, }, methods:{ + zh_order_status(orderInfo = {}){ + // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 + let _status = orderInfo.pay_status || ''; + if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*' + const _obj = { + '-1': '已作废', + '0': '未支付', + '1': '待使用', + '2': '已使用', + '3': '已失效', + '4': '已退款', + '8': '使用中', // 20210528 新增状态 + } + return _obj[`${_status}`] || '-' + }, detailChange(){ let { orderInfo } = this let _query = {} 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 ec9000b..9a59cc9 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 @@ -8,7 +8,7 @@ 订单编号：{{orderInfo.order_no || ''}} - {{zh_pay_status(orderInfo.pay_status)}} + {{zh_pay_status(orderInfo)}} 创建时间：{{orderInfo.created_at || '-'}} @@ -24,7 +24,7 @@ 验证信息 验证码： - {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo.pay_status)}}) + {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo)}}) @@ -137,20 +137,6 @@ export default { } }, computed: { - zh_pay_status(){ - // 订单状态 1已支付待使用2已使用3已失效4已退款 - return status =>{ - if(status == 8)return '使用中'; // 20210528 新增状态 - const _obj = { - '0': '未付款', - '1': '待使用', - '2': '已使用', - '3': '已失效', - '4': '已退款', - } - return _obj[`${status}`] || '-' - } - }, zh_verify_type(){ /** * 20210527 新增核销方式 @@ -169,15 +155,6 @@ export default { '扫码核销(商家助手)', ][status] ||　'-'; - // const _obj = { - // '0': '未核销', - // '1': '核销码核销', - // '2': '人脸核销', - // '3': '扫码核销', - // '4': '商家扫码', - // } - - // return _obj[`${status}`] || '-' } }, zh_pay_type(){ @@ -198,8 +175,22 @@ export default { } }, methods: { + zh_pay_status(orderInfo = {}){ + // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 + let _status = orderInfo.pay_status || ''; + if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*' + const _obj = { + '-1': '已作废', + '0': '未支付', + '1': '待使用', + '2': '已使用', + '3': '已失效', + '4': '已退款', + '8': '使用中', // 20210528 新增状态 + } + return _obj[`${_status}`] || '-' + }, refunndBtn(){ - console.warn(123); this.$emit('refundbtn'); } } diff --git a/src/subpackage/income/pages/search/search.vue b/src/subpackage/income/pages/search/search.vue index 80638dd..4ea2433 100644 --- a/src/subpackage/income/pages/search/search.vue +++ b/src/subpackage/income/pages/search/search.vue @@ -15,6 +15,7 @@ @blur = 'iptBlur' @confirm = 'searchConfirm' hold-keyboard + placeholder = "请输入订单号/手机号码搜索" /> Date: Fri, 30 Sep 2022 10:58:15 +0800 Subject: [PATCH 10/11] vtest 1.1.30 --- src/pages/index/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 796e6c5..1dae59e 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -70,7 +70,6 @@ -