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 @@ @@ -9,6 +9,8 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  13 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="positioningBox"> 14 <view class="positioningBox">
13 <view class="positioning"> 15 <view class="positioning">
14 <text class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text> 16 <text class="sloganBox font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
@@ -174,7 +176,7 @@ @@ -174,7 +176,7 @@
174 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 176 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
175 </block> 177 </block>
176 </view> 178 </view>
177 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 179 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
178 <view wx:if="{{titleType}}" class="chefText font36r"> 180 <view wx:if="{{titleType}}" class="chefText font36r">
179 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 181 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
180 </view> 182 </view>
@@ -231,7 +233,7 @@ @@ -231,7 +233,7 @@
231 </scroll-view> 233 </scroll-view>
232 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 234 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
233 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 235 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
234 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
235 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 236 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  237 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
236 </view> 238 </view>
237 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 239 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -909,4 +909,14 @@ @@ -909,4 +909,14 @@
909 z-index: 999; 909 z-index: 999;
910 top: 50%; 910 top: 50%;
911 transform: translate(-50%, -50%); 911 transform: translate(-50%, -50%);
  912 +}
  913 +
  914 +.cannotImg {
  915 + width: 200rpx;
  916 + height: 66rpx;
  917 + transform: rotate(-45deg);
  918 + position: fixed;
  919 + left: 38%;
  920 + z-index: 999;
  921 + top: 50%;
912 } 922 }
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  13 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="reservationInfo"> 14 <view class="reservationInfo">
13 <view class="titleImg"> 15 <view class="titleImg">
14 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" /> 16 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
@@ -176,7 +178,7 @@ @@ -176,7 +178,7 @@
176 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 178 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
177 </block> 179 </block>
178 </view> 180 </view>
179 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 181 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
180 <view wx:if="{{titleType}}" class="chefText font36r"> 182 <view wx:if="{{titleType}}" class="chefText font36r">
181 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 183 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
182 </view> 184 </view>
@@ -233,7 +235,7 @@ @@ -233,7 +235,7 @@
233 </scroll-view> 235 </scroll-view>
234 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 236 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
235 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 237 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
236 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
237 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 238 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  239 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
238 </view> 240 </view>
239 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 241 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -940,4 +940,14 @@ @@ -940,4 +940,14 @@
940 z-index: 999; 940 z-index: 999;
941 top: 50%; 941 top: 50%;
942 transform: translate(-50%, -50%); 942 transform: translate(-50%, -50%);
  943 +}
  944 +
  945 +.cannotImg {
  946 + width: 200rpx;
  947 + height: 66rpx;
  948 + transform: rotate(-45deg);
  949 + position: fixed;
  950 + left: 38%;
  951 + z-index: 999;
  952 + top: 50%;
943 } 953 }
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
8 bindtap="stopMusic" 8 bindtap="stopMusic"
9 animation="{{attentionAnim}}" 9 animation="{{attentionAnim}}"
10 /> 10 />
  11 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  12 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
11 <view class="reservationInfo"> 13 <view class="reservationInfo">
12 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" /> 14 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
13 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" /> 15 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
@@ -159,7 +161,7 @@ @@ -159,7 +161,7 @@
159 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 161 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
160 </block> 162 </block>
161 </view> 163 </view>
162 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 164 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
163 <view wx:if="{{titleType}}" class="chefText font36r"> 165 <view wx:if="{{titleType}}" class="chefText font36r">
164 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 166 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
165 </view> 167 </view>
@@ -216,7 +218,7 @@ @@ -216,7 +218,7 @@
216 </scroll-view> 218 </scroll-view>
217 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 219 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
218 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 220 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
219 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
220 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 221 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  222 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
221 </view> 223 </view>
222 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 224 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -982,4 +982,14 @@ @@ -982,4 +982,14 @@
982 z-index: 999; 982 z-index: 999;
983 top: 50%; 983 top: 50%;
984 transform: translate(-50%, -50%); 984 transform: translate(-50%, -50%);
  985 +}
  986 +
  987 +.cannotImg {
  988 + width: 200rpx;
  989 + height: 66rpx;
  990 + transform: rotate(-45deg);
  991 + position: fixed;
  992 + left: 38%;
  993 + z-index: 999;
  994 + top: 50%;
985 } 995 }
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
8 bindtap="stopMusic" 8 bindtap="stopMusic"
9 animation="{{attentionAnim}}" 9 animation="{{attentionAnim}}"
10 /> 10 />
  11 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  12 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
11 <view class="reservationInfo"> 13 <view class="reservationInfo">
12 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" /> 14 <image wx:if="{{themeColor == 'turmeric' || themeColor == 'golden'}}" src="https://qn.colorcun.com/whiteBj1.png" class="titleIcon" />
13 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" /> 15 <image wx:elif="{{themeColor == 'pearlWhite'}}" src="https://nosqn.colorcun.com/whiteBj3.png" class="titleIcon" />
@@ -157,7 +159,7 @@ @@ -157,7 +159,7 @@
157 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 159 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
158 </block> 160 </block>
159 </view> 161 </view>
160 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 162 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
161 <view wx:if="{{titleType}}" class="chefText font36r"> 163 <view wx:if="{{titleType}}" class="chefText font36r">
162 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 164 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
163 </view> 165 </view>
@@ -214,7 +216,7 @@ @@ -214,7 +216,7 @@
214 </scroll-view> 216 </scroll-view>
215 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 217 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
216 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 218 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
217 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
218 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 219 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  220 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
219 </view> 221 </view>
220 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 222 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -981,4 +981,14 @@ @@ -981,4 +981,14 @@
981 z-index: 999; 981 z-index: 999;
982 top: 50%; 982 top: 50%;
983 transform: translate(-50%, -50%); 983 transform: translate(-50%, -50%);
  984 +}
  985 +
  986 +.cannotImg {
  987 + width: 200rpx;
  988 + height: 66rpx;
  989 + transform: rotate(-45deg);
  990 + position: fixed;
  991 + left: 38%;
  992 + z-index: 999;
  993 + top: 50%;
984 } 994 }
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  13 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="titleImg"> 14 <view class="titleImg">
13 <image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image> 15 <image src="{{whiteBj?'https://qn.colorcun.com/whiteBj1.png':'https://qn.colorcun.com/leaf.png'}}" class="titleIcon"></image>
14 <view class="title">{{seller.name?seller.name:reserve.seller_name}}</view> 16 <view class="title">{{seller.name?seller.name:reserve.seller_name}}</view>
@@ -215,7 +217,7 @@ @@ -215,7 +217,7 @@
215 </view> 217 </view>
216 </view> 218 </view>
217 </view> 219 </view>
218 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 220 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
219 <view class="rubric"> 221 <view class="rubric">
220 提前点餐 222 提前点餐
221 </view> 223 </view>
@@ -277,6 +279,6 @@ @@ -277,6 +279,6 @@
277 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 279 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
278 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="all-button flex-lr sharewidth"> 280 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="all-button flex-lr sharewidth">
279 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 281 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
280 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
281 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 282 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  283 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
282 </view> 284 </view>
@@ -827,4 +827,14 @@ @@ -827,4 +827,14 @@
827 z-index: 999; 827 z-index: 999;
828 top: 50%; 828 top: 50%;
829 transform: translate(-50%, -50%); 829 transform: translate(-50%, -50%);
  830 +}
  831 +
  832 +.cannotImg {
  833 + width: 200rpx;
  834 + height: 66rpx;
  835 + transform: rotate(-45deg);
  836 + position: fixed;
  837 + left: 38%;
  838 + z-index: 999;
  839 + top: 50%;
830 } 840 }
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  13 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="reservationInfo"> 14 <view class="reservationInfo">
13 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}"> 15 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
14 <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> 16 <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 @@ @@ -172,7 +174,7 @@
172 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/> 174 <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
173 </block> 175 </block>
174 </view> 176 </view>
175 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 177 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
176 <view wx:if="{{titleType}}" class="chefText font36r"> 178 <view wx:if="{{titleType}}" class="chefText font36r">
177 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 179 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
178 </view> 180 </view>
@@ -229,7 +231,7 @@ @@ -229,7 +231,7 @@
229 </scroll-view> 231 </scroll-view>
230 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 232 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
231 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 233 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
232 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
233 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 234 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  235 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
234 </view> 236 </view>
235 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 237 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -975,4 +975,24 @@ @@ -975,4 +975,24 @@
975 z-index: 999; 975 z-index: 999;
976 top: 50%; 976 top: 50%;
977 transform: translate(-50%, -50%); 977 transform: translate(-50%, -50%);
  978 +}
  979 +
  980 +.cannotImg {
  981 + width: 200rpx;
  982 + height: 66rpx;
  983 + transform: rotate(-45deg);
  984 + position: fixed;
  985 + left: 38%;
  986 + z-index: 999;
  987 + top: 50%;
  988 +}
  989 +
  990 +.cannotImg{
  991 + width: 200rpx;
  992 + height: 66rpx;
  993 + transform: rotate(-45deg);
  994 + position: fixed;
  995 + left: 38%;
  996 + z-index: 999;
  997 + top: 50%;
978 } 998 }
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  13 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="reservationInfo"> 14 <view class="reservationInfo">
13 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}"> 15 <view class="imgBox" wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}">
14 <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}" 16 <image wx:if="{{home.image && (!home.id_first_image || home.id_first_image!='0')}}" src="{{home.image}}"
@@ -169,7 +171,7 @@ @@ -169,7 +171,7 @@
169 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" /> 171 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
170 </block> 172 </block>
171 </view> 173 </view>
172 - <view class="specialServices" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 174 + <view class="specialServices" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
173 <view wx:if="{{titleType}}" class="chefText font36r"> 175 <view wx:if="{{titleType}}" class="chefText font36r">
174 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 176 <titleStyle isWhite="{{themeColor}}" titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
175 </view> 177 </view>
@@ -226,7 +228,7 @@ @@ -226,7 +228,7 @@
226 </scroll-view> 228 </scroll-view>
227 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}"> 229 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth {{themeColor}}">
228 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 230 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
229 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
230 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 231 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  232 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
231 </view> 233 </view>
232 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 234 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -994,4 +994,14 @@ @@ -994,4 +994,14 @@
994 z-index: 999; 994 z-index: 999;
995 top: 50%; 995 top: 50%;
996 transform: translate(-50%, -50%); 996 transform: translate(-50%, -50%);
  997 +}
  998 +
  999 +.cannotImg {
  1000 + width: 200rpx;
  1001 + height: 66rpx;
  1002 + transform: rotate(-45deg);
  1003 + position: fixed;
  1004 + left: 38%;
  1005 + z-index: 999;
  1006 + top: 50%;
997 } 1007 }
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav> 3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav>
4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}"> 4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}">
5 <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}}" /> 5 <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}}" />
  6 + <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
  7 + <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
6 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;"> 8 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">
7 <view class="infoTop"> 9 <view class="infoTop">
8 <view class="infoTopName"> 10 <view class="infoTopName">
@@ -173,7 +175,7 @@ @@ -173,7 +175,7 @@
173 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" /> 175 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
174 </block> 176 </block>
175 </view> 177 </view>
176 - <view class="introduce" wx:if="{{hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}"> 178 + <view class="introduce" wx:if="{{detail.status !='4' && options.isOrder != '1' && hasValueOrder && detail && detail.seller.is_open_order==1 && marketing && marketing.is_order=='1'}}">
177 <block wx:if="{{titleType}}"> 179 <block wx:if="{{titleType}}">
178 <titleStyle titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle> 180 <titleStyle titleStyleType="{{titleType}}" titleText="提前点餐"></titleStyle>
179 </block> 181 </block>
@@ -232,7 +234,7 @@ @@ -232,7 +234,7 @@
232 </scroll-view> 234 </scroll-view>
233 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth"> 235 <view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (paymentId && paymentStatus == '0')}}" class="flex-lr sharewidth">
234 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view> 236 <view wx:if="{{marketing.is_online_book=='1'}}" class="flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订</view>
235 - <view wx:if="{{paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>  
236 - <button wx:if="{{marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button> 237 + <view wx:if="{{detail.status !='4' && options.isOrder != '1' && paymentId && paymentStatus == '0'}}" class="flex-cc font30r paymenBtn" bindtap="paymentFun">支付定金</view>
  238 + <button wx:if="{{detail.status !='4' && options.isOrder != '1' && marketing.is_transpond=='1' && imgSrc}}" class="flex-cc font30r shareItem" open-type="share">转发给客人</button>
237 </view> 239 </view>
238 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" /> 240 <painter palette="{{wxml}}" style="position: absolute; top: -9999rpx;" bind:imgOK="onImgOK" />
@@ -628,6 +628,16 @@ @@ -628,6 +628,16 @@
628 transform: translate(-50%, -50%); 628 transform: translate(-50%, -50%);
629 } 629 }
630 630
  631 +.cannotImg {
  632 + width: 200rpx;
  633 + height: 66rpx;
  634 + transform: rotate(-45deg);
  635 + position: fixed;
  636 + left: 38%;
  637 + z-index: 999;
  638 + top: 50%;
  639 +}
  640 +
631 .separatrixOne { 641 .separatrixOne {
632 display: flex; 642 display: flex;
633 justify-content: space-between; 643 justify-content: space-between;
@@ -71,13 +71,41 @@ Page({ @@ -71,13 +71,41 @@ Page({
71 openid: getApp().openid, 71 openid: getApp().openid,
72 rid: this.data.options.id 72 rid: this.data.options.id
73 }).then(res => { 73 }).then(res => {
74 - this.getSellerTemplateConfFun(RS.reserve(res.data).sid); 74 + let reserev = RS.reserve(res.data)
  75 + let daily = reserev.seller.daily;
  76 + let time;
  77 + switch (reserev.ddate_solt) {
  78 + case '1':
  79 + time = daily.morning.split("-")[1];
  80 + break;
  81 + case '2':
  82 + time = daily.noon.split("-")[1];
  83 + break;
  84 + case '3':
  85 + time = daily.night.split("-")[1];
  86 + break;
  87 + }
  88 + let timeHour = time.split(":")[0]; //预订日期--预订餐段的截止时间--小时
  89 + let timeMinute = time.split(":")[1]; //预订日期--预订餐段的截止时间--分钟
  90 + const date = new Date(reserev.ddate * 1000);
  91 + const year = date.getFullYear();
  92 + const month = date.getMonth() + 1;
  93 + const day = date.getDate();
  94 + let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
  95 + this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder);
75 }).catch(res => { 96 }).catch(res => {
76 console.log(res, '详情请求失败'); 97 console.log(res, '详情请求失败');
77 }) 98 })
78 }, 99 },
  100 + // 判断是否超过该预订的餐段截止时间 为1 代表超过了
  101 + isCurrentTimeGreaterThan(year, month, day, hour, minute) {
  102 + const currentTime = new Date();
  103 + const targetTime = new Date(year, month - 1, day, hour, minute);
  104 + let isorder = currentTime > targetTime ? '1' : '0';
  105 + return isorder;
  106 + },
79 // 获取商家设置营销信息 107 // 获取商家设置营销信息
80 - getSellerTemplateConfFun(sid) { 108 + getSellerTemplateConfFun(sid, isOrder) {
81 App.Seller.GetSellerTemplateConf({ 109 App.Seller.GetSellerTemplateConf({
82 sid 110 sid
83 }).then(res => { 111 }).then(res => {
@@ -91,6 +119,7 @@ Page({ @@ -91,6 +119,7 @@ Page({
91 url = '/pages/customer/detail_owner_invitation9'; 119 url = '/pages/customer/detail_owner_invitation9';
92 } 120 }
93 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid; 121 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid;
  122 + url += isOrder == '1' ? '&isOrder=1' : '';
94 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; 123 url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
95 console.log('跳转路径url', url); 124 console.log('跳转路径url', url);
96 wx.redirectTo({ 125 wx.redirectTo({