邀请函赴约加开关

pengye
1 parent c939fbe1
Showing 12 changed files with 42 additions and 39 deletions
miniprogram/pack-invitation/pages/detail_owner_invitation10.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation11.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation12.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation2.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation3.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation4.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation5.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation6.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation7.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation8.wxml
miniprogram/pack-invitation/pages/detail_owner_invitation9.wxml
miniprogram/pages/customer/detail_owner_invitation_new.js
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation10.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation10.wxml
View file @a37bfa9
@@ -312,7 +312,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -322,11 +322,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation11.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation11.wxml
View file @a37bfa9
@@ -495,7 +495,7 @@
     <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
     <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
     <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
-        <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+        <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
         <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
         <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
         <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -505,11 +505,11 @@
         <block wx:if="{{options.hasSellerShare != '1'}}">
             <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
             <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-            <block wx:if="{{wxNickname && wxAvatar}}">
+            <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             </block>
-            <block wx:if="{{!wxNickname || !wxAvatar}}">
+            <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
             </block>
         </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation12.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation12.wxml
View file @a37bfa9
@@ -198,7 +198,7 @@
     <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
     <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
     <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
-        <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+        <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
         <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
         <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
         <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -208,11 +208,11 @@
         <block wx:if="{{options.hasSellerShare != '1'}}">
             <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
             <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-            <block wx:if="{{wxNickname && wxAvatar}}">
+            <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             </block>
-            <block wx:if="{{!wxNickname || !wxAvatar}}">
+            <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
                 <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
             </block>
         </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation2.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation2.wxml
View file @a37bfa9
@@ -352,7 +352,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -362,11 +362,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation3.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation3.wxml
View file @a37bfa9
@@ -357,7 +357,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -367,11 +367,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation4.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation4.wxml
View file @a37bfa9
@@ -340,7 +340,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -350,11 +350,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation5.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation5.wxml
View file @a37bfa9
@@ -339,7 +339,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -349,11 +349,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation6.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation6.wxml
View file @a37bfa9
@@ -325,7 +325,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="all-button flex-lr sharewidth">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -335,11 +335,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation7.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation7.wxml
View file @a37bfa9
@@ -352,7 +352,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -362,11 +362,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation8.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation8.wxml
View file @a37bfa9
@@ -350,7 +350,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth {{themeColor}}">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -360,11 +360,11 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
             <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
         </block>
     </block>
--- a/miniprogram/pack-invitation/pages/detail_owner_invitation9.wxml
View file @a37bfa9
+++ b/miniprogram/pack-invitation/pages/detail_owner_invitation9.wxml
View file @a37bfa9
@@ -350,7 +350,7 @@
 <!-- (开启在线预订 显示在线预订) || (未开启在线预订  显示再次预订（打商家电话）) -->
 <!-- (未结束&&未取消 && 开启转发开关 显示 转发邀请函给客人) ||  (过了当前餐段结束时间||用餐完成||已取消 显示 转发店铺给好友) -->
 <view wx:if="{{isMoreBtn || options.isOrder == '1' || (!isMoreBtn && seller.phone) || (detail.status !='4' && isPaymenBtn) || (detail.status !='4' && isShareItem)}}" class="flex-lr sharewidth">
-    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
+    <view wx:if="{{isMoreBtn}}" class="flex-cc font30r moreBtn {{(((detail.status !='4' && isPaymenBtn) || (reserveOpenid != openid && options.isOrder != '1' && options.hasSellerShare!='1' && isShowBtn && options.isMeeting == '1')) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="secondbook">再次预订</view>
     <view wx:if="{{!isMoreBtn && seller.phone}}" class="flex-cc font30r moreBtn {{((detail.status !='4' && isPaymenBtn) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="call" data-phone="{{seller.phone}}">再次预订</view>
     <view wx:if="{{detail.status !='4' && isPaymenBtn}}" class="flex-cc font30r paymenBtn {{((isMoreBtn || (!isMoreBtn && seller.phone)) && ((detail.status !='4' && isShareItem) || options.isOrder == '1')) ? 'threeBtn' : ''}}" bindtap="paymentFun">支付定金</view>
     <block wx:if="{{options.hasSellerShare == '1'}}">
@@ -360,12 +360,12 @@
     <block wx:if="{{options.hasSellerShare != '1'}}">
         <button wx:if="{{detail.status !='4' && isShareItem}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" open-type="share">转发邀请函</button>
         <button wx:if="{{options.isOrder == '1'}}" class="flex-cc font30r {{(reserveOpenid != openid && options.isOrder != '1' && isShowBtn)?'paymenBtn paymenBtn1':'shareItem shareItem1'}}" data-type="2" open-type="share">转发邀请函</button>
-        <block wx:if="{{wxNickname && wxAvatar}}">
-            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
-            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约</button>
+        <block wx:if="{{wxNickname && wxAvatar && options.isMeeting == '1'}}">
+            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && !purePhoneNumber}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约1</button>
+            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn && purePhoneNumber}}" bind:tap="getPhoneNumberFun" class="flex-cc font30r shareItem">确认赴约2</button>
         </block>
-        <block wx:if="{{!wxNickname || !wxAvatar}}">
-            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约</button>
+        <block wx:if="{{(!wxNickname || !wxAvatar) && options.isMeeting == '1'}}">
+            <button wx:if="{{reserveOpenid != openid && options.isOrder != '1' && isShowBtn}}" bind:tap="gotoLogin" class="flex-cc font30r shareItem">确认赴约3</button>
         </block>
     </block>
 </view>
--- a/miniprogram/pages/customer/detail_owner_invitation_new.js
View file @a37bfa9
+++ b/miniprogram/pages/customer/detail_owner_invitation_new.js
View file @a37bfa9
@@ -2,6 +2,7 @@
 import App from '../../utils/api';
 import TP from '../../utils/tpls';
 import RS from '../../utils/reserveStatus'
+import util from '../../utils/util';
 Page({
     /**
      * 页面的初始数据
@@ -156,7 +157,7 @@ Page({
         return isorder;
     },
     // 获取商家设置营销信息
-    getSellerTemplateConfFun(sid, isOrder, reserev, is_online_reserve, isDeposit) {
+    getSellerTemplateConfFun(sid, isOrder, reserev, is_online_reserve, isDeposit,isMeeting) {
         App.Seller.GetSellerTemplateConf({
             sid
         }).then(res => {
@@ -174,8 +175,10 @@ Page({
             if(data.type == '18' || data.type == '21') url = '/pack-invitation/pages/detail_owner_invitation11';
             if(data.type == '19' || data.type == '22') url = '/pack-invitation/pages/detail_owner_invitation12';
             if(data.type == '20') url = '/pack-invitation/pages/detail_owner_invitation10';
-            // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否
-            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;
+            let marketing = util.determine(data.marketing);
+            let isMeeting = marketing.is_customer_confirm?marketing.is_customer_confirm:'0';
+            // is_online_reserve 在线预订开关 hasSellerShare 商家app分享 hasInvitation 受邀人 isDeposit 订金功能 1 是 0 否 isMeeting 赴约功能 1开启 0关闭
+            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 + '&isMeeting=' + isMeeting;
             if(data.type == '18' || data.type == '19') url += '&bookType=1';
             if(data.type == '21' || data.type == '22') url += '&bookType=2';
             // console.log('宴会类型-------------',reserev.reserve_type);