xt / xcx-book · Commits

Go to a project

Commit 7145729aaf3f2da2471565a6a37e869c1bdce482

Authored by pengye
1 parent bf9f76c2
build: skipped

邀请函生日宴 优惠券修改

Inline Side-by-side
Showing 3 changed files with 172 additions and 129 deletions
@@ -31,7 +31,7 @@ Page({ @@ -31,7 +31,7 @@ Page({
31 certificate: '', 31 certificate: '',
32 dataStr: Date.now() * 1 / 1000, 32 dataStr: Date.now() * 1 / 1000,
33 swich_phone: '0', //是否显示前台电话 33 swich_phone: '0', //是否显示前台电话
34 - is_comments: '0', 34 + is_comments: '0',
35 is_user_comments: false, //是否评价过 true有评价 false没评价 35 is_user_comments: false, //是否评价过 true有评价 false没评价
36 tableinfo: [], //桌子列表 36 tableinfo: [], //桌子列表
37 roomimage: [], //包间图片列表 37 roomimage: [], //包间图片列表
@@ -325,7 +325,7 @@ Page({ @@ -325,7 +325,7 @@ Page({
325 deskStr, 325 deskStr,
326 dateStrDivide: dateStrDivide == '00分' ? '' : dateStrDivide, 326 dateStrDivide: dateStrDivide == '00分' ? '' : dateStrDivide,
327 seller_tel: reserev.seller.seller_tel, 327 seller_tel: reserev.seller.seller_tel,
328 - phone:reserev.phone, 328 + phone: reserev.phone,
329 } 329 }
330 }) 330 })
331 console.log('reserev信息', reserev); 331 console.log('reserev信息', reserev);
@@ -535,7 +535,7 @@ Page({ @@ -535,7 +535,7 @@ Page({
535 sharesetting() { 535 sharesetting() {
536 wx.reportMonitor('1017', 1) 536 wx.reportMonitor('1017', 1)
537 this.closeModal() 537 this.closeModal()
538 - if(this.data.options.isOrder == '1' && this.data.detail.status !='4'){ 538 + if (this.data.options.isOrder == '1' && this.data.detail.status != '4') {
539 return { 539 return {
540 title: '推荐' + this.data.seller.name + '，点击可查看详情并导航到店', 540 title: '推荐' + this.data.seller.name + '，点击可查看详情并导航到店',
541 path: util.http_build_query({ 541 path: util.http_build_query({
@@ -543,7 +543,7 @@ Page({ @@ -543,7 +543,7 @@ Page({
543 }, '/pages/reserve/shopHome'), 543 }, '/pages/reserve/shopHome'),
544 imageUrl: this.data.detail.seller.seller_image || 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png', 544 imageUrl: this.data.detail.seller.seller_image || 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png',
545 } 545 }
546 - }else{ 546 + } else {
547 let parmdata = { 547 let parmdata = {
548 id: this.id, 548 id: this.id,
549 fromid: getApp().openid, 549 fromid: getApp().openid,
@@ -864,6 +864,11 @@ Page({ @@ -864,6 +864,11 @@ Page({
864 let couponData = res.data[0] 864 let couponData = res.data[0]
865 couponData.use = couponData.use ? util.determine(couponData.use) : ''; 865 couponData.use = couponData.use ? util.determine(couponData.use) : '';
866 couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : ''; 866 couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';
  867 + if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {
  868 + let cash = couponData.use.cash * 1;
  869 + let price = couponData.price * 1;
  870 + couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  871 + }
867 // showCoupon 代表赠送的券没过有效期 && 是开启状态 872 // showCoupon 代表赠送的券没过有效期 && 是开启状态
868 couponData.showCoupon = (this.data.dataStr < (couponData.etime * 1) && couponData.is_open == '1') ? '1' : '0'; 873 couponData.showCoupon = (this.data.dataStr < (couponData.etime * 1) && couponData.is_open == '1') ? '1' : '0';
869 console.log('邀请函--------------------评价赠送的优惠券', couponData); 874 console.log('邀请函--------------------评价赠送的优惠券', couponData);
@@ -885,8 +890,13 @@ Page({ @@ -885,8 +890,13 @@ Page({
885 detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : ''; 890 detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
886 detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : ''; 891 detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
887 detail.use = detail.use ? util.determine(detail.use) : ''; 892 detail.use = detail.use ? util.determine(detail.use) : '';
888 - detail.stimeStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD HH:II' )  
889 - detail.etimeStr = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II' ) 893 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  894 + let cash = detail.use.cash * 1;
  895 + let price = detail.price * 1;
  896 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  897 + }
  898 + detail.stimeStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD HH:II')
  899 + detail.etimeStr = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II')
890 coupon_dataList.push(detail); 900 coupon_dataList.push(detail);
891 if (length === coupon_dataList.length) { 901 if (length === coupon_dataList.length) {
892 coupon_dataList = coupon_dataList.filter(item => { 902 coupon_dataList = coupon_dataList.filter(item => {
@@ -15,19 +15,19 @@ @@ -15,19 +15,19 @@
15 <text space="nbsp" wx:if="{{reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</text> 15 <text space="nbsp" wx:if="{{reserve.swich_booking=='1' && reserve.book_info}}" class="contentData font28r bookData">{{reserve.book_info}}</text>
16 </view> 16 </view>
17 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}"> 17 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}">
18 - <view class="record font28r">预订贵宾:</view> 18 + <view class="record font28r">预订贵宾：</view>
19 <view class="contentData font28r">{{detail.rnameStr}}</view> 19 <view class="contentData font28r">{{detail.rnameStr}}</view>
20 </view> 20 </view>
21 <view class="infoItem" wx:if="{{seller.date}}"> 21 <view class="infoItem" wx:if="{{seller.date}}">
22 - <view class="record font28r">用餐日期:</view> 22 + <view class="record font28r">用餐日期：</view>
23 <view class="contentData font28r">{{seller.date}}</view> 23 <view class="contentData font28r">{{seller.date}}</view>
24 </view> 24 </view>
25 <view class="infoItem" wx:if="{{seller.tablesText}}"> 25 <view class="infoItem" wx:if="{{seller.tablesText}}">
26 - <view class="record font28r">用餐位置:</view> 26 + <view class="record font28r">用餐位置：</view>
27 <view class="contentData font28r">{{seller.tablesText}}</view> 27 <view class="contentData font28r">{{seller.tablesText}}</view>
28 </view> 28 </view>
29 <view class="infoItem" wx:if="{{seller.soltName}}"> 29 <view class="infoItem" wx:if="{{seller.soltName}}">
30 - <view class="record font28r">用餐时间:</view> 30 + <view class="record font28r">用餐时间：</view>
31 <view class="arrivalBox"> 31 <view class="arrivalBox">
32 <view class="contentData font28r">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view> 32 <view class="contentData font28r">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view>
33 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}"> 33 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}">
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </view> 38 </view>
39 </view> 39 </view>
40 <view class="infoItem" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}"> 40 <view class="infoItem" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}">
41 - <view class="record font28r">前台电话:</view> 41 + <view class="record font28r">前台电话：</view>
42 <view class="contentData font28r"> 42 <view class="contentData font28r">
43 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block> 43 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block>
44 </view> 44 </view>
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </view> 71 </view>
72 </view> 72 </view>
73 <!-- 优惠券 --> 73 <!-- 优惠券 -->
74 - <view class="publicModule preferentialCoupon couponBox" wx:if="{{hasValueCertificate && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 74 + <view class="publicModule couponBox" wx:if="{{hasValueCertificate && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
75 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" /> 75 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" />
76 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 76 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
77 <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"> 77 <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">
@@ -79,9 +79,9 @@ @@ -79,9 +79,9 @@
79 <view class="purchase"> 79 <view class="purchase">
80 <view class="priceText" wx:if="{{item.price}}"> 80 <view class="priceText" wx:if="{{item.price}}">
81 <view class="icons">￥<text class="priceText">{{item.price}}</text></view> 81 <view class="icons">￥<text class="priceText">{{item.price}}</text></view>
82 - <view class="descBox" wx:if="{{item.price == '0' && item.desc}}">{{item.desc}}</view>  
83 </view> 82 </view>
84 - <image class="certificateImg" src="https://qn.colorcun.com/invitation10certificate.png" mode="" /> 83 + <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="" />
  84 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>
85 </view> 85 </view>
86 <view class="certificateInfo"> 86 <view class="certificateInfo">
87 <view class="preferentialDetails"> 87 <view class="preferentialDetails">
@@ -89,27 +89,24 @@ @@ -89,27 +89,24 @@
89 <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text> 89 <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':''}}</text>
90 <text class="ticketName font24r">{{item.aname}}</text> 90 <text class="ticketName font24r">{{item.aname}}</text>
91 </view> 91 </view>
92 - <block wx:if="{{item.price != '0'}}">  
93 - <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>  
94 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">  
95 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
96 - </view>  
97 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">  
98 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}  
99 - </view>  
100 - </block>  
101 - <block wx:else>  
102 - <text class="limitation font24r">开始时间：{{item.stimeStr}}</text>  
103 - <text class="limitation font24r">结束时间：{{item.etimeStr}}</text>  
104 - </block> 92 + <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>
  93 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">
  94 + 无限制
  95 + </view>
  96 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">
  97 + 会员生日当天可用
  98 + </view>
  99 + <view wx:if="{{item.desc}}" class="limitation showDesc">
  100 + <text class="font24r">消费要求</text>
  101 + <image src="https://qn.colorcun.com/invitation10Sicon.png" mode="" />
  102 + </view>
105 </view> 103 </view>
106 <view class="limitationBtn"> 104 <view class="limitationBtn">
107 - <view class="font24r {{item.price == '0' ? 'couponBtn couponBtn1' : 'couponBtn'}}">{{item.price == '0' ? '免费领取' : '立即购买'}}</view>  
108 - <view class="font24r limitationText" wx:if="{{item.price == '0'}}">已被领取</view>  
109 - <view class="font24r limitationText" wx:if="{{item.price == '0'}}"><text>{{(item.grant_num*1) - (item.grant_last*1)}}</text>张</view> 105 + <view class="font24r couponBtn">立即抢购</view>
110 </view> 106 </view>
111 </view> 107 </view>
112 </view> 108 </view>
  109 + <view wx:if="{{item.desc}}" class="bottomLimitation limitation font24r"><text></text>{{item.desc}}</view>
113 </navigator> 110 </navigator>
114 </block> 111 </block>
115 </view> 112 </view>
@@ -118,7 +115,7 @@ @@ -118,7 +115,7 @@
118 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" /> 115 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" />
119 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 116 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
120 <view class="rechargeItems"> 117 <view class="rechargeItems">
121 - <image class="checkImg" src="https://qn.colorcun.com/invitation10vector.png" mode="" /> 118 + <image class="checkImg" src="https://qn.colorcun.com/invitation10vector1.png" mode="" />
122 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view> 119 <view class="rechargeTitle font36r">{{recharge_data.rname}}</view>
123 <view class="limitation font24r" wx:if="{{priceInfo}}"> 120 <view class="limitation font24r" wx:if="{{priceInfo}}">
124 {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}} 121 {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
@@ -135,31 +132,46 @@ @@ -135,31 +132,46 @@
135 </view> 132 </view>
136 </navigator> 133 </navigator>
137 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 134 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
138 - 点击了解更多会员优惠政策 135 + 了解更多会员优惠政策
139 </view> 136 </view>
140 </view> 137 </view>
141 <!-- 评价券 --> 138 <!-- 评价券 -->
142 - <view class="publicModule" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}"> 139 + <view class="publicModule couponBox" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
143 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" /> 140 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" />
144 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view> 141 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view>
145 - <view class="preferentialItems" bindtap="evaluateFun">  
146 - <view class="certificateInfo">  
147 - <text class="discountText font20r">评价有礼</text>  
148 - <view class="ticketName font36r">{{couponData.aname}}</view>  
149 - <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>  
150 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">  
151 - 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}  
152 - </view>  
153 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">  
154 - 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}} 142 + <view class="couponInfo" bindtap="evaluateFun">
  143 + <view class="preferentialItems">
  144 + <view class="purchase">
  145 + <view class="priceText" wx:if="{{couponData.price}}">
  146 + <view class="icons">￥<text class="priceText">{{couponData.price}}</text></view>
  147 + </view>
  148 + <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="" />
  149 + <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountInfo">{{couponData.discount}}折</text>
155 </view> 150 </view>
156 - </view>  
157 - <view class="purchase font40r">  
158 - <view class="priceText" wx:if="{{couponData.price}}">  
159 - <view class="icons font40r">￥</view>{{couponData.price}} 151 + <view class="certificateInfo">
  152 + <view class="preferentialDetails">
  153 + <view class="information">
  154 + <text class="discountText font20r">{{couponData.use.is_cash=='1'?'代金券':couponData.use.is_discount=='1'?'超值折扣':couponData.use.is_dish=='1'?'特惠菜品':''}}</text>
  155 + <text class="ticketName font24r">{{couponData.aname}}</text>
  156 + </view>
  157 + <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>
  158 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">
  159 + 无限制
  160 + </view>
  161 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">
  162 + 会员生日当天可用
  163 + </view>
  164 + <view wx:if="{{couponData.desc}}" class="limitation showDesc">
  165 + <text class="font24r">消费要求</text>
  166 + <image src="https://qn.colorcun.com/invitation10Sicon.png" mode="" />
  167 + </view>
  168 + </view>
  169 + <view class="limitationBtn">
  170 + <view class="font24r couponBtn">立即领取</view>
  171 + </view>
160 </view> 172 </view>
161 - <view class="font24r couponBtn">{{couponData.price=='0'?'免费领取':'立即领取'}}</view>  
162 </view> 173 </view>
  174 + <view wx:if="{{couponData.desc}}" class="bottomLimitation limitation font24r"><text></text>{{couponData.desc}}</view>
163 </view> 175 </view>
164 </view> 176 </view>
165 <!-- 评价没有券 --> 177 <!-- 评价没有券 -->
@@ -201,7 +213,7 @@ @@ -201,7 +213,7 @@
201 </swiper> 213 </swiper>
202 </view> 214 </view>
203 <!-- 招牌菜品 --> 215 <!-- 招牌菜品 -->
204 - <view class="publicModule" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0 || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}"> 216 + <view class="publicModule" wx:if="{{(signboard && signboard.textInfo || signboard.videoImgsInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}">
205 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title6.png" mode="" /> 217 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title6.png" mode="" />
206 <view class="labelBox" wx:if="{{signboard.textInfo}}"> 218 <view class="labelBox" wx:if="{{signboard.textInfo}}">
207 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> 219 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 flex: 1; 54 flex: 1;
55 line-height: 60rpx; 55 line-height: 60rpx;
56 font-family: PingFang SC; 56 font-family: PingFang SC;
57 - margin-left: 40rpx; 57 + margin-left: 4rpx;
58 font-weight: 600; 58 font-weight: 600;
59 } 59 }
60 60
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 .positioning { 83 .positioning {
84 display: flex; 84 display: flex;
85 align-items: center; 85 align-items: center;
86 - background: #fff8ea; 86 + background: #fff;
87 border-radius: 20rpx; 87 border-radius: 20rpx;
88 color: #111; 88 color: #111;
89 padding: 20rpx; 89 padding: 20rpx;
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 137
138 .peopleInfo view { 138 .peopleInfo view {
139 font-family: "PingFang SC"; 139 font-family: "PingFang SC";
140 - font-weight: 400; 140 + font-weight: 600;
141 } 141 }
142 142
143 .handleInfo { 143 .handleInfo {
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 } 147 }
148 148
149 .handleInfo view { 149 .handleInfo view {
150 - font-weight: 400; 150 + font-weight: 600;
151 letter-spacing: 10rpx; 151 letter-spacing: 10rpx;
152 } 152 }
153 153
@@ -204,19 +204,14 @@ @@ -204,19 +204,14 @@
204 height: 100rpx; 204 height: 100rpx;
205 } 205 }
206 206
207 -.preferentialCoupon navigator {  
208 - width: 100%;  
209 -}  
210 -  
211 .preferentialItems { 207 .preferentialItems {
212 width: 100%; 208 width: 100%;
213 display: flex; 209 display: flex;
214 - margin-bottom: 20rpx;  
215 min-height: 160rpx; 210 min-height: 160rpx;
216 - padding-bottom: 10rpx;  
217 } 211 }
218 212
219 .purchase { 213 .purchase {
  214 + position: relative;
220 width: 30%; 215 width: 30%;
221 display: flex; 216 display: flex;
222 flex-direction: column; 217 flex-direction: column;
@@ -234,9 +229,7 @@ @@ -234,9 +229,7 @@
234 background: #FD4D59; 229 background: #FD4D59;
235 width: max-content; 230 width: max-content;
236 padding: 6rpx; 231 padding: 6rpx;
237 - position: absolute;  
238 - left: 16rpx;  
239 - top: 12rpx; 232 + margin-right: 8rpx;
240 } 233 }
241 234
242 .priceText { 235 .priceText {
@@ -247,34 +240,43 @@ @@ -247,34 +240,43 @@
247 display: flex; 240 display: flex;
248 align-items: center; 241 align-items: center;
249 justify-content: center; 242 justify-content: center;
  243 + font-size: 52rpx;
  244 + flex-direction: column;
250 } 245 }
251 246
252 .priceText .icons { 247 .priceText .icons {
253 font-family: PingFang SC; 248 font-family: PingFang SC;
254 color: #fff; 249 color: #fff;
  250 + font-size: 20rpx;
  251 + display: flex;
  252 + align-items: baseline;
255 } 253 }
256 254
257 .certificateInfo { 255 .certificateInfo {
258 width: 70%; 256 width: 70%;
259 - padding: 40rpx 10rpx 20rpx 28rpx; 257 + padding: 20rpx;
260 position: relative; 258 position: relative;
261 - background: #fff1e7;  
262 border-radius: 10rpx; 259 border-radius: 10rpx;
263 display: flex; 260 display: flex;
264 - flex-direction: column;  
265 - justify-content: center; 261 + background: #fff;
  262 + align-items: center;
266 } 263 }
267 264
268 .certificateInfo .limitation { 265 .certificateInfo .limitation {
269 - line-height: 38rpx; 266 + line-height: 40rpx;
270 } 267 }
271 268
272 .ticketName { 269 .ticketName {
273 - margin: 20rpx 20rpx 0 0;  
274 display: flex; 270 display: flex;
275 justify-content: space-between; 271 justify-content: space-between;
276 align-items: baseline; 272 align-items: baseline;
277 font-weight: 700; 273 font-weight: 700;
  274 + overflow: hidden;
  275 + word-break: break-all;
  276 + text-overflow: ellipsis;
  277 + display: -webkit-box;
  278 + -webkit-box-orient: vertical;
  279 + -webkit-line-clamp: 1;
278 } 280 }
279 281
280 .orderingFood { 282 .orderingFood {
@@ -294,7 +296,6 @@ @@ -294,7 +296,6 @@
294 296
295 .limitation { 297 .limitation {
296 margin-top: 10rpx; 298 margin-top: 10rpx;
297 - width: 100%;  
298 color: #666; 299 color: #666;
299 font-family: PingFang SC; 300 font-family: PingFang SC;
300 font-weight: 500; 301 font-weight: 500;
@@ -332,13 +333,14 @@ @@ -332,13 +333,14 @@
332 } 333 }
333 334
334 .couponBtn { 335 .couponBtn {
335 - width: 70%;  
336 padding: 6rpx 0; 336 padding: 6rpx 0;
337 - background: #fff;  
338 - color: #000;  
339 border-radius: 42rpx; 337 border-radius: 42rpx;
340 text-align: center; 338 text-align: center;
341 margin-top: 24rpx; 339 margin-top: 24rpx;
  340 + width: 100%;
  341 + height: fit-content;
  342 + background: #CC9B6A;
  343 + color: #fff;
342 } 344 }
343 345
344 .favouredPolicy { 346 .favouredPolicy {
@@ -361,15 +363,56 @@ @@ -361,15 +363,56 @@
361 363
362 .rechargeBtn view { 364 .rechargeBtn view {
363 width: 80%; 365 width: 80%;
364 - padding: 10rpx 0; 366 + padding: 12rpx 0;
365 background: #CC9B6A; 367 background: #CC9B6A;
366 border-radius: 42rpx; 368 border-radius: 42rpx;
367 color: #fff; 369 color: #fff;
368 text-align: center; 370 text-align: center;
369 } 371 }
370 372
  373 +.couponBox navigator,
  374 +.couponBox .couponInfo {
  375 + width: 100%;
  376 + margin-bottom: 20rpx;
  377 + padding-bottom: 10rpx;
  378 + border-radius: 10rpx;
  379 + background: #fff;
  380 +}
  381 +
  382 +.couponBox .preferentialItems {
  383 + box-shadow: 0rpx 4rpx 8rpx #0000000d;
  384 +}
  385 +
  386 +.couponBox .showDesc {
  387 + display: flex;
  388 + align-items: center;
  389 +}
  390 +
  391 +.couponBox .showDesc image {
  392 + width: 25rpx;
  393 + height: 24rpx;
  394 + margin-left: 8rpx;
  395 +}
  396 +
  397 +.bottomLimitation {
  398 + padding: 20rpx;
  399 + display: flex;
  400 + align-items: center;
  401 +}
  402 +
  403 +.bottomLimitation text {
  404 + display: block;
  405 + width: 8rpx;
  406 + height: 8rpx;
  407 + background: #999999;
  408 + margin-right: 12rpx;
  409 + border-radius: 50%;
  410 +}
  411 +
371 .couponBox .certificateInfo { 412 .couponBox .certificateInfo {
372 flex-direction: row; 413 flex-direction: row;
  414 + background: #fff;
  415 + align-items: center;
373 } 416 }
374 417
375 .couponBox .couponBtn { 418 .couponBox .couponBtn {
@@ -379,13 +422,6 @@ @@ -379,13 +422,6 @@
379 color: #fff; 422 color: #fff;
380 } 423 }
381 424
382 -.couponBox .couponBtn1 {  
383 - color: #CC9B6A;  
384 - border: 2rpx solid #CC9B6A;  
385 - background: transparent;  
386 - margin-bottom: 20rpx;  
387 -}  
388 -  
389 .couponBox .certificateInfo .preferentialDetails { 425 .couponBox .certificateInfo .preferentialDetails {
390 width: 100%; 426 width: 100%;
391 display: flex; 427 display: flex;
@@ -394,29 +430,29 @@ @@ -394,29 +430,29 @@
394 430
395 .couponBox .information { 431 .couponBox .information {
396 display: flex; 432 display: flex;
  433 + align-items: center;
397 } 434 }
398 435
399 -.couponBox .discountText {  
400 - position: relative;  
401 - height: max-content;  
402 - left: 0;  
403 - margin-right: 8rpx;  
404 - min-width: 90rpx;  
405 -}  
406 -  
407 -.couponBox .ticketName {  
408 - overflow: hidden;  
409 - word-break: break-all;  
410 - text-overflow: ellipsis;  
411 - display: -webkit-box;  
412 - -webkit-box-orient: vertical;  
413 - -webkit-line-clamp: 1;  
414 - margin-top: 16rpx; 436 +.couponBox .certificateInfo .limitation {
  437 + margin-right: 20rpx;
  438 + flex: 1;
  439 + width: auto;
415 } 440 }
416 441
417 -.couponBox .purchase {  
418 - width: 22%;  
419 - position: relative; 442 +.couponBox .discountInfo {
  443 + font-family: PingFang SC;
  444 + background: #FD4D59;
  445 + position: absolute;
  446 + top: 0;
  447 + left: 100rpx;
  448 + font-size: 16rpx;
  449 + border-radius: 0 0 10rpx 0;
  450 + padding: 0 6rpx;
  451 + height: 28rp;
  452 + line-height: 28rpx;
  453 + text-align: center;
  454 + color: #FFEFC5;
  455 + width: max-content;
420 } 456 }
421 457
422 .couponBox .certificateImg { 458 .couponBox .certificateImg {
@@ -427,25 +463,6 @@ @@ -427,25 +463,6 @@
427 height: 28rpx; 463 height: 28rpx;
428 } 464 }
429 465
430 -.couponBox .icons {  
431 - font-size: 20rpx;  
432 - display: flex;  
433 - align-items: baseline;  
434 -}  
435 -  
436 -.couponBox .priceText {  
437 - font-size: 52rpx;  
438 -}  
439 -  
440 -.couponBox .priceText {  
441 - display: flex;  
442 - flex-direction: column;  
443 -}  
444 -  
445 -.couponBox .descBox {  
446 - font-size: 20rpx;  
447 -}  
448 -  
449 .couponBox .limitationBtn { 466 .couponBox .limitationBtn {
450 width: 40%; 467 width: 40%;
451 display: flex; 468 display: flex;
@@ -453,15 +470,6 @@ @@ -453,15 +470,6 @@
453 align-items: center; 470 align-items: center;
454 } 471 }
455 472
456 -.couponBox .limitationText {  
457 - color: #666;  
458 -}  
459 -  
460 -.couponBox .limitationText text {  
461 - color: #CC9B6A;  
462 - margin-right: 4rpx;  
463 -}  
464 -  
465 .evaluateTitleText { 473 .evaluateTitleText {
466 font-weight: 600; 474 font-weight: 600;
467 font-size: 28rpx; 475 font-size: 28rpx;
@@ -469,6 +477,14 @@ @@ -469,6 +477,14 @@
469 margin: 40rpx 0; 477 margin: 40rpx 0;
470 } 478 }
471 479
  480 +.preferentialCoupon navigator {
  481 + width: 100%;
  482 +}
  483 +
  484 +.preferentialCoupon .limitation {
  485 + color: #000;
  486 +}
  487 +
472 .labelBox { 488 .labelBox {
473 width: 100%; 489 width: 100%;
474 margin-top: 20rpx; 490 margin-top: 20rpx;
@@ -508,6 +524,11 @@ @@ -508,6 +524,11 @@
508 height: 60rpx; 524 height: 60rpx;
509 } 525 }
510 526
  527 +.evaluateCoupon .couponBtn {
  528 + color: #000;
  529 + background: #fff;
  530 +}
  531 +
511 .evaluateCoupon .preferentialItems { 532 .evaluateCoupon .preferentialItems {
512 background: #CC9B6A; 533 background: #CC9B6A;
513 align-items: center; 534 align-items: center;
@@ -591,8 +612,8 @@ @@ -591,8 +612,8 @@
591 font-family: PingFang SC; 612 font-family: PingFang SC;
592 border-radius: 40rpx; 613 border-radius: 40rpx;
593 background: transparent; 614 background: transparent;
594 - color: #cc9b6a;  
595 - border: 2rpx solid #cc9b6a; 615 + color: #000;
  616 + border: 2rpx solid #000;
596 } 617 }
597 618
598 .shareItem, 619 .shareItem,