xt / xcx-book · Commits

Go to a project

Commit cfc4402f197b562d1189f3884efc17feb069896f

Authored by pengye
1 parent 51dad142
build: skipped

邀请函再次预订、转发邀请函给客人、订金支付 按钮处理

Inline Side-by-side
Showing 25 changed files with 165 additions and 60 deletions
@@ -63,6 +63,9 @@ Page({ @@ -63,6 +63,9 @@ Page({
63 timeList: [], 63 timeList: [],
64 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
  66 + isMoreBtn:'',//再次预订按钮
  67 + isPaymenBtn:'',//支付定金按钮
  68 + isShareItem:'',//转发客人按钮
66 }, 69 },
67 tablestr: '', 70 tablestr: '',
68 urlsValue: [], 71 urlsValue: [],
@@ -358,9 +361,12 @@ Page({ @@ -358,9 +361,12 @@ Page({
358 }).then(res => { 361 }).then(res => {
359 if (res.ret == 200 && res.data && res.data.length > 0) { 362 if (res.ret == 200 && res.data && res.data.length > 0) {
360 let data = res.data[0]; 363 let data = res.data[0];
  364 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  365 + let options = this.data.options
361 this.setData({ 366 this.setData({
362 paymentId: data.id, 367 paymentId: data.id,
363 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 368 + paymentStatus,
  369 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
364 }) 370 })
365 } 371 }
366 }) 372 })
@@ -698,6 +704,8 @@ Page({ @@ -698,6 +704,8 @@ Page({
698 themeSixteen, 704 themeSixteen,
699 lite_style:data.lite_style, 705 lite_style:data.lite_style,
700 timeList, 706 timeList,
  707 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  708 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
701 }) 709 })
702 // 开启语音播报 710 // 开启语音播报
703 if (reserve && reserve.swich_voice == '1') { 711 if (reserve && reserve.swich_voice == '1') {
@@ -305,10 +305,10 @@ @@ -305,10 +305,10 @@
305 {{toastText}} 305 {{toastText}}
306 </view> 306 </view>
307 </scroll-view> 307 </scroll-view>
308 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
309 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
310 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
311 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 308 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  309 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  310 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  311 + <button wx:if="{{detail.status !='4' &&isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
312 </view> 312 </view>
313 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 313 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
314 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 314 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -490,7 +490,6 @@ @@ -490,7 +490,6 @@
490 .moreBtn, 490 .moreBtn,
491 .paymenBtn { 491 .paymenBtn {
492 width: inherit; 492 width: inherit;
493 - margin: 0;  
494 background: transparent; 493 background: transparent;
495 color: #FFEFC5; 494 color: #FFEFC5;
496 border: 2rpx solid #FFEFC5; 495 border: 2rpx solid #FFEFC5;
@@ -500,6 +499,12 @@ @@ -500,6 +499,12 @@
500 margin-right: 20rpx; 499 margin-right: 20rpx;
501 } 500 }
502 501
  502 +.threeBtn{
  503 + width: auto;
  504 + padding: 0 24rpx;
  505 + flex-shrink: 0;
  506 +}
  507 +
503 .shareItem { 508 .shareItem {
504 margin-right: 0; 509 margin-right: 0;
505 background: #FFEFC5; 510 background: #FFEFC5;
@@ -721,7 +726,7 @@ @@ -721,7 +726,7 @@
721 padding: 0 40rpx; 726 padding: 0 40rpx;
722 box-sizing: border-box; 727 box-sizing: border-box;
723 z-index: 100; 728 z-index: 100;
724 - justify-content: flex-end; 729 + justify-content: space-between;
725 width: 100%; 730 width: 100%;
726 } 731 }
727 732
@@ -63,6 +63,9 @@ Page({ @@ -63,6 +63,9 @@ Page({
63 timeList: [], 63 timeList: [],
64 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
  66 + isMoreBtn:'',//再次预订按钮
  67 + isPaymenBtn:'',//支付定金按钮
  68 + isShareItem:'',//转发客人按钮
66 }, 69 },
67 tablestr: '', 70 tablestr: '',
68 urlsValue: [], 71 urlsValue: [],
@@ -358,9 +361,12 @@ Page({ @@ -358,9 +361,12 @@ Page({
358 }).then(res => { 361 }).then(res => {
359 if (res.ret == 200 && res.data && res.data.length > 0) { 362 if (res.ret == 200 && res.data && res.data.length > 0) {
360 let data = res.data[0]; 363 let data = res.data[0];
  364 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  365 + let options = this.data.options
361 this.setData({ 366 this.setData({
362 paymentId: data.id, 367 paymentId: data.id,
363 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 368 + paymentStatus,
  369 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
364 }) 370 })
365 } 371 }
366 }) 372 })
@@ -653,6 +659,8 @@ Page({ @@ -653,6 +659,8 @@ Page({
653 themeColor, 659 themeColor,
654 lite_style:data.lite_style, 660 lite_style:data.lite_style,
655 timeList, 661 timeList,
  662 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  663 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
656 }) 664 })
657 // 开启语音播报 665 // 开启语音播报
658 if (reserve && reserve.swich_voice == '1') { 666 if (reserve && reserve.swich_voice == '1') {
@@ -310,10 +310,10 @@ @@ -310,10 +310,10 @@
310 {{toastText}} 310 {{toastText}}
311 </view> 311 </view>
312 </scroll-view> 312 </scroll-view>
313 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
314 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
315 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
316 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 313 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  314 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook" >再次预订</view>
  315 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  316 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
317 </view> 317 </view>
318 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 318 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
319 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 319 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -521,7 +521,6 @@ @@ -521,7 +521,6 @@
521 .moreBtn, 521 .moreBtn,
522 .paymenBtn { 522 .paymenBtn {
523 width: inherit; 523 width: inherit;
524 - margin: 0;  
525 background: transparent; 524 background: transparent;
526 color: #FFEFC5; 525 color: #FFEFC5;
527 border: 2rpx solid #FFEFC5; 526 border: 2rpx solid #FFEFC5;
@@ -531,6 +530,12 @@ @@ -531,6 +530,12 @@
531 margin-right: 20rpx; 530 margin-right: 20rpx;
532 } 531 }
533 532
  533 +.threeBtn{
  534 + width: auto;
  535 + padding: 0 24rpx;
  536 + flex-shrink: 0;
  537 +}
  538 +
534 .shareItem { 539 .shareItem {
535 margin-right: 0; 540 margin-right: 0;
536 background: #FFEFC5; 541 background: #FFEFC5;
@@ -752,7 +757,7 @@ @@ -752,7 +757,7 @@
752 padding: 0 40rpx; 757 padding: 0 40rpx;
753 box-sizing: border-box; 758 box-sizing: border-box;
754 z-index: 100; 759 z-index: 100;
755 - justify-content: flex-end; 760 + justify-content: space-between;
756 width: 100%; 761 width: 100%;
757 } 762 }
758 763
@@ -63,6 +63,9 @@ Page({ @@ -63,6 +63,9 @@ Page({
63 timeList: [], 63 timeList: [],
64 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
  66 + isMoreBtn:'',//再次预订按钮
  67 + isPaymenBtn:'',//支付定金按钮
  68 + isShareItem:'',//转发客人按钮
66 }, 69 },
67 tablestr: '', 70 tablestr: '',
68 urlsValue: [], 71 urlsValue: [],
@@ -358,9 +361,12 @@ Page({ @@ -358,9 +361,12 @@ Page({
358 }).then(res => { 361 }).then(res => {
359 if (res.ret == 200 && res.data && res.data.length > 0) { 362 if (res.ret == 200 && res.data && res.data.length > 0) {
360 let data = res.data[0]; 363 let data = res.data[0];
  364 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  365 + let options = this.data.options
361 this.setData({ 366 this.setData({
362 paymentId: data.id, 367 paymentId: data.id,
363 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 368 + paymentStatus,
  369 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
364 }) 370 })
365 } 371 }
366 }) 372 })
@@ -653,6 +659,8 @@ Page({ @@ -653,6 +659,8 @@ Page({
653 themeColor, 659 themeColor,
654 lite_style:data.lite_style, 660 lite_style:data.lite_style,
655 timeList, 661 timeList,
  662 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  663 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
656 }) 664 })
657 // 开启语音播报 665 // 开启语音播报
658 if (reserve && reserve.swich_voice == '1') { 666 if (reserve && reserve.swich_voice == '1') {
@@ -293,10 +293,10 @@ @@ -293,10 +293,10 @@
293 {{toastText}} 293 {{toastText}}
294 </view> 294 </view>
295 </scroll-view> 295 </scroll-view>
296 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
297 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
298 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
299 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 296 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  297 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  298 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  299 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
300 </view> 300 </view>
301 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 301 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
302 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 302 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -511,7 +511,6 @@ @@ -511,7 +511,6 @@
511 .moreBtn, 511 .moreBtn,
512 .paymenBtn { 512 .paymenBtn {
513 width: inherit; 513 width: inherit;
514 - margin: 0;  
515 background: transparent; 514 background: transparent;
516 color: #FFEFC5; 515 color: #FFEFC5;
517 border: 2rpx solid #FFEFC5; 516 border: 2rpx solid #FFEFC5;
@@ -521,6 +520,12 @@ @@ -521,6 +520,12 @@
521 margin-right: 20rpx; 520 margin-right: 20rpx;
522 } 521 }
523 522
  523 +.threeBtn{
  524 + width: auto;
  525 + padding: 0 24rpx;
  526 + flex-shrink: 0;
  527 +}
  528 +
524 .shareItem { 529 .shareItem {
525 margin-right: 0; 530 margin-right: 0;
526 background: #FFEFC5; 531 background: #FFEFC5;
@@ -742,7 +747,7 @@ @@ -742,7 +747,7 @@
742 padding: 0 40rpx; 747 padding: 0 40rpx;
743 box-sizing: border-box; 748 box-sizing: border-box;
744 z-index: 100; 749 z-index: 100;
745 - justify-content: flex-end; 750 + justify-content: space-between;
746 width: 100%; 751 width: 100%;
747 } 752 }
748 753
@@ -62,6 +62,9 @@ Page({ @@ -62,6 +62,9 @@ Page({
62 timeList: [], 62 timeList: [],
63 temp_ddate:'',//展示的到店时间 63 temp_ddate:'',//展示的到店时间
64 lite_style:'',//小程序转发卡片样式 64 lite_style:'',//小程序转发卡片样式
  65 + isMoreBtn:'',//再次预订按钮
  66 + isPaymenBtn:'',//支付定金按钮
  67 + isShareItem:'',//转发客人按钮
65 }, 68 },
66 tablestr: '', 69 tablestr: '',
67 urlsValue: [], 70 urlsValue: [],
@@ -357,9 +360,12 @@ Page({ @@ -357,9 +360,12 @@ Page({
357 }).then(res => { 360 }).then(res => {
358 if (res.ret == 200 && res.data && res.data.length > 0) { 361 if (res.ret == 200 && res.data && res.data.length > 0) {
359 let data = res.data[0]; 362 let data = res.data[0];
  363 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  364 + let options = this.data.options
360 this.setData({ 365 this.setData({
361 paymentId: data.id, 366 paymentId: data.id,
362 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 367 + paymentStatus,
  368 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
363 }) 369 })
364 } 370 }
365 }) 371 })
@@ -652,6 +658,8 @@ Page({ @@ -652,6 +658,8 @@ Page({
652 themeColor, 658 themeColor,
653 lite_style:data.lite_style, 659 lite_style:data.lite_style,
654 timeList, 660 timeList,
  661 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  662 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
655 }) 663 })
656 // 开启语音播报 664 // 开启语音播报
657 if (reserve && reserve.swich_voice == '1') { 665 if (reserve && reserve.swich_voice == '1') {
@@ -292,10 +292,10 @@ @@ -292,10 +292,10 @@
292 {{toastText}} 292 {{toastText}}
293 </view> 293 </view>
294 </scroll-view> 294 </scroll-view>
295 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
296 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
297 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
298 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 295 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  296 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  297 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  298 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
299 </view> 299 </view>
300 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 300 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
301 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 301 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -510,7 +510,6 @@ @@ -510,7 +510,6 @@
510 .moreBtn, 510 .moreBtn,
511 .paymenBtn { 511 .paymenBtn {
512 width: inherit; 512 width: inherit;
513 - margin: 0;  
514 background: transparent; 513 background: transparent;
515 color: #FFEFC5; 514 color: #FFEFC5;
516 border: 2rpx solid #FFEFC5; 515 border: 2rpx solid #FFEFC5;
@@ -520,6 +519,12 @@ @@ -520,6 +519,12 @@
520 margin-right: 20rpx; 519 margin-right: 20rpx;
521 } 520 }
522 521
  522 +.threeBtn{
  523 + width: auto;
  524 + padding: 0 24rpx;
  525 + flex-shrink: 0;
  526 +}
  527 +
523 .shareItem { 528 .shareItem {
524 margin-right: 0; 529 margin-right: 0;
525 background: #FFEFC5; 530 background: #FFEFC5;
@@ -741,7 +746,7 @@ @@ -741,7 +746,7 @@
741 padding: 0 40rpx; 746 padding: 0 40rpx;
742 box-sizing: border-box; 747 box-sizing: border-box;
743 z-index: 100; 748 z-index: 100;
744 - justify-content: flex-end; 749 + justify-content: space-between;
745 width: 100%; 750 width: 100%;
746 } 751 }
747 752
@@ -64,6 +64,9 @@ Page({ @@ -64,6 +64,9 @@ Page({
64 timeList: [], 64 timeList: [],
65 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
66 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
  67 + isMoreBtn:'',//再次预订按钮
  68 + isPaymenBtn:'',//支付定金按钮
  69 + isShareItem:'',//转发客人按钮
67 }, 70 },
68 screenHeight: '', 71 screenHeight: '',
69 attentionAnim: {}, 72 attentionAnim: {},
@@ -311,9 +314,12 @@ Page({ @@ -311,9 +314,12 @@ Page({
311 }).then(res => { 314 }).then(res => {
312 if (res.ret == 200 && res.data && res.data.length > 0) { 315 if (res.ret == 200 && res.data && res.data.length > 0) {
313 let data = res.data[0]; 316 let data = res.data[0];
  317 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  318 + let options = this.data.options
314 this.setData({ 319 this.setData({
315 paymentId: data.id, 320 paymentId: data.id,
316 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 321 + paymentStatus,
  322 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
317 }) 323 })
318 } 324 }
319 }) 325 })
@@ -608,6 +614,8 @@ Page({ @@ -608,6 +614,8 @@ Page({
608 whiteBj, 614 whiteBj,
609 lite_style:data.lite_style, 615 lite_style:data.lite_style,
610 timeList, 616 timeList,
  617 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  618 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
611 }) 619 })
612 // 开启语音播报 620 // 开启语音播报
613 if (reserve && reserve.swich_voice == '1') { 621 if (reserve && reserve.swich_voice == '1') {
@@ -279,10 +279,10 @@ @@ -279,10 +279,10 @@
279 {{toastText}} 279 {{toastText}}
280 </view> 280 </view>
281 </scroll-view> 281 </scroll-view>
282 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" 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>  
284 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
285 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 282 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="all-button flex-lr sharewidth">
  283 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  284 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  285 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
286 </view> 286 </view>
287 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 287 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
288 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 288 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -569,7 +569,7 @@ @@ -569,7 +569,7 @@
569 padding: 0 40rpx; 569 padding: 0 40rpx;
570 box-sizing: border-box; 570 box-sizing: border-box;
571 z-index: 100; 571 z-index: 100;
572 - justify-content: flex-end; 572 + justify-content: space-between;
573 } 573 }
574 574
575 .centerBtn { 575 .centerBtn {
@@ -580,7 +580,6 @@ @@ -580,7 +580,6 @@
580 .moreBtn, 580 .moreBtn,
581 .paymenBtn { 581 .paymenBtn {
582 width: inherit; 582 width: inherit;
583 - margin: 0;  
584 background: #fafafa; 583 background: #fafafa;
585 color: #0143A3; 584 color: #0143A3;
586 border: 2rpx solid #0143A3; 585 border: 2rpx solid #0143A3;
@@ -590,6 +589,12 @@ @@ -590,6 +589,12 @@
590 margin-right: 20rpx; 589 margin-right: 20rpx;
591 } 590 }
592 591
  592 +.threeBtn{
  593 + width: auto;
  594 + padding: 0 24rpx;
  595 + flex-shrink: 0;
  596 +}
  597 +
593 .shareItem { 598 .shareItem {
594 margin-right: 0; 599 margin-right: 0;
595 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 600 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
@@ -63,6 +63,9 @@ Page({ @@ -63,6 +63,9 @@ Page({
63 timeList: [], 63 timeList: [],
64 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
  66 + isMoreBtn:'',//再次预订按钮
  67 + isPaymenBtn:'',//支付定金按钮
  68 + isShareItem:'',//转发客人按钮
66 }, 69 },
67 tablestr: '', 70 tablestr: '',
68 urlsValue: [], 71 urlsValue: [],
@@ -358,9 +361,12 @@ Page({ @@ -358,9 +361,12 @@ Page({
358 }).then(res => { 361 }).then(res => {
359 if (res.ret == 200 && res.data && res.data.length > 0) { 362 if (res.ret == 200 && res.data && res.data.length > 0) {
360 let data = res.data[0]; 363 let data = res.data[0];
  364 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  365 + let options = this.data.options
361 this.setData({ 366 this.setData({
362 paymentId: data.id, 367 paymentId: data.id,
363 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 368 + paymentStatus,
  369 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
364 }) 370 })
365 } 371 }
366 }) 372 })
@@ -653,6 +659,8 @@ Page({ @@ -653,6 +659,8 @@ Page({
653 themeColor, 659 themeColor,
654 lite_style:data.lite_style, 660 lite_style:data.lite_style,
655 timeList, 661 timeList,
  662 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  663 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
656 }) 664 })
657 // 开启语音播报 665 // 开启语音播报
658 if (reserve && reserve.swich_voice == '1') { 666 if (reserve && reserve.swich_voice == '1') {
@@ -305,10 +305,10 @@ @@ -305,10 +305,10 @@
305 {{toastText}} 305 {{toastText}}
306 </view> 306 </view>
307 </scroll-view> 307 </scroll-view>
308 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
309 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
310 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
311 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 308 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  309 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  310 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  311 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
312 </view> 312 </view>
313 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 313 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
314 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 314 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -503,7 +503,6 @@ @@ -503,7 +503,6 @@
503 .moreBtn, 503 .moreBtn,
504 .paymenBtn { 504 .paymenBtn {
505 width: inherit; 505 width: inherit;
506 - margin: 0;  
507 background: transparent; 506 background: transparent;
508 color: #FFEFC5; 507 color: #FFEFC5;
509 border: 2rpx solid #FFEFC5; 508 border: 2rpx solid #FFEFC5;
@@ -513,6 +512,12 @@ @@ -513,6 +512,12 @@
513 margin-right: 20rpx; 512 margin-right: 20rpx;
514 } 513 }
515 514
  515 +.threeBtn{
  516 + width: auto;
  517 + padding: 0 24rpx;
  518 + flex-shrink: 0;
  519 +}
  520 +
516 .shareItem { 521 .shareItem {
517 margin-right: 0; 522 margin-right: 0;
518 background: #FFEFC5; 523 background: #FFEFC5;
@@ -734,7 +739,7 @@ @@ -734,7 +739,7 @@
734 padding: 0 40rpx; 739 padding: 0 40rpx;
735 box-sizing: border-box; 740 box-sizing: border-box;
736 z-index: 100; 741 z-index: 100;
737 - justify-content: flex-end; 742 + justify-content: space-between;
738 width: 100%; 743 width: 100%;
739 } 744 }
740 745
@@ -63,6 +63,9 @@ Page({ @@ -63,6 +63,9 @@ Page({
63 timeList: [], 63 timeList: [],
64 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
  66 + isMoreBtn:'',//再次预订按钮
  67 + isPaymenBtn:'',//支付定金按钮
  68 + isShareItem:'',//转发客人按钮
66 }, 69 },
67 tablestr: '', 70 tablestr: '',
68 urlsValue: [], 71 urlsValue: [],
@@ -357,9 +360,12 @@ Page({ @@ -357,9 +360,12 @@ Page({
357 }).then(res => { 360 }).then(res => {
358 if (res.ret == 200 && res.data && res.data.length > 0) { 361 if (res.ret == 200 && res.data && res.data.length > 0) {
359 let data = res.data[0]; 362 let data = res.data[0];
  363 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  364 + let options = this.data.options
360 this.setData({ 365 this.setData({
361 paymentId: data.id, 366 paymentId: data.id,
362 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 367 + paymentStatus,
  368 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
363 }) 369 })
364 } 370 }
365 }) 371 })
@@ -652,6 +658,8 @@ Page({ @@ -652,6 +658,8 @@ Page({
652 themeColor, 658 themeColor,
653 lite_style:data.lite_style, 659 lite_style:data.lite_style,
654 timeList, 660 timeList,
  661 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  662 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
655 }) 663 })
656 // 开启语音播报 664 // 开启语音播报
657 if (reserve && reserve.swich_voice == '1') { 665 if (reserve && reserve.swich_voice == '1') {
@@ -303,10 +303,10 @@ @@ -303,10 +303,10 @@
303 {{toastText}} 303 {{toastText}}
304 </view> 304 </view>
305 </scroll-view> 305 </scroll-view>
306 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth {{themeColor}}">  
307 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
308 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
309 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button> 306 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
  307 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  308 + <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  309 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
310 </view> 310 </view>
311 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 311 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
312 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 312 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -512,7 +512,6 @@ @@ -512,7 +512,6 @@
512 .moreBtn, 512 .moreBtn,
513 .paymenBtn { 513 .paymenBtn {
514 width: inherit; 514 width: inherit;
515 - margin: 0;  
516 background: transparent; 515 background: transparent;
517 color: #FFEFC5; 516 color: #FFEFC5;
518 border: 2rpx solid #FFEFC5; 517 border: 2rpx solid #FFEFC5;
@@ -522,6 +521,12 @@ @@ -522,6 +521,12 @@
522 margin-right: 20rpx; 521 margin-right: 20rpx;
523 } 522 }
524 523
  524 +.threeBtn{
  525 + width: auto;
  526 + padding: 0 24rpx;
  527 + flex-shrink: 0;
  528 +}
  529 +
525 .shareItem { 530 .shareItem {
526 margin-right: 0; 531 margin-right: 0;
527 background: #FFEFC5; 532 background: #FFEFC5;
@@ -743,7 +748,7 @@ @@ -743,7 +748,7 @@
743 padding: 0 40rpx; 748 padding: 0 40rpx;
744 box-sizing: border-box; 749 box-sizing: border-box;
745 z-index: 100; 750 z-index: 100;
746 - justify-content: flex-end; 751 + justify-content: space-between;
747 width: 100%; 752 width: 100%;
748 } 753 }
749 754
@@ -71,6 +71,9 @@ Page({ @@ -71,6 +71,9 @@ Page({
71 timeList: [], 71 timeList: [],
72 temp_ddate:'',//展示的到店时间 72 temp_ddate:'',//展示的到店时间
73 lite_style:'',//小程序转发卡片样式 73 lite_style:'',//小程序转发卡片样式
  74 + isMoreBtn:'',//再次预订按钮
  75 + isPaymenBtn:'',//支付定金按钮
  76 + isShareItem:'',//转发客人按钮
74 }, 77 },
75 tablestr: '', 78 tablestr: '',
76 urlsValue: [], 79 urlsValue: [],
@@ -377,9 +380,12 @@ Page({ @@ -377,9 +380,12 @@ Page({
377 }).then(res => { 380 }).then(res => {
378 if (res.ret == 200 && res.data && res.data.length > 0) { 381 if (res.ret == 200 && res.data && res.data.length > 0) {
379 let data = res.data[0]; 382 let data = res.data[0];
  383 + let paymentStatus = data.trade_state == 'SUCCESS' ? '1' : '0';
  384 + let options = this.data.options
380 this.setData({ 385 this.setData({
381 paymentId: data.id, 386 paymentId: data.id,
382 - paymentStatus: data.trade_state == 'SUCCESS' ? '1' : '0' 387 + paymentStatus,
  388 + isPaymenBtn:options.isOrder != '1' && data.id && paymentStatus == '0' && options.hasSellerShare == '1' && options.isDeposit == '1',
383 }) 389 })
384 } 390 }
385 }) 391 })
@@ -689,6 +695,8 @@ Page({ @@ -689,6 +695,8 @@ Page({
689 colors, 695 colors,
690 lite_style:data.lite_style, 696 lite_style:data.lite_style,
691 timeList, 697 timeList,
  698 + isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
  699 + isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
692 }) 700 })
693 // 开启语音播报 701 // 开启语音播报
694 if (reserve && reserve.swich_voice == '1') { 702 if (reserve && reserve.swich_voice == '1') {
@@ -303,10 +303,10 @@ @@ -303,10 +303,10 @@
303 {{toastText}} 303 {{toastText}}
304 </view> 304 </view>
305 </scroll-view> 305 </scroll-view>
306 -<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1')}}" class="flex-lr sharewidth">  
307 - <view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>  
308 - <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0' && options.hasSellerShare == '1'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
309 - <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1'}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 306 +<view wx:if="{{isMoreBtn || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
  307 + <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(detail.status !='4' && isPaymenBtn && isShareItem) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
  308 + <view wx:if="{{detail.status !='4' && isPaymenBtn && isDeposit}}" class="flex-cc font30r paymenBtn {{(isMoreBtn && (detail.status !='4' && isShareItem)) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
  309 + <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r shareItem" open-type="share">转发邀请函给客人</button>
310 </view> 310 </view>
311 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 311 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
312 <my-modal id="payModal" fadeStyle="slideUp" height="240px"> 312 <my-modal id="payModal" fadeStyle="slideUp" height="240px">
@@ -484,7 +484,7 @@ @@ -484,7 +484,7 @@
484 padding: 0 40rpx; 484 padding: 0 40rpx;
485 box-sizing: border-box; 485 box-sizing: border-box;
486 z-index: 100; 486 z-index: 100;
487 - justify-content: flex-end; 487 + justify-content: space-between;
488 width: 100%; 488 width: 100%;
489 } 489 }
490 490
@@ -513,7 +513,6 @@ @@ -513,7 +513,6 @@
513 .moreBtn, 513 .moreBtn,
514 .paymenBtn { 514 .paymenBtn {
515 width: inherit; 515 width: inherit;
516 - margin: 0;  
517 background: transparent; 516 background: transparent;
518 color: #FFEFC5; 517 color: #FFEFC5;
519 border: 2rpx solid #FFEFC5; 518 border: 2rpx solid #FFEFC5;
@@ -523,6 +522,12 @@ @@ -523,6 +522,12 @@
523 margin-right: 20rpx; 522 margin-right: 20rpx;
524 } 523 }
525 524
  525 +.threeBtn{
  526 + width: auto;
  527 + padding: 0 24rpx;
  528 + flex-shrink: 0;
  529 +}
  530 +
526 .shareItem { 531 .shareItem {
527 margin-right: 0; 532 margin-right: 0;
528 background: #FFEFC5; 533 background: #FFEFC5;
@@ -104,7 +104,8 @@ Page({ @@ -104,7 +104,8 @@ 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(sid, isOrder, status,is_online_reserve); 107 + let isDeposit = res.data.is_show_notice_deposit;
  108 + this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve,isDeposit);
108 }).catch(res => { 109 }).catch(res => {
109 console.log(res, '商家详情请求失败'); 110 console.log(res, '商家详情请求失败');
110 }) 111 })
@@ -117,7 +118,7 @@ Page({ @@ -117,7 +118,7 @@ Page({
117 return isorder; 118 return isorder;
118 }, 119 },
119 // 获取商家设置营销信息 120 // 获取商家设置营销信息
120 - getSellerTemplateConfFun(sid, isOrder, status, is_online_reserve) { 121 + getSellerTemplateConfFun(sid, isOrder, status, is_online_reserve, isDeposit) {
121 App.Seller.GetSellerTemplateConf({ 122 App.Seller.GetSellerTemplateConf({
122 sid 123 sid
123 }).then(res => { 124 }).then(res => {
@@ -130,8 +131,8 @@ Page({ @@ -130,8 +131,8 @@ Page({
130 } else { 131 } else {
131 url = '/pack-invitation/pages/detail_owner_invitation9'; 132 url = '/pack-invitation/pages/detail_owner_invitation9';
132 } 133 }
133 - // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人  
134 - url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare; 134 + // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否
  135 + url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid + '&onlineReserve=' + is_online_reserve + '&hasInvitation=' + this.data.options.hasInvitation + '&hasSellerShare=' + this.data.options.hasSellerShare + '&isDeposit=' + isDeposit;
135 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束 136 // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束
136 url += (isOrder == '1' || status == '3') ? '&isOrder=1' : ''; 137 url += (isOrder == '1' || status == '3') ? '&isOrder=1' : '';
137 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; 138 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;