xt / xcx-book · Commits

Go to a project

Commit de41e19e2c13d0c6f7b6f2e404e6ae8f07382da7

Authored by pengye
1 parent 6e9beef1
build: skipped

券详情有效期显示、样式调整

Inline Side-by-side
Showing 2 changed files with 31 additions and 37 deletions
@@ -4,73 +4,68 @@ @@ -4,73 +4,68 @@
4 <view class="top_box"> 4 <view class="top_box">
5 <image src="https://qn.colorcun.com/voucherIcon1.png" mode="" /> 5 <image src="https://qn.colorcun.com/voucherIcon1.png" mode="" />
6 <view class="texts"> 6 <view class="texts">
7 - <view class="font36r textName">{{detail.aname}}</view>  
8 - <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font24r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view> 7 + <view class="font32r textName">{{detail.aname}}</view>
  8 + <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font28r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view>
9 </view> 9 </view>
10 - <view class="font24r receive" wx:if="{{resultCoupon == '1'}}">已领取</view> 10 + <view class="font28r receive" wx:if="{{resultCoupon == '1'}}">已领取</view>
11 </view> 11 </view>
12 <view class="center_box"> 12 <view class="center_box">
13 <view class="centerMain"> 13 <view class="centerMain">
14 <view class="title"> 14 <view class="title">
15 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" /> 15 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" />
16 - <text class="font28r">有效期</text> 16 + <text class="font32r">有效期</text>
17 </view> 17 </view>
18 - <view class="info font24r"><text>活动期限</text>{{util.unixtoTime(detail.stime,'YYYY-MM-DD')}}<text>至</text>{{util.unixtoTime(detail.etime,'YYYY-MM-DD')}}</view>  
19 - <view class="info font24r"><text>领取日期</text>{{util.unixtoTime(detail.cdate,'YYYY-MM-DD')}}</view>  
20 - <view class="info font24r" wx:if="{{detail.aexpiration>0}}">领取后{{detail.aexpiration}}天内使用</view> 18 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>
  19 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期：</text> 永久有效</view>
21 </view> 20 </view>
22 <view class="centerMain"> 21 <view class="centerMain">
23 <view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}"> 22 <view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">
24 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" /> 23 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" />
25 - <text class="font28r">不可用日期</text> 24 + <text class="font32r">不可用日期</text>
26 </view> 25 </view>
27 - <view wx:if="{{detail.morText}}" class="info font24r">{{detail.morText}}</view>  
28 - <view wx:if="{{detail.noonText}}" class="info font24r">{{detail.noonText}}</view>  
29 - <view wx:if="{{detail.nigText}}" class="info font24r">{{detail.nigText}}</view>  
30 - <view wx:if="{{!detail.morText && !detail.noonText && !detail.nigText}}" class="info font24r">无限制</view> 26 + <view wx:if="{{detail.morText}}" class="info font28r">{{detail.morText}}</view>
  27 + <view wx:if="{{detail.noonText}}" class="info font28r">{{detail.noonText}}</view>
  28 + <view wx:if="{{detail.nigText}}" class="info font28r">{{detail.nigText}}</view>
31 </view> 29 </view>
32 <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}"> 30 <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}">
33 <view class="title"> 31 <view class="title">
34 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" /> 32 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" />
35 - <text class="font28r">使用规则</text> 33 + <text class="font32r">使用规则</text>
36 </view> 34 </view>
37 - <view class="info font24r">  
38 - <view class="drop"></view>{{detail.arule.is_same_day == '1' ? '领取当日可用' : '领取当日不可用'}}  
39 - </view>  
40 - <view class="info font24r"> 35 + <view class="info font28r">
41 <view class="drop"></view>{{detail.arule.is_accumulation == '1' ? '可以叠加使用其他优惠券' : '不可以叠加使用其他优惠券'}} 36 <view class="drop"></view>{{detail.arule.is_accumulation == '1' ? '可以叠加使用其他优惠券' : '不可以叠加使用其他优惠券'}}
42 </view> 37 </view>
43 - <view class="info font24r"> 38 + <view class="info font28r">
44 <view class="drop"></view>{{detail.arule.is_compartment == '1' ? '可用于包间消费' : '不可用于包间消费'}} 39 <view class="drop"></view>{{detail.arule.is_compartment == '1' ? '可用于包间消费' : '不可用于包间消费'}}
45 </view> 40 </view>
46 - <view class="info font24r"> 41 + <view class="info font28r">
47 <view class="drop"></view>{{detail.arule.is_eatin == '1' ? '堂食可用' : '不可用于堂食消费'}} 42 <view class="drop"></view>{{detail.arule.is_eatin == '1' ? '堂食可用' : '不可用于堂食消费'}}
48 </view> 43 </view>
49 - <view class="info font24r"> 44 + <view class="info font28r">
50 <view class="drop"></view>{{detail.arule.is_takeout == '1' ? '外带可用' : '不可用于外带'}} 45 <view class="drop"></view>{{detail.arule.is_takeout == '1' ? '外带可用' : '不可用于外带'}}
51 </view> 46 </view>
52 - <view class="info font24r"> 47 + <view class="info font28r">
53 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}} 48 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}}
54 </view> 49 </view>
55 </view> 50 </view>
56 <view class="centerMain"> 51 <view class="centerMain">
57 <view class="title"> 52 <view class="title">
58 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" /> 53 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" />
59 - <text class="font28r">分享规则</text> 54 + <text class="font32r">分享规则</text>
60 </view> 55 </view>
61 - <view class="info font24r"> 56 + <view class="info font28r">
62 <view class="drop"></view>{{detail.arule.is_share_lose == '1'? '可以分享给好友' : '不能分享给好友'}} 57 <view class="drop"></view>{{detail.arule.is_share_lose == '1'? '可以分享给好友' : '不能分享给好友'}}
63 </view> 58 </view>
64 - <view class="info font24r"> 59 + <view class="info font28r">
65 <view class="drop"></view>{{detail.arule.is_share_have == '1'? '分享给好友后继续拥有此券' : '分享给好友后不再拥有此券'}} 60 <view class="drop"></view>{{detail.arule.is_share_have == '1'? '分享给好友后继续拥有此券' : '分享给好友后不再拥有此券'}}
66 </view> 61 </view>
67 </view> 62 </view>
68 <view class="centerMain" wx:if="{{detail.explain}}"> 63 <view class="centerMain" wx:if="{{detail.explain}}">
69 <view class="title"> 64 <view class="title">
70 <image src="https://qn.colorcun.com/voucherUnion_5.png" mode="" /> 65 <image src="https://qn.colorcun.com/voucherUnion_5.png" mode="" />
71 - <text class="font28r">其他说明</text> 66 + <text class="font32r">其他说明</text>
72 </view> 67 </view>
73 - <view class="info font24r">{{detail.explain}}</view> 68 + <view class="info font28r">{{detail.explain}}</view>
74 </view> 69 </view>
75 </view> 70 </view>
76 <view class="seller_data"> 71 <view class="seller_data">
@@ -95,10 +90,10 @@ @@ -95,10 +90,10 @@
95 </view> 90 </view>
96 <view class="bottom_box_wrap"> 91 <view class="bottom_box_wrap">
97 <view class="bottom_box"> 92 <view class="bottom_box">
98 - <view class="font24r">温馨提示：</view>  
99 - <view class="font24r">到店消费时，请您扫描商家二维码付款时，可以直接识别并使用优惠券</view>  
100 - <view class="font24r">2、从<text class="bold_box">周到安排</text>微信小程序，<text class="bold_box">“我的-卡券”</text>中，可以找到您的卡券。</view>  
101 - <view class="font24r">3、您也可以关注<text class="bold_box">周到安排</text>公众号，获取更多优惠券信息</view> 93 + <view class="font32r bold_box">温馨提示：</view>
  94 + <view class="font28r">1、到店消费时，请您扫描商家二维码付款时，可以直接识别并使用优惠券</view>
  95 + <view class="font28r">2、从<text class="bold_box">周到安排</text>微信小程序，<text class="bold_box">“我的-卡券”</text>中，可以找到您的卡券。</view>
  96 + <view class="font28r">3、您也可以关注<text class="bold_box">周到安排</text>公众号，获取更多优惠券信息</view>
102 <view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view> 97 <view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view>
103 </view> 98 </view>
104 </view> 99 </view>
@@ -93,10 +93,11 @@ page { @@ -93,10 +93,11 @@ page {
93 93
94 .info { 94 .info {
95 margin-left: 44rpx; 95 margin-left: 44rpx;
96 - color: #575757; 96 + color: #696969;
97 letter-spacing: 2rpx; 97 letter-spacing: 2rpx;
98 position: relative; 98 position: relative;
99 - line-height: 40rpx; 99 + line-height: 48rpx;
  100 + font-weight: 400;
100 } 101 }
101 102
102 .bottom_box { 103 .bottom_box {
@@ -114,20 +115,18 @@ page { @@ -114,20 +115,18 @@ page {
114 .bottom_box view { 115 .bottom_box view {
115 color: #515151; 116 color: #515151;
116 font-family: PingFang SC; 117 font-family: PingFang SC;
117 - line-height: 40rpx; 118 + line-height: 46rpx;
118 } 119 }
119 120
120 .bold_box { 121 .bold_box {
121 - font-size: 28rpx;  
122 font-weight: bold; 122 font-weight: bold;
123 - color: #000; 123 + color: #000 !important;
124 } 124 }
125 125
126 .publicity { 126 .publicity {
127 - margin-top: 14rpx;  
128 display: flex; 127 display: flex;
129 align-items: center; 128 align-items: center;
130 - padding: 20rpx 0; 129 + padding: 30rpx 0;
131 } 130 }
132 131
133 .sharewidth { 132 .sharewidth {