xt / xcx-book · Commits

Go to a project

Commit 2e3a13dd62fbff7a4d8efe286296a6fd71dd070a

Authored by vking
1 parent 71f3c88c
build: skipped

pay

Inline Side-by-side
Showing 2 changed files with 12 additions and 6 deletions
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <subscribe class="flex-lr share-view subscribe" ids="{{[0]}}"> 42 <subscribe class="flex-lr share-view subscribe" ids="{{[0]}}">
43 <view class="share-but">提醒我包间预订结果</view> 43 <view class="share-but">提醒我包间预订结果</view>
44 </subscribe> 44 </subscribe>
45 - <view class="flex-lr share-view-cookbook"> 45 + <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.isopen_md==1}}">
46 <userinfo 46 <userinfo
47 binduserinfo="checkout" 47 binduserinfo="checkout"
48 share="{{detail}}" 48 share="{{detail}}"
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
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 - <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}"> 91 + <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}}">
92 <userinfo wx:if="{{detail.seller.is_open_wine==1}}" 92 <userinfo wx:if="{{detail.seller.is_open_wine==1}}"
93 binduserinfo="wineGo" 93 binduserinfo="wineGo"
94 bindshare="share" 94 bindshare="share"
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 </view> 109 </view>
110 <view class="share-but Regular" wx:else="">提前点餐</view> 110 <view class="share-but Regular" wx:else="">提前点餐</view>
111 </userinfo> 111 </userinfo>
112 - <userinfo 112 + <userinfo wx:if="{{detail.seller.isopen_md==1 && checkout.status!=3}}"
113 binduserinfo="checkout" 113 binduserinfo="checkout"
114 share="{{detail}}" 114 share="{{detail}}"
115 share-act="invitation" 115 share-act="invitation"
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 <view class="flex-rr"> 167 <view class="flex-rr">
168 <view class="item" bindtap="callSeller">联系商家</view> 168 <view class="item" bindtap="callSeller">联系商家</view>
169 <navigator url="./cancel?id={{detail.id}}" 169 <navigator url="./cancel?id={{detail.id}}"
170 - wx:if="{{detail.hasRunning || detail.status==0}}" 170 + wx:if="{{(detail.hasRunning || detail.status==0) && checkout.status!=3}}"
171 hover-class="navigator-hover"> 171 hover-class="navigator-hover">
172 <view class="item" >取消预订</view> 172 <view class="item" >取消预订</view>
173 </navigator> 173 </navigator>
@@ -182,7 +182,9 @@ @@ -182,7 +182,9 @@
182 </view> 182 </view>
183 <view class="flex-lr" style="margin-top: 26rpx;"> 183 <view class="flex-lr" style="margin-top: 26rpx;">
184 <view></view> 184 <view></view>
185 - <view class="detail-info-right see-pics">查看消费详情</view> 185 + <navigator url="/pack-checkout/pages/index?sid={{detail.seller.id}}&rid={{detail.id}}">
  186 + <view class="detail-info-right see-pics">查看消费详情</view>
  187 + </navigator>
186 </view> 188 </view>
187 </view> 189 </view>
188 </block> 190 </block>
@@ -32,7 +32,11 @@ @@ -32,7 +32,11 @@
32 <!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>--> 32 <!--<view class="opt-button">{{detail.hasOwner?'邀请':'分享日程'}}</view>-->
33 <view class="opt-button">邀请同行好友</view> 33 <view class="opt-button">邀请同行好友</view>
34 </userinfo> 34 </userinfo>
35 - <navigator url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}"><view class="opt-button">提前买单</view></navigator> 35 + <navigator
  36 + wx:if="{{detail.bill_status!=3 && detail.seller.isopen_md==1}}"
  37 + url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}">
  38 + <view class="opt-button">提前买单</view>
  39 + </navigator>
36 </view> 40 </view>
37 <userinfo-share wx:else="{{}}" 41 <userinfo-share wx:else="{{}}"
38 id="userinfo-share-{{detail.id}}" 42 id="userinfo-share-{{detail.id}}"