xt / xcx-book · Commits

Go to a project

Commit 87a025ca308f8f8d8766a27d22ca59ed772dc9f8

Authored by pengye
1 parent 7b7f20ae
build: skipped

邀请函抢购按钮文字样式修改

Inline Side-by-side
Showing 12 changed files with 96 additions and 86 deletions
@@ -262,6 +262,7 @@ @@ -262,6 +262,7 @@
262 background: transparent; 262 background: transparent;
263 border: 2rpx solid #0B0805; 263 border: 2rpx solid #0B0805;
264 width: max-content; 264 width: max-content;
  265 + flex-shrink: 0;
265 } 266 }
266 267
267 .preferentialItems { 268 .preferentialItems {
@@ -293,6 +293,7 @@ @@ -293,6 +293,7 @@
293 background: transparent; 293 background: transparent;
294 border: 2rpx solid #0B0805; 294 border: 2rpx solid #0B0805;
295 width: max-content; 295 width: max-content;
  296 + flex-shrink: 0;
296 } 297 }
297 298
298 .preferentialItems { 299 .preferentialItems {
@@ -282,6 +282,7 @@ @@ -282,6 +282,7 @@
282 background: transparent; 282 background: transparent;
283 border: 2rpx solid #0B0805; 283 border: 2rpx solid #0B0805;
284 width: max-content; 284 width: max-content;
  285 + flex-shrink: 0;
285 } 286 }
286 287
287 .preferentialItems { 288 .preferentialItems {
@@ -282,6 +282,7 @@ @@ -282,6 +282,7 @@
282 background: transparent; 282 background: transparent;
283 border: 2rpx solid #0B0805; 283 border: 2rpx solid #0B0805;
284 width: max-content; 284 width: max-content;
  285 + flex-shrink: 0;
285 } 286 }
286 287
287 .preferentialItems { 288 .preferentialItems {
@@ -473,6 +473,7 @@ @@ -473,6 +473,7 @@
473 line-height: 40rpx; 473 line-height: 40rpx;
474 height: 40rpx; 474 height: 40rpx;
475 width: max-content; 475 width: max-content;
  476 + flex-shrink: 0;
476 } 477 }
477 478
478 .preferential { 479 .preferential {
@@ -274,6 +274,7 @@ @@ -274,6 +274,7 @@
274 background: transparent; 274 background: transparent;
275 border: 2rpx solid #0B0805; 275 border: 2rpx solid #0B0805;
276 width: max-content; 276 width: max-content;
  277 + flex-shrink: 0;
277 } 278 }
278 279
279 .preferentialItems { 280 .preferentialItems {
@@ -282,6 +282,7 @@ @@ -282,6 +282,7 @@
282 background: transparent; 282 background: transparent;
283 border: 2rpx solid #0B0805; 283 border: 2rpx solid #0B0805;
284 width: max-content; 284 width: max-content;
  285 + flex-shrink: 0;
285 } 286 }
286 287
287 .preferentialItems { 288 .preferentialItems {
@@ -402,6 +402,7 @@ @@ -402,6 +402,7 @@
402 background: transparent; 402 background: transparent;
403 border: 2rpx solid #0B0805; 403 border: 2rpx solid #0B0805;
404 width: max-content; 404 width: max-content;
  405 + flex-shrink: 0;
405 } 406 }
406 407
407 .bottom { 408 .bottom {
@@ -6,67 +6,67 @@ @@ -6,67 +6,67 @@
6 <view class="sign"></view><text class="font32r">专属优惠券</text> 6 <view class="sign"></view><text class="font32r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 - <view class="preferentialItems">  
10 - <view class="itemLeft">  
11 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>  
12 - <text wx:if="{{item.use.is_dish=='1'}}" class="discountText font24r">特惠菜品</text>  
13 - <text wx:if="{{item.use.is_discount=='1'}}" class="discountText font24r">超值折扣</text>  
14 - <view class="priceText" wx:if="{{item.price}}">  
15 - <text class="icons font40r">￥</text><text>{{item.price}}</text> 9 + <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
  10 + <view class="preferentialItems">
  11 + <view class="itemLeft">
  12 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  13 + <text wx:if="{{item.use.is_dish=='1'}}" class="discountText font24r">特惠菜品</text>
  14 + <text wx:if="{{item.use.is_discount=='1'}}" class="discountText font24r">超值折扣</text>
  15 + <view class="priceText" wx:if="{{item.price}}">
  16 + <text class="icons font40r">￥</text><text>{{item.price}}</text>
  17 + </view>
16 </view> 18 </view>
17 - </view>  
18 - <view class="itemRight">  
19 - <view class="btns">  
20 - <text class="font40r">{{item.aname}}</text>  
21 - <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 19 + <view class="itemRight">
  20 + <view class="btns">
  21 + <text class="font40r">{{item.aname}}</text>
22 <view class="font24r orderingFood"> 22 <view class="font24r orderingFood">
23 抢购 23 抢购
24 </view> 24 </view>
25 - </navigator>  
26 - </view>  
27 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>  
28 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">  
29 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
30 - </view>  
31 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">  
32 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}} 25 + </view>
  26 + <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
  27 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  28 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  29 + </view>
  30 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  31 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  32 + </view>
33 </view> 33 </view>
34 </view> 34 </view>
35 - </view> 35 + </navigator>
36 </block> 36 </block>
37 </view> 37 </view>
38 <view class="box" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}"> 38 <view class="box" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
39 <view class="title"> 39 <view class="title">
40 <view class="sign"></view><text class="font32r">会员充值优惠</text> 40 <view class="sign"></view><text class="font32r">会员充值优惠</text>
41 </view> 41 </view>
42 - <view class="rechargeItems">  
43 - <view class="itemLeft">  
44 - <view class="itemTop font36r">  
45 - {{recharge_data.rname}}  
46 - </view>  
47 - <view class="itemBottom font24r" wx:if="{{priceInfo}}">  
48 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
49 - </view>  
50 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
51 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}  
52 - </view>  
53 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
54 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。 42 + <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
  43 + <view class="rechargeItems">
  44 + <view class="itemLeft">
  45 + <view class="itemTop font36r">
  46 + {{recharge_data.rname}}
  47 + </view>
  48 + <view class="itemBottom font24r" wx:if="{{priceInfo}}">
  49 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  50 + </view>
  51 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  52 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
  53 + </view>
  54 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  55 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
  56 + </view>
55 </view> 57 </view>
56 - </view>  
57 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">  
58 <view class="font24r orderingFood"> 58 <view class="font24r orderingFood">
59 充值 59 充值
60 </view> 60 </view>
61 - </navigator>  
62 - </view> 61 + </view>
  62 + </navigator>
63 </view> 63 </view>
64 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据--> 64 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据-->
65 <view class="box" wx:if="{{is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}"> 65 <view class="box" wx:if="{{is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}">
66 <view class="title"> 66 <view class="title">
67 <view class="sign"></view><text class="font32r">反馈有礼</text> 67 <view class="sign"></view><text class="font32r">反馈有礼</text>
68 </view> 68 </view>
69 - <view class="preferentialItems"> 69 + <view class="preferentialItems" bindtap="evaluateFun">
70 <view class="itemLeft"> 70 <view class="itemLeft">
71 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text> 71 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
72 <view class="priceText" wx:if="{{couponData.price}}"> 72 <view class="priceText" wx:if="{{couponData.price}}">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <view class="itemRight"> 76 <view class="itemRight">
77 <view class="btns"> 77 <view class="btns">
78 <text class="font40r">{{couponData.aname}}</text> 78 <text class="font40r">{{couponData.aname}}</text>
79 - <view bindtap="evaluateFun" class="font24r orderingFood"> 79 + <view class="font24r orderingFood">
80 领取 80 领取
81 </view> 81 </view>
82 </view> 82 </view>
@@ -108,6 +108,7 @@ page { @@ -108,6 +108,7 @@ page {
108 height: 44rpx; 108 height: 44rpx;
109 background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%); 109 background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%);
110 width: max-content; 110 width: max-content;
  111 + flex-shrink: 0;
111 } 112 }
112 113
113 .rechargeItems { 114 .rechargeItems {
@@ -21,30 +21,30 @@ @@ -21,30 +21,30 @@
21 </view> 21 </view>
22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
24 - <view class="preferentialItems">  
25 - <view class="itemLeft couponItem">  
26 - <view class="itemTop">  
27 - <text class="font28r">{{item.aname}}</text>  
28 - <view class="priceText font24r" wx:if="{{item.price}}">  
29 - <view class="icons font24r">￥</view>{{item.price}}  
30 - </view>  
31 - <!-- is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示 -->  
32 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>  
33 - </view>  
34 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>  
35 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">  
36 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
37 - </view>  
38 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">  
39 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}  
40 - </view>  
41 - </view>  
42 - <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">  
43 - <view class="font24r orderingFood">  
44 - 抢购  
45 - </view>  
46 - </navigator>  
47 - </view> 24 + <navigator url="/pack-activity/pack/buyCoupon?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
  25 + <view class="preferentialItems">
  26 + <view class="itemLeft couponItem">
  27 + <view class="itemTop">
  28 + <text class="font28r">{{item.aname}}</text>
  29 + <view class="priceText font24r" wx:if="{{item.price}}">
  30 + <view class="icons font24r">￥</view>{{item.price}}
  31 + </view>
  32 + <!-- is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示 -->
  33 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  34 + </view>
  35 + <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
  36 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  37 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  38 + </view>
  39 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  40 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  41 + </view>
  42 + </view>
  43 + <view class="font24r orderingFood">
  44 + 抢购
  45 + </view>
  46 + </view>
  47 + </navigator>
48 </block> 48 </block>
49 </view> 49 </view>
50 <!-- 餐厅介绍图文分开 --> 50 <!-- 餐厅介绍图文分开 -->
@@ -94,31 +94,31 @@ @@ -94,31 +94,31 @@
94 </block> 94 </block>
95 </view> 95 </view>
96 </view> 96 </view>
97 - <view class="preferential"> 97 + <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">
98 <view class="chefText font36r"> 98 <view class="chefText font36r">
99 特别优惠 99 特别优惠
100 </view> 100 </view>
101 - <view class="preferentialItems" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data}}">  
102 - <view class="itemLeft">  
103 - <view class="itemTop font28r">  
104 - <text>{{recharge_data.rname}}</text>  
105 - </view>  
106 - <view class="font24r" wx:if="{{priceInfo}}">  
107 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
108 - </view>  
109 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
110 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}  
111 - </view>  
112 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
113 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。  
114 - </view>  
115 - </view>  
116 - <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">  
117 - <view class="font24r orderingFood">  
118 - 抢购  
119 - </view>  
120 - </navigator>  
121 - </view> 101 + <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
  102 + <view class="preferentialItems">
  103 + <view class="itemLeft">
  104 + <view class="itemTop font28r">
  105 + <text>{{recharge_data.rname}}</text>
  106 + </view>
  107 + <view class="font24r" wx:if="{{priceInfo}}">
  108 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  109 + </view>
  110 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  111 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
  112 + </view>
  113 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  114 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
  115 + </view>
  116 + </view>
  117 + <view class="font24r orderingFood">
  118 + 抢购
  119 + </view>
  120 + </view>
  121 + </navigator>
122 </view> 122 </view>
123 <view class="vips"> 123 <view class="vips">
124 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 124 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
@@ -255,6 +255,7 @@ @@ -255,6 +255,7 @@
255 height: 44rpx; 255 height: 44rpx;
256 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 256 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
257 width: max-content; 257 width: max-content;
  258 + flex-shrink: 0;
258 } 259 }
259 260
260 .vips { 261 .vips {