xt / xcx-book · Commits

Go to a project

Commit 32c1254c873c6e3222d79c27c068f3bc122a1320

Authored by yiren
1 parent 5abd97d5
build: skipped

邀请函

Inline Side-by-side
Showing 3 changed files with 36 additions and 28 deletions
@@ -194,14 +194,6 @@ Page({ @@ -194,14 +194,6 @@ Page({
194 }) 194 })
195 } 195 }
196 }, 196 },
197 - noopen(e) {  
198 - let mark = e.currentTarget.dataset.mark;  
199 - wx.showToast({  
200 - title: '该商家未开通' + (mark == 'buy' ? '提前点餐' : '在线买单'),  
201 - duration: 2000,  
202 - mask: true  
203 - })  
204 - },  
205 sharesetting() { 197 sharesetting() {
206 wx.reportMonitor('1017', 1) 198 wx.reportMonitor('1017', 1)
207 let parmdata = { 199 let parmdata = {
@@ -260,7 +252,7 @@ Page({ @@ -260,7 +252,7 @@ Page({
260 console.log('store', store); 252 console.log('store', store);
261 if(store.images.length>0) store.images = JSON.parse(store.images) 253 if(store.images.length>0) store.images = JSON.parse(store.images)
262 if(signboard && signboard.images) signboard.images = JSON.parse(signboard.images) 254 if(signboard && signboard.images) signboard.images = JSON.parse(signboard.images)
263 - if (marketing.is_online && marketing.is_arrival && marketing.is_transpond) { 255 + if (marketing.is_online_book=='1' && marketing.is_transpond =='1') {
264 this.setData({ 256 this.setData({
265 between: true 257 between: true
266 }) 258 })
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </view> 34 </view>
35 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}"> 35 <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
36 <view class="label">【人数】</view> 36 <view class="label">【人数】</view>
37 - <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view> 37 + <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view>
38 </view> 38 </view>
39 <!-- <view class="flex-11" wx:if="{{reserve.park_info || detail.seller.map_address}}"> 39 <!-- <view class="flex-11" wx:if="{{reserve.park_info || detail.seller.map_address}}">
40 <view class="label">【地址】</view> 40 <view class="label">【地址】</view>
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 </view> 177 </view>
178 </view> 178 </view>
179 </view> 179 </view>
180 - <view class="specialServices" wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel && is_display}}"> 180 + <view class="specialServices" wx:if="{{detail && detail.seller.is_open_order==1 && marketing.is_order=='1'}}">
181 <view class="rubric"> 181 <view class="rubric">
182 特供服务 182 特供服务
183 </view> 183 </view>
@@ -185,18 +185,11 @@ @@ -185,18 +185,11 @@
185 本店特为贵宾提供提前点餐服务，您现在可以选菜下单，到店就餐时无需等待服务员点餐，可以直接享受就餐服务^_^ 185 本店特为贵宾提供提前点餐服务，您现在可以选菜下单，到店就餐时无需等待服务员点餐，可以直接享受就餐服务^_^
186 </view> 186 </view>
187 <view class="endStyle"> 187 <view class="endStyle">
188 - <block wx:if="{{detail.seller.is_open_order==1 && !detail.hasOvered && !detail.hasCancel}}">  
189 - <block wx:if="{{detail && detail.seller.is_open_order==1}}">  
190 - <view class="last-book-food flex-cc orderingFood" bindtap="cookbook">  
191 - <view class="white-font font30r smooth">去点餐</view>  
192 - </view>  
193 - </block>  
194 - <block wx:else>  
195 - <view class="last-book-food flex-ll orderingFood" bindtap="noopen" data-mark="buy">  
196 - <view class="white-font font30r smooth">去点餐</view>  
197 - </view>  
198 - </block>  
199 - </block> 188 + <view class="book-item-font second-book-button flex-cc font30r cook" style="position: relative;">
  189 + <view wx:if="{{detail && detail.seller.is_open_order==1 && marketing.is_order=='1'}}" class="menu-item menu-seller-item flex-ll" bindtap="cookbook">
  190 + 去点餐
  191 + </view>
  192 + </view>
200 </view> 193 </view>
201 </view> 194 </view>
202 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 195 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
@@ -244,13 +237,13 @@ @@ -244,13 +237,13 @@
244 {{seller.name?seller.name:reserve.seller_name}} 237 {{seller.name?seller.name:reserve.seller_name}}
245 </view> 238 </view>
246 <text style="color: #999; font-size: 26rpx;font-family: PingFang SC;"> 239 <text style="color: #999; font-size: 26rpx;font-family: PingFang SC;">
247 - \n  
248 - 周到安排提供技术支持 400 000 9690 240 + \n
  241 + 周到安排提供技术支持 400 000 9690
249 </text> 242 </text>
250 </view> 243 </view>
251 </scroll-view> 244 </scroll-view>
252 -<view wx:if="{{marketing.is_transpond=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
253 - <view wx:if="{{marketing.is_online=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 245 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  246 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订
254 </view> 247 </view>
255 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约 248 <!-- <view wx:if="{{marketing.is_arrival}}" class="book-item-font second-book-button flex-cc font30r centerBtn" bindtap="secondbook" style="position: relative;">确认赴约
256 </view> --> 249 </view> -->
@@ -423,6 +423,8 @@ @@ -423,6 +423,8 @@
423 .endStyle { 423 .endStyle {
424 display: flex; 424 display: flex;
425 justify-content: flex-end; 425 justify-content: flex-end;
  426 + height: 60rpx;
  427 + margin: 20rpx 0;
426 } 428 }
427 429
428 430
@@ -568,6 +570,7 @@ @@ -568,6 +570,7 @@
568 color: #0143A3; 570 color: #0143A3;
569 height: 46%; 571 height: 46%;
570 border-radius: 42rpx; 572 border-radius: 42rpx;
  573 + font-weight: 600;
571 } 574 }
572 575
573 .shareItem { 576 .shareItem {
@@ -576,6 +579,26 @@ @@ -576,6 +579,26 @@
576 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 579 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
577 color: #fff; 580 color: #fff;
578 } 581 }
  582 +.sharewidth .shareItem{
  583 + width: 100% !important;
  584 +}
579 .between .shareItem{ 585 .between .shareItem{
580 - width: 65%; 586 + width: 65% !important;
  587 +}
  588 +.book-item-font {
  589 + width: 40% !important;
  590 +}
  591 +.menu-item{
  592 + width: 100%;
  593 + height: 100%;
  594 + display: flex;
  595 + justify-content: center;
  596 + align-items: center;
  597 +}
  598 +.cook{
  599 + height: 100% !important;
  600 + background: linear-gradient(104.24deg, rgba(76, 141, 173, 1) -57.47%, rgba(1, 67, 163, 1) 55.72%, rgba(66, 165, 255, 1) 148.72%);
  601 + color: #fff !important;
  602 + font-weight: normal;
  603 + width: 27% !important;
581 } 604 }