xt / xcx-book · Commits

Go to a project

Commit 9e53bb33ac9c5df0ea82ebe1a034dea9a96b53cf

Authored by pengye
1 parent fc3f924d
build: skipped

订单列表、邀请函、商家详情判断是否开启在线预订，未开启不显示再次预订按钮2

Inline Side-by-side
Showing 16 changed files with 52 additions and 24 deletions
... ... @@ -219,7 +219,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -235,7 +235,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -437,8 +437,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -221,7 +221,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -237,7 +237,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -468,8 +468,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -204,7 +204,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -220,7 +220,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' && options.onlineReserve == '1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -457,8 +457,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -202,7 +202,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -218,7 +218,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -457,8 +457,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -262,7 +262,7 @@
</navigator>
</view>
</view>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -279,7 +279,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="all-button flex-lr sharewidth">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="all-button flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -559,8 +559,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips .text {
... ...
... ... @@ -217,7 +217,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -233,7 +233,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -448,8 +448,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -214,7 +214,7 @@
</navigator>
</view>
</block>
<view class="vips">
<view class="vips {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
点击了解更多会员优惠政策
</view>
... ... @@ -230,7 +230,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -457,8 +457,12 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding-bottom: 180rpx;
margin-top: 20rpx;
padding-bottom: 20rpx;
}
.introduceBottom{
padding-bottom: 180rpx;
}
.vips image {
... ...
... ... @@ -192,7 +192,7 @@
</view>
</view>
</view>
<view class="introduce introduceBottom">
<view class="introduce {{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)?'introduceBottom':''}}">
<block wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
<block wx:if="{{titleType}}">
<titleStyle titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
... ... @@ -236,7 +236,7 @@
{{toastText}}
</view>
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || (marketing.is_online_book=='1' && options.onlineReserve == '1') || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth">
<view wx:if="{{(marketing.is_online_book=='1' && options.onlineReserve == '1') || (detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0') || (detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc)}}" class="flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1' && options.onlineReserve == '1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
... ...
... ... @@ -104,7 +104,7 @@ Page({
sid
}).then(res => {
let is_online_reserve = res.data.is_online_reserve;
this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder, status,is_online_reserve);
this.getSellerTemplateConfFun(sid, isOrder, status,is_online_reserve);
}).catch(res => {
console.log(res, '商家详情请求失败');
})
... ...