From 3c18edeec2ef3d3a215be8fa2907548885b9c05f Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 21 Mar 2022 17:58:06 +0800 Subject: [PATCH 1/2] 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 16:37:13 +0800 Subject: [PATCH 2/2] 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,