Commit b8fc45f4842fa983a511fb6de9eb6be780ad7e02

Authored by vking
1 parent cf41bb0f

pay

@@ -115,7 +115,9 @@ Page({ @@ -115,7 +115,9 @@ Page({
115 invoice[key.toLowerCase()]=e.detail[key] 115 invoice[key.toLowerCase()]=e.detail[key]
116 }) 116 })
117 App.Customer.SetInvoice(invoice).then(res=>{ 117 App.Customer.SetInvoice(invoice).then(res=>{
118 - util.toast('发票已提交','none') 118 + setTimeout(()=>{
  119 + util.toast('发票已提交','none')
  120 + },300)
119 }) 121 })
120 }, 122 },
121 GetBalance(){//获得余额 123 GetBalance(){//获得余额
@@ -17,6 +17,7 @@ Page({ @@ -17,6 +17,7 @@ Page({
17 firstShowMsg:'', 17 firstShowMsg:'',
18 rsl:[],//推荐商家 18 rsl:[],//推荐商家
19 hasCancel:false, //取消预定效果 19 hasCancel:false, //取消预定效果
  20 + hasLoadedCheckout:false,
20 }, 21 },
21 id: null, 22 id: null,
22 tpls: TP.tpls(), 23 tpls: TP.tpls(),
@@ -311,15 +312,16 @@ Page({ @@ -311,15 +312,16 @@ Page({
311 GetCheckout(){ 312 GetCheckout(){
312 App.Customer.GetOrderInfo({rid:this.options.id}).then(res=>{ 313 App.Customer.GetOrderInfo({rid:this.options.id}).then(res=>{
313 this.setData({ 314 this.setData({
314 - checkout:res.data 315 + checkout:res.data,
  316 + hasLoadedCheckout:true,
315 }) 317 })
316 }) 318 })
317 }, 319 },
318 checkout(){ 320 checkout(){
319 if(this.data.detail.status==0){ 321 if(this.data.detail.status==0){
320 this.selectComponent('#showModal').options({ 322 this.selectComponent('#showModal').options({
321 - header: '未到就餐时间',  
322 - body: '到店就餐时,可提前买单' 323 + header: '商家未确认',
  324 + body: '确认后,到店消费可提前买单'
323 }).show(); 325 }).show();
324 }else{ 326 }else{
325 wx.navigateTo({ 327 wx.navigateTo({
@@ -88,8 +88,8 @@ @@ -88,8 +88,8 @@
88 <view class="share-but Regular">发邀请函</view> 88 <view class="share-but Regular">发邀请函</view>
89 </userinfo-share> 89 </userinfo-share>
90 </view> 90 </view>
91 - <block wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1 || detail.seller.isopen_md==1}}">  
92 - <view class="flex-lr share-view-cookbook" wx:if="{{checkout.status!=3}}"> 91 + <block wx:if="{{(detail.seller.is_open_order==1 || detail.seller.is_open_wine==1 || detail.seller.isopen_md==1) && hasLoadedCheckout}}">
  92 + <view class="flex-lr share-view-cookbook">
93 <userinfo wx:if="{{detail.seller.is_open_wine==1}}" 93 <userinfo wx:if="{{detail.seller.is_open_wine==1}}"
94 binduserinfo="wineGo" 94 binduserinfo="wineGo"
95 bindshare="share" 95 bindshare="share"