xt / xcx-book · Commits

Go to a project

Commit b20ff4d563afa3c0e5179d404128db23a4e39e81

Authored by pengye
1 parent bb8178ac
build: skipped

邀请函过了当前餐段的结束时间，标记已结束、已取消订单标记已取消、已结束已取消标记已取消

Inline Side-by-side
Showing 17 changed files with 161 additions and 26 deletions
... ... @@ -9,6 +9,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="positioningBox">
<view class="positioning">
<text class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
... ... @@ -174,7 +176,7 @@
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -231,7 +233,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -909,4 +909,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -9,6 +9,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo">
<view class="titleImg">
<image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
... ... @@ -176,7 +178,7 @@
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -233,7 +235,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -940,4 +940,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo">
<image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
<image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
... ... @@ -159,7 +161,7 @@
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -216,7 +218,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -982,4 +982,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo">
<image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
<image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
... ... @@ -157,7 +159,7 @@
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -214,7 +216,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -981,4 +981,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -9,6 +9,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="titleImg">
<image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image>
<view class="title">{{seller.name?seller.name:reserve.seller_name}}</view>
... ... @@ -215,7 +217,7 @@
</view>
</view>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="rubric">
提前点餐
</view>
... ... @@ -277,6 +279,6 @@
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="all-button flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
\ No newline at end of file
... ...
... ... @@ -827,4 +827,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -9,6 +9,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo">
<view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
... ... @@ -172,7 +174,7 @@
<image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -229,7 +231,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -975,4 +975,24 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
.cannotImg{
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -9,6 +9,8 @@
bindtap="stopMusic"
animation="{{attentionAnim}}"
/>
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo">
<view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
<image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}"
... ... @@ -169,7 +171,7 @@
<image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
</block>
</view>
<view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view wx:if="{{titleType}}" class="chefText font36r">
<titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</view>
... ... @@ -226,7 +228,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -994,4 +994,14 @@
z-index: 999;
top: 50%;
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
\ No newline at end of file
... ...
... ... @@ -3,6 +3,8 @@
<nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav>
<scroll-view scroll-y class="viewBox viewBox{{StyleType}}">
<image wx:if="{{hasValueBroadcast && reserve && reserve.swich_voice && reserve.swich_voice=='1'}}" class="musicImg" src="{{isPlay=='1'?'https://qn.colorcun.com/open.svg':'https://qn.colorcun.com/close.svg'}}" bindtap="stopMusic" animation="{{attentionAnim}}" />
<image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
<image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
<view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">
<view class="infoTop">
<view class="infoTopName">
... ... @@ -173,7 +175,7 @@
<image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
</block>
</view>
<view class="introduce" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<view class="introduce" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
<block wx:if="{{titleType}}">
<titleStyle titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
</block>
... ... @@ -232,7 +234,7 @@
</scroll-view>
<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth">
<view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
<view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
<button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
<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>
</view>
<painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
\ No newline at end of file
... ...
... ... @@ -628,6 +628,16 @@
transform: translate(-50%, -50%);
}
.cannotImg {
width: 200rpx;
height: 66rpx;
transform: rotate(-45deg);
position: fixed;
left: 38%;
z-index: 999;
top: 50%;
}
.separatrixOne {
display: flex;
justify-content: space-between;
... ...
... ... @@ -71,13 +71,41 @@ Page({
openid: getApp().openid,
rid: this.data.options.id
}).then(res => {
this.getSellerTemplateConfFun(RS.reserve(res.data).sid);
let reserev = RS.reserve(res.data)
let daily = reserev.seller.daily;
let time;
switch (reserev.ddate_solt) {
case '1':
time = daily.morning.split("-")[1];
break;
case '2':
time = daily.noon.split("-")[1];
break;
case '3':
time = daily.night.split("-")[1];
break;
}
let timeHour = time.split(":")[0]; //预订日期--预订餐段的截止时间--小时
let timeMinute = time.split(":")[1]; //预订日期--预订餐段的截止时间--分钟
const date = new Date(reserev.ddate * 1000);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder);
}).catch(res => {
console.log(res, '详情请求失败');
})
},
// 判断是否超过该预订的餐段截止时间 为1 代表超过了
isCurrentTimeGreaterThan(year, month, day, hour, minute) {
const currentTime = new Date();
const targetTime = new Date(year, month - 1, day, hour, minute);
let isorder = currentTime > targetTime ? '1' : '0';
return isorder;
},
// 获取商家设置营销信息
getSellerTemplateConfFun(sid) {
getSellerTemplateConfFun(sid, isOrder) {
App.Seller.GetSellerTemplateConf({
sid
}).then(res => {
... ... @@ -91,6 +119,7 @@ Page({
url = '/pages/customer/detail_owner_invitation9';
}
url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid;
url += isOrder == '1' ? '&isOrder=1' : '';
url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
console.log('跳转路径url', url);
wx.redirectTo({
... ...