Commit 2e3a13dd62fbff7a4d8efe286296a6fd71dd070a

Authored by vking
1 parent 71f3c88c

pay

... ... @@ -42,7 +42,7 @@
<subscribe class="flex-lr share-view subscribe" ids="{{[0]}}">
<view class="share-but">提醒我包间预订结果</view>
</subscribe>
<view class="flex-lr share-view-cookbook">
<view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.isopen_md==1}}">
<userinfo
binduserinfo="checkout"
share="{{detail}}"
... ... @@ -88,7 +88,7 @@
<view class="share-but Regular">发邀请函</view>
</userinfo-share>
</view>
<view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}">
<view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1 || detail.seller.isopen_md==1}}">
<userinfo wx:if="{{detail.seller.is_open_wine==1}}"
binduserinfo="wineGo"
bindshare="share"
... ... @@ -109,7 +109,7 @@
</view>
<view class="share-but Regular" wx:else="">提前点餐</view>
</userinfo>
<userinfo
<userinfo wx:if="{{detail.seller.isopen_md==1 && checkout.status!=3}}"
binduserinfo="checkout"
share="{{detail}}"
share-act="invitation"
... ... @@ -167,7 +167,7 @@
<view class="flex-rr">
<view class="item" bindtap="callSeller">联系商家</view>
<navigator url="./cancel?id={{detail.id}}"
wx:if="{{detail.hasRunning || detail.status==0}}"
wx:if="{{(detail.hasRunning || detail.status==0) && checkout.status!=3}}"
hover-class="navigator-hover">
<view class="item" >取消预订</view>
</navigator>
... ... @@ -182,7 +182,9 @@
</view>
<view class="flex-lr" style="margin-top: 26rpx;">
<view></view>
<view class="detail-info-right see-pics">查看消费详情</view>
<navigator url="/pack-checkout/pages/index?sid={{detail.seller.id}}&rid={{detail.id}}">
<view class="detail-info-right see-pics">查看消费详情</view>
</navigator>
</view>
</view>
</block>
... ...
... ... @@ -32,7 +32,11 @@
<!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
<view class="opt-button">邀请同行好友</view>
</userinfo>
<navigator url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}"><view class="opt-button">提前买单</view></navigator>
<navigator
wx:if="{{detail.bill_status!=3 && detail.seller.isopen_md==1}}"
url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}">
<view class="opt-button">提前买单</view>
</navigator>
</view>
<userinfo-share wx:else="{{}}"
id="userinfo-share-{{detail.id}}"
... ...