xt / xcx-book · Commits

Go to a project

Commit 9e53bb33ac9c5df0ea82ebe1a034dea9a96b53cf

Authored by pengye
1 parent fc3f924d
build: skipped

订单列表、邀请函、商家详情判断是否开启在线预订，未开启不显示再次预订按钮2

Inline Side-by-side
Showing 16 changed files with 52 additions and 24 deletions
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 </navigator> 219 </navigator>
220 </view> 220 </view>
221 </block> 221 </block>
222 - <view class="vips"> 222 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
223 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 223 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
224 点击了解更多会员优惠政策 224 点击了解更多会员优惠政策
225 </view> 225 </view>
@@ -235,7 +235,7 @@ @@ -235,7 +235,7 @@
235 {{toastText}} 235 {{toastText}}
236 </view> 236 </view>
237 </scroll-view> 237 </scroll-view>
238 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 238 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
239 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 239 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
240 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 240 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
241 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 241 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -437,8 +437,12 @@ @@ -437,8 +437,12 @@
437 flex-direction: column; 437 flex-direction: column;
438 justify-content: center; 438 justify-content: center;
439 align-items: center; 439 align-items: center;
440 - padding-bottom: 180rpx;  
441 margin-top: 20rpx; 440 margin-top: 20rpx;
  441 + padding-bottom: 20rpx;
  442 +}
  443 +
  444 +.introduceBottom{
  445 + padding-bottom: 180rpx;
442 } 446 }
443 447
444 .vips image { 448 .vips image {
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
221 </navigator> 221 </navigator>
222 </view> 222 </view>
223 </block> 223 </block>
224 - <view class="vips"> 224 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
225 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 225 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
226 点击了解更多会员优惠政策 226 点击了解更多会员优惠政策
227 </view> 227 </view>
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
237 {{toastText}} 237 {{toastText}}
238 </view> 238 </view>
239 </scroll-view> 239 </scroll-view>
240 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 240 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
241 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 241 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
242 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 242 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
243 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 243 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -468,8 +468,12 @@ @@ -468,8 +468,12 @@
468 flex-direction: column; 468 flex-direction: column;
469 justify-content: center; 469 justify-content: center;
470 align-items: center; 470 align-items: center;
471 - padding-bottom: 180rpx;  
472 margin-top: 20rpx; 471 margin-top: 20rpx;
  472 + padding-bottom: 20rpx;
  473 +}
  474 +
  475 +.introduceBottom{
  476 + padding-bottom: 180rpx;
473 } 477 }
474 478
475 .vips image { 479 .vips image {
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 </navigator> 204 </navigator>
205 </view> 205 </view>
206 </block> 206 </block>
207 - <view class="vips"> 207 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
208 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 208 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
209 点击了解更多会员优惠政策 209 点击了解更多会员优惠政策
210 </view> 210 </view>
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 {{toastText}} 220 {{toastText}}
221 </view> 221 </view>
222 </scroll-view> 222 </scroll-view>
223 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' && options.onlineReserve == '1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 223 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
224 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 224 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
225 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 225 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
226 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 226 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -457,8 +457,12 @@ @@ -457,8 +457,12 @@
457 flex-direction: column; 457 flex-direction: column;
458 justify-content: center; 458 justify-content: center;
459 align-items: center; 459 align-items: center;
460 - padding-bottom: 180rpx;  
461 margin-top: 20rpx; 460 margin-top: 20rpx;
  461 + padding-bottom: 20rpx;
  462 +}
  463 +
  464 +.introduceBottom{
  465 + padding-bottom: 180rpx;
462 } 466 }
463 467
464 .vips image { 468 .vips image {
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 </navigator> 202 </navigator>
203 </view> 203 </view>
204 </block> 204 </block>
205 - <view class="vips"> 205 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
206 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 206 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
207 点击了解更多会员优惠政策 207 点击了解更多会员优惠政策
208 </view> 208 </view>
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
218 {{toastText}} 218 {{toastText}}
219 </view> 219 </view>
220 </scroll-view> 220 </scroll-view>
221 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 221 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
222 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 222 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
223 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 223 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
224 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 224 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -457,8 +457,12 @@ @@ -457,8 +457,12 @@
457 flex-direction: column; 457 flex-direction: column;
458 justify-content: center; 458 justify-content: center;
459 align-items: center; 459 align-items: center;
460 - padding-bottom: 180rpx;  
461 margin-top: 20rpx; 460 margin-top: 20rpx;
  461 + padding-bottom: 20rpx;
  462 +}
  463 +
  464 +.introduceBottom{
  465 + padding-bottom: 180rpx;
462 } 466 }
463 467
464 .vips image { 468 .vips image {
@@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@
262 </navigator> 262 </navigator>
263 </view> 263 </view>
264 </view> 264 </view>
265 - <view class="vips"> 265 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
266 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 266 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
267 点击了解更多会员优惠政策 267 点击了解更多会员优惠政策
268 </view> 268 </view>
@@ -279,7 +279,7 @@ @@ -279,7 +279,7 @@
279 {{toastText}} 279 {{toastText}}
280 </view> 280 </view>
281 </scroll-view> 281 </scroll-view>
282 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="all-button flex-lr sharewidth"> 282 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="all-button flex-lr sharewidth">
283 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 283 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
284 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 284 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
285 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 285 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -559,8 +559,12 @@ @@ -559,8 +559,12 @@
559 flex-direction: column; 559 flex-direction: column;
560 justify-content: center; 560 justify-content: center;
561 align-items: center; 561 align-items: center;
562 - padding-bottom: 180rpx;  
563 margin-top: 20rpx; 562 margin-top: 20rpx;
  563 + padding-bottom: 20rpx;
  564 +}
  565 +
  566 +.introduceBottom{
  567 + padding-bottom: 180rpx;
564 } 568 }
565 569
566 .vips .text { 570 .vips .text {
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 </navigator> 217 </navigator>
218 </view> 218 </view>
219 </block> 219 </block>
220 - <view class="vips"> 220 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
221 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 221 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
222 点击了解更多会员优惠政策 222 点击了解更多会员优惠政策
223 </view> 223 </view>
@@ -233,7 +233,7 @@ @@ -233,7 +233,7 @@
233 {{toastText}} 233 {{toastText}}
234 </view> 234 </view>
235 </scroll-view> 235 </scroll-view>
236 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 236 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
237 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 237 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
238 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 238 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
239 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 239 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -448,8 +448,12 @@ @@ -448,8 +448,12 @@
448 flex-direction: column; 448 flex-direction: column;
449 justify-content: center; 449 justify-content: center;
450 align-items: center; 450 align-items: center;
451 - padding-bottom: 180rpx;  
452 margin-top: 20rpx; 451 margin-top: 20rpx;
  452 + padding-bottom: 20rpx;
  453 +}
  454 +
  455 +.introduceBottom{
  456 + padding-bottom: 180rpx;
453 } 457 }
454 458
455 .vips image { 459 .vips image {
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 </navigator> 214 </navigator>
215 </view> 215 </view>
216 </block> 216 </block>
217 - <view class="vips"> 217 + <view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
218 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 218 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
219 点击了解更多会员优惠政策 219 点击了解更多会员优惠政策
220 </view> 220 </view>
@@ -230,7 +230,7 @@ @@ -230,7 +230,7 @@
230 {{toastText}} 230 {{toastText}}
231 </view> 231 </view>
232 </scroll-view> 232 </scroll-view>
233 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 233 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
234 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 234 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
235 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 235 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
236 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 236 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -457,8 +457,12 @@ @@ -457,8 +457,12 @@
457 flex-direction: column; 457 flex-direction: column;
458 justify-content: center; 458 justify-content: center;
459 align-items: center; 459 align-items: center;
460 - padding-bottom: 180rpx;  
461 margin-top: 20rpx; 460 margin-top: 20rpx;
  461 + padding-bottom: 20rpx;
  462 +}
  463 +
  464 +.introduceBottom{
  465 + padding-bottom: 180rpx;
462 } 466 }
463 467
464 .vips image { 468 .vips image {
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
192 </view> 192 </view>
193 </view> 193 </view>
194 </view> 194 </view>
195 - <view class="introduce introduceBottom"> 195 + <view class="introduce {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
196 <block wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}"> 196 <block wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
197 <block wx:if="{{titleType}}"> 197 <block wx:if="{{titleType}}">
198 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle> 198 <titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 {{toastText}} 236 {{toastText}}
237 </view> 237 </view>
238 </scroll-view> 238 </scroll-view>
239 -<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth"> 239 +<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth">
240 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 240 <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
241 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view> 241 <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
242 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 242 <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
@@ -104,7 +104,7 @@ Page({ @@ -104,7 +104,7 @@ Page({
104 sid 104 sid
105 }).then(res => { 105 }).then(res => {
106 let is_online_reserve = res.data.is_online_reserve; 106 let is_online_reserve = res.data.is_online_reserve;
107 - this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder, status,is_online_reserve); 107 + this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve);
108 }).catch(res => { 108 }).catch(res => {
109 console.log(res, '商家详情请求失败'); 109 console.log(res, '商家详情请求失败');
110 }) 110 })