邀请函模板1，设置了不允许取消,还可以操作取消，不显示经理头像名字和电话,问题处理

@@ -34,7 +34,8 @@ Page({
         menuhidden: true,
         menuhidden: true,
         selecthidden: true,
         selecthidden: true,
         morehidden: true,
         morehidden: true,
-        openid: getApp().openid
+        openid: getApp().openid,
+        customerCancel:'',//是否向顾客开放取消 1 是 0 否 默认 0
     },
     },
     id: null,
     id: null,
     msgTpl: '',
     msgTpl: '',
@@ -265,6 +266,7 @@ Page({
                     tel: reserev.seller.seller_tel.split(',')[0]
                     tel: reserev.seller.seller_tel.split(',')[0]
                 }
                 }
             })
             })
+            this.getSellerInfo(reserev.sid)
             if (this.data.detail.type == 0 || this.data.detail.type == 1) {
             if (this.data.detail.type == 0 || this.data.detail.type == 1) {
                 this.getstaffinfo();
                 this.getstaffinfo();
                 this.getroomimage();
                 this.getroomimage();
@@ -283,6 +285,16 @@ Page({
             this.msgTpl = res.data.content
             this.msgTpl = res.data.content
         })
         })
     },
     },
+    //是否展示取消预订按钮
+    getSellerInfo(sid) {
+      App.Seller.GetDzSellerConf({
+          sid
+      }).then(res => {
+          this.setData({
+              customerCancel: res.data.is_customer_cancel, //1 展示 0 不展示
+          })
+      })
+    },
     formatDatail(detail, dateSmart) {
     formatDatail(detail, dateSmart) {
         detail.rdateStr = dateSmart;
         detail.rdateStr = dateSmart;
         detail.tableFirst = detail.tables[0].name;
         detail.tableFirst = detail.tables[0].name;

@@ -98,11 +98,8 @@
 		<view hidden="{{selecthidden}}">
 		<view hidden="{{selecthidden}}">
 			<navigator class="select-item-button flex-cc white-font font24r" style="left: 75rpx;bottom:290rpx;" open-type="redirect" url="/pages/customer/index?islove=custom">首页</navigator>
 			<navigator class="select-item-button flex-cc white-font font24r" style="left: 75rpx;bottom:290rpx;" open-type="redirect" url="/pages/customer/index?islove=custom">首页</navigator>
 			<navigator class="select-item-button flex-cc white-font font24r" style="left: 150rpx;bottom:160rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
 			<navigator class="select-item-button flex-cc white-font font24r" style="left: 150rpx;bottom:160rpx;" open-type="redirect" url="/pages/me/index">我的</navigator>
-			<block wx:if="{{detail.hasCancel}}">
-				<view class="select-item-button flex-cc gray-font font28r" style="left: 75rpx;bottom:30rpx;">取消订单</view>
-			</block>
-			<block wx:else>
-				<view class="select-item-button flex-cc white-font font24r" style="left: 75rpx;bottom:30rpx;" bindtap="cancelmodal">取消订单</view>
+            <block wx:if="{{customerCancel == '1'}}">
+				<view class="select-item-button flex-cc white-font font28r" style="left: 75rpx;bottom:30rpx;" bindtap="cancelmodal">取消订单</view>
 			</block>
 			</block>
 			<!-- <view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view> -->
 			<!-- <view class="select-item-button flex-cc white-font font24r" style="left: 42rpx;bottom:10rpx;" bindtap="closeselect">返回</view> -->
 		</view>
 		</view>

@@ -148,6 +148,7 @@ Page({
             // (过了当前餐段结束时间  || 预订是用餐完成状态) 邀请函显示已结束
             // (过了当前餐段结束时间  || 预订是用餐完成状态) 邀请函显示已结束
             url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : '';
             url += (isOrder == '1' || reserev.status == '3') ? '&isOrder=1' : '';
             url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
             url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
+            if(data.type == '1') url+= '&uid='+this.data.options.uid
             console.log('跳转路径url', url);
             console.log('跳转路径url', url);
             wx.redirectTo({
             wx.redirectTo({
                 url
                 url