Commit 48b4e4570763bf4651cb65a257bf2b12cf3fa1cb

Authored by pengye
1 parent 7145729a

邀请函商务宴请第一版、婚宴第一版

@@ -909,14 +909,19 @@ Page({ @@ -909,14 +909,19 @@ Page({
909 let couponData = res.data[0] 909 let couponData = res.data[0]
910 couponData.use = couponData.use ? util.determine(couponData.use) : ''; 910 couponData.use = couponData.use ? util.determine(couponData.use) : '';
911 couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : ''; 911 couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';
  912 + if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {
  913 + let cash = couponData.use.cash * 1;
  914 + let price = couponData.price * 1;
  915 + couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  916 + }
912 // showCoupon 代表赠送的券没过有效期 && 是开启状态 917 // showCoupon 代表赠送的券没过有效期 && 是开启状态
913 couponData.showCoupon = (this.data.dataStr < (couponData.etime * 1) && couponData.is_open == '1') ? '1' : '0'; 918 couponData.showCoupon = (this.data.dataStr < (couponData.etime * 1) && couponData.is_open == '1') ? '1' : '0';
914 console.log('邀请函--------------------评价赠送的优惠券', couponData); 919 console.log('邀请函--------------------评价赠送的优惠券', couponData);
915 let entry = this.data.titleList 920 let entry = this.data.titleList
916 - if (!this.data.is_user_comments && this.data.isComments == '1' && couponData.showCoupon == '1') { 921 + if ((!this.data.is_user_comments && this.data.isComments == '1' && couponData.showCoupon == '1') || (this.data.is_comments == '1' && (this.data.marketing.is_comments_coupon != '1' || couponData.showCoupon != '1'))) {
917 entry.push({ 922 entry.push({
918 id: 3, 923 id: 3,
919 - title: '意见反馈有礼' 924 + title: '评价反馈'
920 }) 925 })
921 if (entry.length > 0) { 926 if (entry.length > 0) {
922 entry.sort((a, b) => a.id - b.id); 927 entry.sort((a, b) => a.id - b.id);
@@ -942,6 +947,11 @@ Page({ @@ -942,6 +947,11 @@ Page({
942 detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : ''; 947 detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
943 detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : ''; 948 detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
944 detail.use = detail.use ? util.determine(detail.use) : ''; 949 detail.use = detail.use ? util.determine(detail.use) : '';
  950 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  951 + let cash = detail.use.cash * 1;
  952 + let price = detail.price * 1;
  953 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  954 + }
945 detail.stimeStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD HH:II') 955 detail.stimeStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD HH:II')
946 detail.etimeStr = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II') 956 detail.etimeStr = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II')
947 coupon_dataList.push(detail); 957 coupon_dataList.push(detail);
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <view class="contentData font28r">{{seller.addr || reserve.seller.map_address}}</view> 72 <view class="contentData font28r">{{seller.addr || reserve.seller.map_address}}</view>
73 <view class="positioning" bindtap="looklocation"> 73 <view class="positioning" bindtap="looklocation">
74 <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" /> 74 <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" />
75 - 导航到店 75 + {{bookType == '1' ? '导航' : '导航到店'}}
76 </view> 76 </view>
77 </view> 77 </view>
78 </view> 78 </view>
@@ -109,28 +109,41 @@ @@ -109,28 +109,41 @@
109 <view wx:for="{{titleList}}" wx:key="index" wx:for-index="index" bindtap="checkTitleFun" data-type="{{item.id}}" class="titleItem {{activeTitle==item.id?'activeTitleItem':''}}">{{item.title}}</view> 109 <view wx:for="{{titleList}}" wx:key="index" wx:for-index="index" bindtap="checkTitleFun" data-type="{{item.id}}" class="titleItem {{activeTitle==item.id?'activeTitleItem':''}}">{{item.title}}</view>
110 </view> 110 </view>
111 <!-- 优惠券 --> 111 <!-- 优惠券 -->
112 - <view class="regionItem" wx:if="{{activeTitle == '1'}}"> 112 + <view class="regionItem couponBox" wx:if="{{activeTitle == '1'}}">
113 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 113 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
114 <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 114 <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
115 <view class="preferentialItems"> 115 <view class="preferentialItems">
116 - <view class="certificateInfo">  
117 - <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text>  
118 - <view class="ticketName font36r">{{item.aname}}</view>  
119 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?','+item.desc+'。':'。'}}</text>  
120 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">  
121 - 无限制{{item.desc?','+item.desc+'。':'。'}}  
122 - </view>  
123 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">  
124 - 会员生日当天可用{{item.desc?','+item.desc+'。':'。'}} 116 + <view class="purchase">
  117 + <view class="priceText" wx:if="{{item.price}}">
  118 + <view class="icons">¥<text class="priceText">{{item.price}}</text></view>
125 </view> 119 </view>
  120 + <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />
  121 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>
126 </view> 122 </view>
127 - <view class="purchase font40r">  
128 - <view class="priceText" wx:if="{{item.price}}">  
129 - <view class="icons font24r">¥</view>{{item.price}} 123 + <view class="certificateInfo">
  124 + <view class="preferentialDetails">
  125 + <view class="information">
  126 + <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text>
  127 + <text class="ticketName font24r">{{item.aname}}</text>
  128 + </view>
  129 + <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}</text>
  130 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">
  131 + 无限制
  132 + </view>
  133 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">
  134 + 会员生日当天可用
  135 + </view>
  136 + <view wx:if="{{item.desc}}" class="showDesc">
  137 + <text class="font24r">消费要求</text>
  138 + <image src="https://qn.colorcun.com/invitation10Sicon.png" mode="" />
  139 + </view>
  140 + </view>
  141 + <view class="limitationBtn">
  142 + <view class="font24r couponBtn">立即抢购</view>
130 </view> 143 </view>
131 - <view class="font24r couponBtn">立即购买</view>  
132 </view> 144 </view>
133 </view> 145 </view>
  146 + <view wx:if="{{item.desc}}" class="bottomLimitation font24r"><text></text>{{item.desc}}</view>
134 </navigator> 147 </navigator>
135 </block> 148 </block>
136 </view> 149 </view>
@@ -167,38 +180,63 @@ @@ -167,38 +180,63 @@
167 </view> 180 </view>
168 </view> 181 </view>
169 <!-- 评价券 --> 182 <!-- 评价券 -->
170 - <view class="regionItem certificateBox" wx:if="{{activeTitle == '3'}}">  
171 - <view class="limitationTitle font28r">期待您的声音,帮助我们持续改进</view>  
172 - <view class="preferentialItems" bindtap="evaluateFun">  
173 - <view class="certificateInfo">  
174 - <text class="discountText font20r">反馈有礼</text>  
175 - <view class="ticketName font36r">{{couponData.aname}}</view>  
176 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="limitation font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?','+couponData.desc+'。':'。'}}</text>  
177 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">  
178 - 无限制{{couponData.desc?','+couponData.desc+'。':'。'}} 183 + <view class="regionItem certificateBox couponBox" wx:if="{{activeTitle == '3' && !is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
  184 + <view class="font28r evaluateTitleText">期待您的声音,帮助我们持续改进</view>
  185 + <view class="couponInfo" bindtap="evaluateFun">
  186 + <view class="preferentialItems">
  187 + <view class="purchase">
  188 + <view class="priceText" wx:if="{{couponData.price}}">
  189 + <view class="icons">¥<text class="priceText">{{couponData.price}}</text></view>
  190 + </view>
  191 + <image class="certificateImg" src="{{(couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />
  192 + <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountInfo">{{couponData.discount}}折</text>
179 </view> 193 </view>
180 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">  
181 - 会员生日当天可用{{couponData.desc?','+couponData.desc+'。':'。'}} 194 + <view class="certificateInfo">
  195 + <view class="preferentialDetails">
  196 + <view class="information">
  197 + <text class="discountText font20r">{{couponData.use.is_cash=='1'?'代金券':couponData.use.is_discount=='1'?'超值折扣':couponData.use.is_dish=='1'?'特惠菜品':''}}</text>
  198 + <text class="ticketName font24r">{{couponData.aname}}</text>
  199 + </view>
  200 + <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="limitation font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}</text>
  201 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">
  202 + 无限制
  203 + </view>
  204 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">
  205 + 会员生日当天可用
  206 + </view>
  207 + <view wx:if="{{couponData.desc}}" class="showDesc">
  208 + <text class="font24r">消费要求</text>
  209 + <image src="https://qn.colorcun.com/invitation10Sicon.png" mode="" />
  210 + </view>
  211 + </view>
  212 + <view class="limitationBtn">
  213 + <view class="font24r couponBtn">立即领取</view>
  214 + </view>
182 </view> 215 </view>
183 </view> 216 </view>
184 - <view class="purchase font40r">  
185 - <view class="priceText" wx:if="{{couponData.price}}">  
186 - <view class="icons font40r">¥</view>{{couponData.price}}  
187 - </view>  
188 - <view class="font24r couponBtn">{{couponData.price=='0'?'免费领取':'立即领取'}}</view> 217 + <view wx:if="{{couponData.desc}}" class="bottomLimitation font24r"><text></text>{{couponData.desc}}</view>
  218 + </view>
  219 + </view>
  220 + <view class="regionItem evaluateCoupon" wx:if="{{activeTitle == '3' && is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}">
  221 + <view class="preferentialItems" bindtap="evaluateFun">
  222 + <image class="evaluateImg" src="{{bookType == '1' ? 'https://qn.colorcun.com/invitation10Union.png' : 'https://qn.colorcun.com/invitation12Icon1-2.png'}}" mode="" />
  223 + <view class="evaluateText">
  224 + <text>期待您的声音</text>
  225 + <text>帮助我们持续改进</text>
189 </view> 226 </view>
  227 + <view class="font24r couponBtn">去评价</view>
190 </view> 228 </view>
191 </view> 229 </view>
192 - </view>  
193 - <view wx:if="{{bookType == '2' && roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">  
194 - <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="previewImage" data-url="{{item.url}}">  
195 - <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>  
196 - <text>{{item.name}}</text> 230 + <view wx:if="{{bookType == '2' && roomimage && roomimage.length>0}}" class="{{roomimage.length=='1'?'pageSpacing':'pageSpacing1'}}">
  231 + <view wx:for="{{roomimage}}" class="imgs" wx:key="index" bindtap="previewImage" data-url="{{item.url}}">
  232 + <image class="imageStyle" mode="aspectFill" src="{{item.url}}"></image>
  233 + <text>{{item.name}}</text>
  234 + </view>
197 </view> 235 </view>
198 </view> 236 </view>
199 <block wx:if="{{bookType == '1'}}"> 237 <block wx:if="{{bookType == '1'}}">
200 <!-- 停车指引 --> 238 <!-- 停车指引 -->
201 - <view class="publicModule" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}"> 239 + <view class="publicModules" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}">
202 <view class="chefText font36r"> 240 <view class="chefText font36r">
203 <view class="line"></view> 241 <view class="line"></view>
204 <view class="font36r chefTextInfo">停车指引</view> 242 <view class="font36r chefTextInfo">停车指引</view>
@@ -215,7 +253,7 @@ @@ -215,7 +253,7 @@
215 </swiper> 253 </swiper>
216 </view> 254 </view>
217 <!-- 招牌菜品 --> 255 <!-- 招牌菜品 -->
218 - <view class="publicModule" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0 || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}"> 256 + <view class="publicModules" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0 || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}">
219 <view class="chefText font36r"> 257 <view class="chefText font36r">
220 <view class="line"></view> 258 <view class="line"></view>
221 <view class="font36r chefTextInfo">招牌菜品</view> 259 <view class="font36r chefTextInfo">招牌菜品</view>
@@ -238,7 +276,7 @@ @@ -238,7 +276,7 @@
238 </view> 276 </view>
239 </view> 277 </view>
240 <!-- 餐厅介绍 --> 278 <!-- 餐厅介绍 -->
241 - <view class="publicModule" wx:if="{{store && (store.textInfo || store.videoImgsInfo.length>0)}}"> 279 + <view class="publicModules" wx:if="{{store && (store.textInfo || store.videoImgsInfo.length>0)}}">
242 <view class="chefText font36r"> 280 <view class="chefText font36r">
243 <view class="line"></view> 281 <view class="line"></view>
244 <view class="font36r chefTextInfo">餐厅介绍</view> 282 <view class="font36r chefTextInfo">餐厅介绍</view>
@@ -255,7 +293,7 @@ @@ -255,7 +293,7 @@
255 </swiper> 293 </swiper>
256 </view> 294 </view>
257 <!-- 主厨介绍 --> 295 <!-- 主厨介绍 -->
258 - <view class="publicModule" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}"> 296 + <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}">
259 <view class="chefText font36r"> 297 <view class="chefText font36r">
260 <view class="line"></view> 298 <view class="line"></view>
261 <view class="font36r chefTextInfo">主厨介绍</view> 299 <view class="font36r chefTextInfo">主厨介绍</view>
@@ -274,7 +312,7 @@ @@ -274,7 +312,7 @@
274 </block> 312 </block>
275 <block wx:if="{{bookType == '2'}}"> 313 <block wx:if="{{bookType == '2'}}">
276 <!-- 餐厅介绍 --> 314 <!-- 餐厅介绍 -->
277 - <view class="publicModule" id="module1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.videoImgsInfo.length>0)}}"> 315 + <view class="publicModules" id="module1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.videoImgsInfo.length>0)}}">
278 <view class="titleBox"> 316 <view class="titleBox">
279 <view class="titleLine"></view> 317 <view class="titleLine"></view>
280 <view class="font32">餐厅介绍</view> 318 <view class="font32">餐厅介绍</view>
@@ -300,7 +338,7 @@ @@ -300,7 +338,7 @@
300 </view> 338 </view>
301 </view> 339 </view>
302 <!-- 招牌菜品 --> 340 <!-- 招牌菜品 -->
303 - <view class="publicModule" id="module2" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0)}}"> 341 + <view class="publicModules publicModules1" id="module2" wx:if="{{(signboard && signboard.textInfo || signboard.videoImgsInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}">
304 <view class="titleBox"> 342 <view class="titleBox">
305 <view class="titleLine"></view> 343 <view class="titleLine"></view>
306 <view class="font32">招牌菜品</view> 344 <view class="font32">招牌菜品</view>
@@ -317,9 +355,15 @@ @@ -317,9 +355,15 @@
317 </view> 355 </view>
318 </block> 356 </block>
319 </view> 357 </view>
  358 + <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
  359 + <view class="font32r">提前点餐 到店不用等</view>
  360 + <view bindtap="cookbook" class="font28r cook" style="position: relative;">
  361 + 去点餐
  362 + </view>
  363 + </view>
320 </view> 364 </view>
321 <!-- 停车指引 --> 365 <!-- 停车指引 -->
322 - <view class="publicModule" id="module3" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}"> 366 + <view class="publicModules" id="module3" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}">
323 <view class="titleBox"> 367 <view class="titleBox">
324 <view class="titleLine"></view> 368 <view class="titleLine"></view>
325 <view class="font32">停车指引</view> 369 <view class="font32">停车指引</view>
@@ -341,7 +385,7 @@ @@ -341,7 +385,7 @@
341 </view> 385 </view>
342 </view> 386 </view>
343 <!-- 主厨介绍 --> 387 <!-- 主厨介绍 -->
344 - <view class="publicModule" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}"> 388 + <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}">
345 <view class="titleBox"> 389 <view class="titleBox">
346 <view class="titleLine"></view> 390 <view class="titleLine"></view>
347 <view class="font32">主厨介绍</view> 391 <view class="font32">主厨介绍</view>
@@ -200,6 +200,8 @@ @@ -200,6 +200,8 @@
200 justify-content: space-evenly; 200 justify-content: space-evenly;
201 width: 100%; 201 width: 100%;
202 padding: 40rpx 0 32rpx 0; 202 padding: 40rpx 0 32rpx 0;
  203 + background: #fff;
  204 + border-radius: 20rpx 20rpx 0 0;
203 } 205 }
204 206
205 .titleItem { 207 .titleItem {
@@ -230,11 +232,17 @@ @@ -230,11 +232,17 @@
230 232
231 .publicModule { 233 .publicModule {
232 margin: 20rpx; 234 margin: 20rpx;
  235 + padding: 0;
  236 + background: #fff;
  237 + border-radius: 20rpx;
  238 +}
  239 +
  240 +.publicModules {
233 padding: 40rpx 20rpx; 241 padding: 40rpx 20rpx;
  242 + margin: 20rpx;
234 background: #fff; 243 background: #fff;
235 - border-radius: 20rpx 20rpx 0rpx 0rpx; 244 + border-radius: 20rpx;
236 display: flex; 245 display: flex;
237 - align-items: center;  
238 flex-direction: column; 246 flex-direction: column;
239 } 247 }
240 248
@@ -259,29 +267,34 @@ @@ -259,29 +267,34 @@
259 } 267 }
260 268
261 .preferentialCoupon { 269 .preferentialCoupon {
262 - padding: 0; 270 + background: #efefef;
  271 +}
  272 +
  273 +.preferentialCoupon .limitation {
  274 + display: flex;
  275 + flex-direction: column;
  276 +}
  277 +
  278 +.preferentialCoupon .regionItem {
  279 + padding: 40rpx;
263 } 280 }
264 281
265 .regionItem { 282 .regionItem {
266 width: 100%; 283 width: 100%;
267 - padding: 40rpx 40rpx 0 40rpx; 284 + padding: 40rpx 20rpx;
268 box-sizing: border-box; 285 box-sizing: border-box;
269 background: #EFEFEF; 286 background: #EFEFEF;
270 -}  
271 -  
272 -.preferentialCoupon navigator {  
273 - width: 100%; 287 + border-radius: 20rpx;
274 } 288 }
275 289
276 .preferentialItems { 290 .preferentialItems {
277 width: 100%; 291 width: 100%;
278 display: flex; 292 display: flex;
279 - margin-bottom: 20rpx;  
280 min-height: 160rpx; 293 min-height: 160rpx;
281 - padding-bottom: 10rpx;  
282 } 294 }
283 295
284 .purchase { 296 .purchase {
  297 + position: relative;
285 width: 30%; 298 width: 30%;
286 display: flex; 299 display: flex;
287 flex-direction: column; 300 flex-direction: column;
@@ -299,47 +312,56 @@ @@ -299,47 +312,56 @@
299 background: #FD4D59; 312 background: #FD4D59;
300 width: max-content; 313 width: max-content;
301 padding: 6rpx; 314 padding: 6rpx;
302 - position: absolute;  
303 - left: 16rpx;  
304 - top: 12rpx; 315 + margin-right: 8rpx;
305 } 316 }
306 317
307 .priceText { 318 .priceText {
308 font-family: PingFang SC; 319 font-family: PingFang SC;
309 - color: #FD4D59; 320 + color: #F6231B;
310 font-weight: 500; 321 font-weight: 500;
311 margin-top: 6rpx; 322 margin-top: 6rpx;
312 display: flex; 323 display: flex;
313 align-items: center; 324 align-items: center;
314 justify-content: center; 325 justify-content: center;
  326 + font-size: 52rpx;
  327 + flex-direction: column;
315 } 328 }
316 329
317 .priceText .icons { 330 .priceText .icons {
318 font-family: PingFang SC; 331 font-family: PingFang SC;
319 - color: #FD4D59; 332 + color: #F6231B;
  333 + font-size: 20rpx;
  334 + display: flex;
  335 + align-items: baseline;
320 } 336 }
321 337
322 .certificateInfo { 338 .certificateInfo {
323 width: 70%; 339 width: 70%;
324 - padding: 40rpx 10rpx 20rpx 28rpx; 340 + padding: 20rpx;
325 position: relative; 341 position: relative;
326 background: #fff; 342 background: #fff;
327 border-radius: 10rpx; 343 border-radius: 10rpx;
328 display: flex; 344 display: flex;
329 flex-direction: column; 345 flex-direction: column;
330 justify-content: center; 346 justify-content: center;
  347 + align-items: center;
331 } 348 }
332 349
333 .certificateInfo .limitation { 350 .certificateInfo .limitation {
334 - line-height: 38rpx; 351 + line-height: 40rpx;
335 } 352 }
336 353
337 .ticketName { 354 .ticketName {
338 - margin: 20rpx 20rpx 0 0;  
339 display: flex; 355 display: flex;
340 justify-content: space-between; 356 justify-content: space-between;
341 align-items: baseline; 357 align-items: baseline;
342 font-weight: 700; 358 font-weight: 700;
  359 + overflow: hidden;
  360 + word-break: break-all;
  361 + text-overflow: ellipsis;
  362 + display: -webkit-box;
  363 + -webkit-box-orient: vertical;
  364 + -webkit-line-clamp: 1;
343 } 365 }
344 366
345 .orderingFood { 367 .orderingFood {
@@ -359,7 +381,6 @@ @@ -359,7 +381,6 @@
359 381
360 .limitation { 382 .limitation {
361 margin-top: 10rpx; 383 margin-top: 10rpx;
362 - width: 100%;  
363 color: #666; 384 color: #666;
364 font-family: PingFang SC; 385 font-family: PingFang SC;
365 font-weight: 500; 386 font-weight: 500;
@@ -371,13 +392,8 @@ @@ -371,13 +392,8 @@
371 line-height: 30rpx; 392 line-height: 30rpx;
372 } 393 }
373 394
374 -.regionItem .limitation {  
375 - display: flex;  
376 - flex-direction: column;  
377 -}  
378 -  
379 .limitationTitle { 395 .limitationTitle {
380 - font-weight: 400; 396 + font-weight: 600;
381 line-height: 28rpx; 397 line-height: 28rpx;
382 color: #000; 398 color: #000;
383 line-height: 40rpx; 399 line-height: 40rpx;
@@ -404,7 +420,7 @@ @@ -404,7 +420,7 @@
404 420
405 .checkImg { 421 .checkImg {
406 position: absolute; 422 position: absolute;
407 - bottom: 0; 423 + bottom: 20rpx;
408 right: 20rpx; 424 right: 20rpx;
409 width: 32rpx !important; 425 width: 32rpx !important;
410 height: 32rpx; 426 height: 32rpx;
@@ -419,10 +435,7 @@ @@ -419,10 +435,7 @@
419 } 435 }
420 436
421 .couponBtn { 437 .couponBtn {
422 - width: 70%;  
423 padding: 6rpx 0; 438 padding: 6rpx 0;
424 - background: #AE2D2D;  
425 - color: #fff;  
426 border-radius: 42rpx; 439 border-radius: 42rpx;
427 text-align: center; 440 text-align: center;
428 margin-top: 24rpx; 441 margin-top: 24rpx;
@@ -453,9 +466,154 @@ @@ -453,9 +466,154 @@
453 text-align: center; 466 text-align: center;
454 } 467 }
455 468
  469 +.couponBox navigator,
  470 +.couponBox .couponInfo {
  471 + width: 100%;
  472 + margin-bottom: 20rpx;
  473 + padding-bottom: 10rpx;
  474 + border-radius: 10rpx;
  475 + background: #fff;
  476 +}
  477 +
  478 +.couponBox .preferentialItems {
  479 + box-shadow: 0rpx 4rpx 8rpx #0000000d;
  480 +}
  481 +
  482 +.couponBox .showDesc {
  483 + display: flex;
  484 + align-items: center;
  485 + color: #666;
  486 +}
  487 +
  488 +.couponBox .showDesc image {
  489 + width: 25rpx;
  490 + height: 24rpx;
  491 + margin-left: 8rpx;
  492 +}
  493 +
  494 +.couponBox .bottomLimitation {
  495 + padding: 20rpx;
  496 + display: flex;
  497 + align-items: center;
  498 + margin-top: 10rpx;
  499 + color: #666;
  500 + font-family: PingFang SC;
  501 + font-weight: 500;
  502 +}
  503 +
  504 +.couponBox .bottomLimitation text {
  505 + display: block;
  506 + width: 8rpx;
  507 + height: 8rpx;
  508 + background: #999999;
  509 + margin-right: 12rpx;
  510 + border-radius: 50%;
  511 +}
  512 +
  513 +.couponBox .certificateInfo {
  514 + flex-direction: row;
  515 + align-items: center;
  516 +}
  517 +
  518 +.couponBox .couponBtn {
  519 + width: 100%;
  520 + height: fit-content;
  521 + background: #AE2D2D;
  522 + color: #fff;
  523 +}
  524 +
  525 +.couponBox .certificateInfo .preferentialDetails {
  526 + width: 100%;
  527 + display: flex;
  528 + flex-direction: column;
  529 +}
  530 +
  531 +.couponBox .information {
  532 + display: flex;
  533 + align-items: center;
  534 +}
  535 +
  536 +.couponBox .certificateInfo .limitation {
  537 + margin-right: 20rpx;
  538 + flex: 1;
  539 + width: auto;
  540 +}
  541 +
  542 +.couponBox .discountInfo {
  543 + font-family: PingFang SC;
  544 + background: #FD4D59;
  545 + position: absolute;
  546 + top: 0;
  547 + left: 100rpx;
  548 + font-size: 16rpx;
  549 + border-radius: 0 0 10rpx 0;
  550 + padding: 0 6rpx;
  551 + height: 28rp;
  552 + line-height: 28rpx;
  553 + text-align: center;
  554 + color: #FFEFC5;
  555 + width: max-content;
  556 +}
  557 +
  558 +.couponBox .certificateImg {
  559 + position: absolute;
  560 + top: 0;
  561 + left: 0;
  562 + width: 100rpx;
  563 + height: 28rpx;
  564 +}
  565 +
  566 +.couponBox .limitationBtn {
  567 + width: 40%;
  568 + display: flex;
  569 + flex-direction: column;
  570 + align-items: center;
  571 +}
  572 +
  573 +.evaluateTitleText {
  574 + font-weight: 600;
  575 + font-family: PingFang SC;
  576 + margin-bottom: 20rpx;
  577 + text-align: center;
  578 +}
  579 +
  580 +.evaluateCoupon .preferentialItems {
  581 + background: url('https://qn.colorcun.com/invitation11Pj1.png') no-repeat;
  582 + background-size: cover;
  583 +}
  584 +
  585 +.evaluateCoupon .evaluateImg {
  586 + width: 62rpx;
  587 + height: 60rpx;
  588 +}
  589 +
  590 +.evaluateCoupon .preferentialItems {
  591 + align-items: center;
  592 + padding: 0 44rpx 0 40rpx;
  593 + box-sizing: border-box;
  594 + border-radius: 10rpx;
  595 +}
  596 +
  597 +.evaluateCoupon .couponBtn {
  598 + width: max-content;
  599 + height: max-content;
  600 + padding: 4rpx 26rpx;
  601 + margin-top: 0;
  602 + background: #fff;
  603 + color: #ae2d2d;
  604 +}
  605 +
  606 +.evaluateCoupon .evaluateText {
  607 + flex: 1;
  608 + display: flex;
  609 + flex-direction: column;
  610 + color: #fff;
  611 + margin-left: 40rpx;
  612 + font-weight: 600;
  613 +}
  614 +
456 .labelBox { 615 .labelBox {
457 width: 100%; 616 width: 100%;
458 - margin-top: 20rpx;  
459 } 617 }
460 618
461 .labelBox .texts { 619 .labelBox .texts {
@@ -479,6 +637,7 @@ @@ -479,6 +637,7 @@
479 box-sizing: border-box; 637 box-sizing: border-box;
480 width: 100%; 638 width: 100%;
481 margin-top: 20rpx; 639 margin-top: 20rpx;
  640 + font-weight: 600;
482 } 641 }
483 642
484 .cook { 643 .cook {
@@ -794,12 +953,9 @@ @@ -794,12 +953,9 @@
794 padding-top: 40rpx; 953 padding-top: 40rpx;
795 } 954 }
796 955
797 -.viewBox2 .tileBox {  
798 - background: #F0F0F0;  
799 -}  
800 -  
801 -.viewBox2 .regionItem {  
802 - background: #fff; 956 +.viewBox2 .evaluateCoupon {
  957 + background: #EFEFEF;
  958 + padding: 40rpx 20rpx 40rpx 20rpx;
803 } 959 }
804 960
805 .viewBox2 .activeTitleItem { 961 .viewBox2 .activeTitleItem {
@@ -822,7 +978,39 @@ @@ -822,7 +978,39 @@
822 978
823 .viewBox2 .couponBtn { 979 .viewBox2 .couponBtn {
824 background: #000; 980 background: #000;
825 - color: #FFEFD6; 981 + color: #fff;
  982 +}
  983 +
  984 +.viewBox2 .tileBox {
  985 + padding-top: 60rpx;
  986 +}
  987 +
  988 +.viewBox2 .evaluateCoupon .preferentialItems {
  989 + background: #fff;
  990 +}
  991 +
  992 +.viewBox2 .evaluateCoupon .evaluateText {
  993 + color: #000;
  994 +}
  995 +
  996 +.viewBox2 .couponBox navigator,
  997 +.viewBox2 .couponBox .couponInfo,
  998 +.viewBox2 .certificateInfo {
  999 + background: #FFF8EC;
  1000 +}
  1001 +
  1002 +.viewBox2 .purchase {
  1003 + background: #E8CEA8;
  1004 +}
  1005 +
  1006 +.viewBox2 .evaluateCoupon .couponBtn {
  1007 + background: #E8CEA8;
  1008 + color: #000;
  1009 +}
  1010 +
  1011 +.viewBox2 .evaluateCoupon .couponBtn {
  1012 + background: #E8CEA8;
  1013 + color: #000;
826 } 1014 }
827 1015
828 .viewBox2 .shareItem, 1016 .viewBox2 .shareItem,
@@ -837,7 +1025,6 @@ @@ -837,7 +1025,6 @@
837 border: none; 1025 border: none;
838 } 1026 }
839 1027
840 -  
841 .viewBox2 .pageSpacing { 1028 .viewBox2 .pageSpacing {
842 position: relative; 1029 position: relative;
843 display: flex; 1030 display: flex;
@@ -848,8 +1035,19 @@ @@ -848,8 +1035,19 @@
848 overflow-x: scroll; 1035 overflow-x: scroll;
849 border-bottom-left-radius: 10rpx; 1036 border-bottom-left-radius: 10rpx;
850 border-bottom-right-radius: 10rpx; 1037 border-bottom-right-radius: 10rpx;
  1038 + padding-top: 30rpx;
  1039 +}
  1040 +
  1041 +.viewBox2 .regionItem {
  1042 + padding: 40rpx;
  1043 + width: auto;
  1044 + background: #efefef;
851 } 1045 }
852 1046
  1047 +.viewBox2 .publicModules {
  1048 + padding: 0 40rpx;
  1049 + margin: 0;
  1050 +}
853 1051
854 .viewBox2 .pageSpacing1 { 1052 .viewBox2 .pageSpacing1 {
855 position: relative; 1053 position: relative;
@@ -859,7 +1057,8 @@ @@ -859,7 +1057,8 @@
859 overflow-x: scroll; 1057 overflow-x: scroll;
860 border-bottom-left-radius: 10rpx; 1058 border-bottom-left-radius: 10rpx;
861 border-bottom-right-radius: 10rpx; 1059 border-bottom-right-radius: 10rpx;
862 - padding-left: 20rpx; 1060 + padding: 30rpx 0 30rpx 20rpx;
  1061 + background: #fff;
863 } 1062 }
864 1063
865 .viewBox2 .imgs { 1064 .viewBox2 .imgs {
@@ -903,19 +1102,36 @@ @@ -903,19 +1102,36 @@
903 display: flex; 1102 display: flex;
904 align-items: center; 1103 align-items: center;
905 margin: 0 24rpx 40rpx 0; 1104 margin: 0 24rpx 40rpx 0;
  1105 + font-weight: 600;
906 } 1106 }
907 1107
908 .viewBox2 .publicModule { 1108 .viewBox2 .publicModule {
909 align-items: flex-start; 1109 align-items: flex-start;
910 - padding-bottom: 0; 1110 + padding: 0;
  1111 +}
  1112 +
  1113 +.viewBox2 .publicModules1 .orderBox {
  1114 + margin-top: -20rpx;
  1115 + margin-bottom: 40rpx;
  1116 + background: #E8CEA8;
  1117 + color: #000;
  1118 +}
  1119 +
  1120 +.viewBox2 .publicModules1 .cook {
  1121 + background: #000;
  1122 + color: #fff;
911 } 1123 }
912 1124
913 -.viewBox2 .publicModule image,  
914 -.viewBox2 .labelBox .texts { 1125 +.viewBox2 .publicModules image,
  1126 +.viewBox2 .publicModules .labelBox .texts {
915 margin-bottom: 40rpx; 1127 margin-bottom: 40rpx;
916 width: 100%; 1128 width: 100%;
917 } 1129 }
918 1130
  1131 +.viewBox2 .publicModules .labelBox:nth-last-child(1) {
  1132 + margin-bottom: 0;
  1133 +}
  1134 +
919 .viewBox2 .businessBox { 1135 .viewBox2 .businessBox {
920 margin-top: 30rpx; 1136 margin-top: 30rpx;
921 } 1137 }
@@ -925,6 +1141,7 @@ @@ -925,6 +1141,7 @@
925 flex-wrap: wrap; 1141 flex-wrap: wrap;
926 align-items: center; 1142 align-items: center;
927 justify-content: center; 1143 justify-content: center;
  1144 + margin-bottom: 40rpx;
928 } 1145 }
929 1146
930 .viewBox2 .videoBox video { 1147 .viewBox2 .videoBox video {