xt / xcx-book · Commits

Go to a project

Commit a6662a3bf038cf44ea0bf61480c9074a00144847

Authored by pengye
1 parent 9977ede3
build: skipped

新版样式页面、样式调整2

Inline Side-by-side
Showing 16 changed files with 459 additions and 249 deletions
@@ -17,45 +17,45 @@ @@ -17,45 +17,45 @@
17 </view> 17 </view>
18 <view wx:if="{{type=='2'}}" class="coupon"> 18 <view wx:if="{{type=='2'}}" class="coupon">
19 <form catchsubmit="formSubmit"> 19 <form catchsubmit="formSubmit">
20 - <view class="page-section">  
21 - <view class="page-section-title font32r">您的姓名</view> 20 + <view class="page-section text1">
  21 + <view class="page-section-title font28r">您的姓名</view>
22 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0"> 22 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
23 - <input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#999;" bindinput="bindKeyNameInput"/> 23 + <input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#CBCBCB;" bindinput="bindKeyNameInput"/>
24 </view> 24 </view>
25 <picker mode="selector" value="{{indexs}}" range-key="sex" data-sex='{{sexList[indexs].sex}}' range="{{sexList}}" bindchange="bind_Changesex" class="pickerSex"> 25 <picker mode="selector" value="{{indexs}}" range-key="sex" data-sex='{{sexList[indexs].sex}}' range="{{sexList}}" bindchange="bind_Changesex" class="pickerSex">
26 <text class="sexText">{{sexList[indexs].sex}}</text> 26 <text class="sexText">{{sexList[indexs].sex}}</text>
27 - <image src="https://qn.colorcun.com/WechatIMG695.png" mode="" class="imgs"/> 27 + <image src="https://qn.colorcun.com/arrowBottom.png" mode="" class="imgs"/>
28 </picker> 28 </picker>
29 </view> 29 </view>
30 <view class="page-section"> 30 <view class="page-section">
31 - <view class="page-section-title font32r">联系电话</view> 31 + <view class="page-section-title font28r">联系电话</view>
32 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0"> 32 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
33 - <input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#999;" bindinput="bindKeyPhoneInput" style="color: #999" /> 33 + <input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#CBCBCB;" bindinput="bindKeyPhoneInput" style="color: #000" />
34 </view> 34 </view>
35 </view> 35 </view>
36 <view class="page-section page-section1"> 36 <view class="page-section page-section1">
37 - <view class="page-section-title font32r">您的生日</view>  
38 - <view class="weui-cells weui-cell__bd"> 37 + <view class="page-section-title font28r">您的生日</view>
  38 + <view class="weui-cells weui-cell__bd text2">
39 <picker mode="date" value="{{date}}" bindchange="bind_ChangeDate" class="pickerBox"> 39 <picker mode="date" value="{{date}}" bindchange="bind_ChangeDate" class="pickerBox">
40 - <view class="colorSty">{{date?date:'点击输入您的生日'}}</view> 40 + <view class="{{date ? 'colorSty' : 'color1'}} font28r">{{date?date:'点击输入您的生日'}}</view>
41 </picker> 41 </picker>
  42 + <view class="more"></view>
42 </view> 43 </view>
43 - <view class="more"></view>  
44 </view> 44 </view>
45 <view class="page-section"> 45 <view class="page-section">
46 - <view class="page-section-title font32r">充值金额</view> 46 + <view class="page-section-title font28r">充值金额</view>
47 <view class="weui-cells weui-cell__bd sum colorSty"> 47 <view class="weui-cells weui-cell__bd sum colorSty">
48 {{opt.detail.recharge_money}}元 48 {{opt.detail.recharge_money}}元
49 </view> 49 </view>
50 </view> 50 </view>
51 <view class="page-section"> 51 <view class="page-section">
52 - <view class="page-section-title font32r">支付剩余时间 </view> 52 + <view class="page-section-title font28r">支付剩余时间 </view>
53 <view class="weui-cells weui-cell__bd sum colorSty"> 53 <view class="weui-cells weui-cell__bd sum colorSty">
54 {{countdown}} 54 {{countdown}}
55 </view> 55 </view>
56 </view> 56 </view>
57 <view wx:if="{{type=='2'}}" class="fixed_box"> 57 <view wx:if="{{type=='2'}}" class="fixed_box">
58 - <button class="font32r btns" formType="submit">确认支付 58 + <button class="font28r btns" formType="submit">确认支付
59 </button> 59 </button>
60 </view> 60 </view>
61 </form> 61 </form>
1 /* pack-activity/pack/confirmPayment.wxss */ 1 /* pack-activity/pack/confirmPayment.wxss */
  2 +
  3 +page {
  4 + background: #F5F5F5;
  5 +}
  6 +
2 .box_wrap { 7 .box_wrap {
3 width: 100%; 8 width: 100%;
4 display: flex; 9 display: flex;
5 align-items: center; 10 align-items: center;
6 - justify-content: center; 11 + justify-content: center;
  12 + background: #fff;
  13 + border-radius: 10rpx;
  14 + margin: 12rpx;
7 } 15 }
8 16
9 .box { 17 .box {
@@ -60,8 +68,10 @@ @@ -60,8 +68,10 @@
60 width: 100%; 68 width: 100%;
61 margin: 0; 69 margin: 0;
62 border-radius: 42rpx; 70 border-radius: 42rpx;
63 - color: #fff;  
64 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 71 + color: #fff;
  72 + height: 72rpx;
  73 + line-height: 72rpx;
  74 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
65 } 75 }
66 76
67 #payModal { 77 #payModal {
@@ -90,8 +100,10 @@ @@ -90,8 +100,10 @@
90 100
91 .coupon { 101 .coupon {
92 width: 100%; 102 width: 100%;
93 - padding-left: 32rpx;  
94 - box-sizing: border-box; 103 + box-sizing: border-box;
  104 + padding: 0 40rpx;
  105 + border-radius: 10rpx;
  106 + background: #fff;
95 } 107 }
96 108
97 .page-section { 109 .page-section {
@@ -102,15 +114,19 @@ @@ -102,15 +114,19 @@
102 } 114 }
103 115
104 .page-section1 .more { 116 .page-section1 .more {
105 - margin-right: 32rpx; 117 + margin-right: 32rpx;
  118 + margin-top: 8rpx;
106 } 119 }
107 120
108 .weui-cells { 121 .weui-cells {
109 - flex: 1; 122 + flex: 1;
  123 + display: flex;
  124 + justify-content: flex-end;
  125 + align-items: center;
110 } 126 }
111 127
112 .page-section-title { 128 .page-section-title {
113 - color: #515151; 129 + color: #000;
114 font-family: PingFang SC; 130 font-family: PingFang SC;
115 margin-right: 32rpx; 131 margin-right: 32rpx;
116 } 132 }
@@ -118,11 +134,12 @@ @@ -118,11 +134,12 @@
118 .weui-input { 134 .weui-input {
119 text-align: right; 135 text-align: right;
120 margin-right: 30rpx; 136 margin-right: 30rpx;
121 - font-size: 32rpx; 137 + font-size: 28rpx;
122 } 138 }
123 .name-input{ 139 .name-input{
124 margin-right: 0; 140 margin-right: 0;
125 - text-align: left; 141 + text-align: left;
  142 + flex: 1;
126 } 143 }
127 144
128 145
@@ -151,14 +168,16 @@ @@ -151,14 +168,16 @@
151 } 168 }
152 169
153 .colorSty{ 170 .colorSty{
154 - color: #999999;  
155 - font-size: 32rpx; 171 + color: #000;
  172 +}
  173 +
  174 +.color1 {
  175 + color: #CBCBCB;
156 } 176 }
157 177
158 .pickerSex image{ 178 .pickerSex image{
159 - width: 48rpx;  
160 - height: 48rpx;  
161 - margin-right: 30rpx; 179 + width: 24rpx;
  180 + height: 24rpx;
162 } 181 }
163 .sexText{ 182 .sexText{
164 position: relative; 183 position: relative;
@@ -188,4 +207,10 @@ @@ -188,4 +207,10 @@
188 display: flex; 207 display: flex;
189 align-items: center; 208 align-items: center;
190 padding: 20rpx 0; 209 padding: 20rpx 0;
  210 +}
  211 +
  212 +.text1 picker {
  213 + display: flex;
  214 + align-items: center;
  215 + padding-top: 20rpx;
191 } 216 }
@@ -42,7 +42,7 @@ Page({ @@ -42,7 +42,7 @@ Page({
42 id: options.id || obj.id, 42 id: options.id || obj.id,
43 sid: options.sid || obj.sid, 43 sid: options.sid || obj.sid,
44 oid: options.oid, 44 oid: options.oid,
45 - types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 45 + types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 5充值赠送的券，不显示按钮
46 rid: options.rid ? options.rid : '', 46 rid: options.rid ? options.rid : '',
47 activity_id:options.activity_id || '', 47 activity_id:options.activity_id || '',
48 } 48 }
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <text class="font20r" wx:else>￥<text class="priceText font36r">{{detail.price}}</text></text> 18 <text class="font20r" wx:else>￥<text class="priceText font36r">{{detail.price}}</text></text>
19 {{detail.desc}} 19 {{detail.desc}}
20 </view> 20 </view>
21 - <view class="operation"> 21 + <view class="operation" wx:if="{{opt.types!='5'}}">
22 <image class="countimgs" src="https://qn.colorcun.com/WechatIMG699.png" bindtap="subtraction" /> 22 <image class="countimgs" src="https://qn.colorcun.com/WechatIMG699.png" bindtap="subtraction" />
23 <input type="number" model:value="{{num}}" bindinput="bindKeyNameInput" /> 23 <input type="number" model:value="{{num}}" bindinput="bindKeyNameInput" />
24 <image class="countimgs" src="https://qn.colorcun.com/WechatIMG698.png" bindtap="addition" mode="" /> 24 <image class="countimgs" src="https://qn.colorcun.com/WechatIMG698.png" bindtap="addition" mode="" />
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 </view> 147 </view>
148 </view> 148 </view>
149 </view> 149 </view>
150 -<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}"> 150 +<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{opt.types!='5' && (resultCoupon == '0' || detail.arule.is_share_lose == '1')}}">
151 <block wx:if="{{detail.is_type == '3'}}"> 151 <block wx:if="{{detail.is_type == '3'}}">
152 <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share"> 152 <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">
153 <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" /> 153 <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />
@@ -80,7 +80,7 @@ Page({ @@ -80,7 +80,7 @@ Page({
80 getCouponDetail(e){ 80 getCouponDetail(e){
81 const item= e.currentTarget.dataset['item']; 81 const item= e.currentTarget.dataset['item'];
82 wx.navigateTo({ 82 wx.navigateTo({
83 - url: `./seeRecharge?id=${item.id}&name=${this.data.opt.name}`, 83 + url: `./receiveCoupon?id=${item.id}&name=${this.data.opt.name}&types=5&sid=${this.data.opt.sid}`,
84 }) 84 })
85 }, 85 },
86 submitOrder(){ 86 submitOrder(){
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
3 <nav>{{opt.name}}</nav> 3 <nav>{{opt.name}}</nav>
4 <view class="wrapBox"> 4 <view class="wrapBox">
5 <view class="info"> 5 <view class="info">
6 - <view class="info_left font32r"> 6 + <view class="info_left font28r">
7 活动名称 7 活动名称
8 </view> 8 </view>
9 - <view class="info_right text_info font32r"> 9 + <view class="info_right text_info font28r">
10 {{detail.rname}} 10 {{detail.rname}}
11 </view> 11 </view>
12 </view> 12 </view>
13 - <view class="info">  
14 - <view class="info_left font32r"> 13 + <view class="info text1">
  14 + <view class="info_left font28r">
15 充值满 15 充值满
16 </view> 16 </view>
17 <view class="info_right text_info font32r"> 17 <view class="info_right text_info font32r">
@@ -19,90 +19,90 @@ @@ -19,90 +19,90 @@
19 </view> 19 </view>
20 </view> 20 </view>
21 <view class="favourable_box"> 21 <view class="favourable_box">
22 - <view class="about font32r"> 22 + <view class="about font28r">
23 优惠活动 23 优惠活动
24 </view> 24 </view>
25 <view class="bundle" wx:if="{{recharge_list.is_price=='1'}}"> 25 <view class="bundle" wx:if="{{recharge_list.is_price=='1'}}">
26 - <view class="bundle_left font30r"> 26 + <view class="bundle_left font28r">
27 赠送 27 赠送
28 </view> 28 </view>
29 - <view class="bundle_right font30r"> 29 + <view class="bundle_right font28r">
30 {{recharge_list.price+'元余额'}} 30 {{recharge_list.price+'元余额'}}
31 </view> 31 </view>
32 </view> 32 </view>
33 <view class="bundle" wx:if="{{recharge_list.is_score=='1'}}"> 33 <view class="bundle" wx:if="{{recharge_list.is_score=='1'}}">
34 - <view class="bundle_left font30r"> 34 + <view class="bundle_left font28r">
35 赠送 35 赠送
36 </view> 36 </view>
37 - <view class="bundle_right font30r"> 37 + <view class="bundle_right font28r">
38 {{recharge_list.score+'积分'}} 38 {{recharge_list.score+'积分'}}
39 </view> 39 </view>
40 </view> 40 </view>
41 <view class="bundle" wx:if="{{recharge_list.is_coupons=='1'}}"> 41 <view class="bundle" wx:if="{{recharge_list.is_coupons=='1'}}">
42 - <view class="bundle_left font30r"> 42 + <view class="bundle_left font28r">
43 赠送 43 赠送
44 </view> 44 </view>
45 - <view class="bundle_right font30r"> 45 + <view class="bundle_right font28r">
46 优惠券 46 优惠券
47 </view> 47 </view>
48 </view> 48 </view>
49 </view> 49 </view>
50 <view class="list"> 50 <view class="list">
51 - <view class="item font32r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}"> 51 + <view class="item font28r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}">
52 {{item.aname}} 52 {{item.aname}}
53 </view> 53 </view>
54 </view> 54 </view>
55 <view class="week" wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}"> 55 <view class="week" wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}">
56 <view class="week_top"> 56 <view class="week_top">
57 - <view class="week_left font32r"> 57 + <view class="week_left font28r">
58 充值日期限制： 58 充值日期限制：
59 </view> 59 </view>
60 - <view class="texts font32r"> 60 + <view class="texts font28r">
61 每周指定日期可用 61 每周指定日期可用
62 </view> 62 </view>
63 </view> 63 </view>
64 - <view class="dateList texts font32r"> 64 + <view class="dateList texts font28r">
65 {{exp_date.week_date_show}} 65 {{exp_date.week_date_show}}
66 </view> 66 </view>
67 </view> 67 </view>
68 <view class="week" wx:if="{{exp_date.is_birthday=='1' || exp_date.is_birthday===true}}"> 68 <view class="week" wx:if="{{exp_date.is_birthday=='1' || exp_date.is_birthday===true}}">
69 <view class="week_top"> 69 <view class="week_top">
70 - <view class="week_left font32r"> 70 + <view class="week_left font28r">
71 充值日期限制： 71 充值日期限制：
72 </view> 72 </view>
73 - <view class="texts font32r"> 73 + <view class="texts font28r">
74 会员生日当天 74 会员生日当天
75 </view> 75 </view>
76 </view> 76 </view>
77 </view> 77 </view>
78 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}"> 78 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
79 <view class="week_top"> 79 <view class="week_top">
80 - <view class="week_left font32r"> 80 + <view class="week_left font28r">
81 充值日期限制： 81 充值日期限制：
82 </view> 82 </view>
83 - <view class="texts font32r"> 83 + <view class="texts font28r">
84 无 84 无
85 </view> 85 </view>
86 </view> 86 </view>
87 </view> 87 </view>
88 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}"> 88 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
89 <view class="week_top"> 89 <view class="week_top">
90 - <view class="week_left font32r"> 90 + <view class="week_left font28r">
91 有效期： 91 有效期：
92 </view> 92 </view>
93 - <view class="texts font32r"> 93 + <view class="texts font28r">
94 {{util.unixtoTime(detail.stime,'YYYY-MM-DD')+'至'+util.unixtoTime(detail.etime,'YYYY-MM-DD')}} 94 {{util.unixtoTime(detail.stime,'YYYY-MM-DD')+'至'+util.unixtoTime(detail.etime,'YYYY-MM-DD')}}
95 </view> 95 </view>
96 </view> 96 </view>
97 </view> 97 </view>
98 - <view class="info">  
99 - <view class="info_left font32r"> 98 + <view class="info text2">
  99 + <view class="info_left font28r">
100 备注 100 备注
101 </view> 101 </view>
102 </view> 102 </view>
103 <text class="explain_news">{{detail.explain}}</text> 103 <text class="explain_news">{{detail.explain}}</text>
104 </view> 104 </view>
105 <view class="fixed_box"> 105 <view class="fixed_box">
106 - <button class="font32r btns" bindtap="submitOrder">提交充值 106 + <button class="font28r btns" bindtap="submitOrder">提交充值
107 </button> 107 </button>
108 </view> 108 </view>
1 /* pack-activity/pack/vipRecharge.wxss */ 1 /* pack-activity/pack/vipRecharge.wxss */
2 page { 2 page {
3 - background-color: #fff; 3 + background-color: #F5F5F5;
4 } 4 }
5 5
6 .wrapBox{ 6 .wrapBox{
7 - padding-bottom: 180rpx; 7 + background: #fff;
  8 + margin: 12rpx;
  9 + border-radius: 10rpx;
8 } 10 }
9 11
10 .info { 12 .info {
11 - padding: 28rpx 32rpx 28rpx 0; 13 + margin: 0 40rpx;
  14 + padding: 28rpx 0;
12 box-sizing: border-box; 15 box-sizing: border-box;
13 display: flex; 16 display: flex;
14 justify-content: space-between; 17 justify-content: space-between;
15 - margin-left: 32rpx;  
16 - border-bottom: 2rpx solid #E7E7E7; 18 + border-bottom: 2rpx solid #F7F7F7;
  19 +}
  20 +
  21 +.text1 {
  22 + align-items: center;
  23 +}
  24 +
  25 +.text2 {
  26 + border: none;
  27 +}
  28 +
  29 +.text1 .text_info {
  30 + padding: 10rpx 0;
17 } 31 }
18 32
19 .info1 { 33 .info1 {
@@ -26,7 +40,7 @@ page { @@ -26,7 +40,7 @@ page {
26 .info_left { 40 .info_left {
27 flex-shrink: 0; 41 flex-shrink: 0;
28 margin-right: 20rpx; 42 margin-right: 20rpx;
29 - color: #515151; 43 + color: #696969;
30 font-family: PingFang SC; 44 font-family: PingFang SC;
31 } 45 }
32 46
@@ -39,11 +53,12 @@ page { @@ -39,11 +53,12 @@ page {
39 53
40 .text_info { 54 .text_info {
41 color: #000; 55 color: #000;
42 - font-family: PingFang SC; 56 + font-family: PingFang SC;
  57 + font-weight: 600;
43 } 58 }
44 59
45 .explain_news { 60 .explain_news {
46 - padding: 24rpx 32rpx; 61 + padding: 24rpx 40rpx;
47 color: #999999; 62 color: #999999;
48 font-family: PingFang SC; 63 font-family: PingFang SC;
49 font-size: 24rpx; 64 font-size: 24rpx;
@@ -74,8 +89,10 @@ page { @@ -74,8 +89,10 @@ page {
74 margin: 0; 89 margin: 0;
75 border-radius: 42rpx; 90 border-radius: 42rpx;
76 width: 100%; 91 width: 100%;
77 - color: #fff;  
78 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 92 + color: #fff;
  93 + height: 72rpx;
  94 + line-height: 72rpx;
  95 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
79 } 96 }
80 97
81 .favourable_box { 98 .favourable_box {
@@ -83,7 +100,7 @@ page { @@ -83,7 +100,7 @@ page {
83 } 100 }
84 101
85 .about { 102 .about {
86 - color: #515151; 103 + color: #696969;
87 font-family: PingFang SC; 104 font-family: PingFang SC;
88 line-height: 48rpx; 105 line-height: 48rpx;
89 height: 48rpx; 106 height: 48rpx;
@@ -99,13 +116,14 @@ page { @@ -99,13 +116,14 @@ page {
99 } 116 }
100 117
101 .bundle_left { 118 .bundle_left {
102 - color: #515151; 119 + color: #696969;
103 font-family: PingFang SC; 120 font-family: PingFang SC;
104 } 121 }
105 122
106 .bundle_right { 123 .bundle_right {
107 - color: #999;  
108 - font-family: PingFang SC; 124 + color: #000;
  125 + font-family: PingFang SC;
  126 + font-weight: 600;
109 } 127 }
110 128
111 .list { 129 .list {
@@ -114,18 +132,21 @@ page { @@ -114,18 +132,21 @@ page {
114 align-items: center; 132 align-items: center;
115 flex-wrap: wrap; 133 flex-wrap: wrap;
116 border-bottom: 2rpx solid #dbdbdb; 134 border-bottom: 2rpx solid #dbdbdb;
117 - padding-left: 32rpx; 135 + padding-left: 32rpx;
  136 + justify-content: flex-end;
118 } 137 }
119 138
120 .item { 139 .item {
121 - color: #0143a3; 140 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  141 + -webkit-background-clip: text;
  142 + -webkit-text-fill-color: transparent;
122 font-family: PingFang SC; 143 font-family: PingFang SC;
123 margin-right: 18rpx; 144 margin-right: 18rpx;
124 padding-bottom: 24rpx; 145 padding-bottom: 24rpx;
125 } 146 }
126 147
127 .week { 148 .week {
128 - padding: 0 32rpx; 149 + margin: 0 40rpx;
129 border-bottom: 2rpx solid #E7E7E7; 150 border-bottom: 2rpx solid #E7E7E7;
130 } 151 }
131 152
@@ -142,8 +163,9 @@ page { @@ -142,8 +163,9 @@ page {
142 } 163 }
143 164
144 .texts { 165 .texts {
145 - color: #999;  
146 - font-family: PingFang SC; 166 + color: #000;
  167 + font-family: PingFang SC;
  168 + font-weight: 600;
147 } 169 }
148 170
149 .dateList { 171 .dateList {
@@ -4,21 +4,21 @@ @@ -4,21 +4,21 @@
4 <view class="box" wx:if="{{list.length>0}}"> 4 <view class="box" wx:if="{{list.length>0}}">
5 <view wx:for="{{list}}" class="single" bindtap="gogoSingle" data-id="{{item.id}}"> 5 <view wx:for="{{list}}" class="single" bindtap="gogoSingle" data-id="{{item.id}}">
6 <view class="topBox"> 6 <view class="topBox">
7 - <view class="name font32r">  
8 - {{item.rname}} 7 + <view class="name font20r">
  8 + ￥<text>{{item.recharge_money}}</text>
9 </view> 9 </view>
10 - <view class="texts info font24r" wx:if="{{item.priceInfo}}">  
11 - {{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}  
12 - </view>  
13 - <view class="texts info font24r" wx:if="{{item.scoreInfo}}">  
14 - {{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}  
15 - </view>  
16 - <view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">  
17 - {{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。  
18 - </view>  
19 - </view>  
20 - <view class="texts time font24r">  
21 - 有效期限：{{util.unixtoTime(item.stime,'YYYY-MM-DD')}}至{{util.unixtoTime(item.etime,'YYYY-MM-DD')}} 10 + <view class="mainBox">
  11 + <view class="texts info font24r" wx:if="{{item.priceInfo}}">
  12 + {{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}
  13 + </view>
  14 + <view class="texts info font24r" wx:if="{{item.scoreInfo}}">
  15 + {{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}
  16 + </view>
  17 + <view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">
  18 + {{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
  19 + </view>
  20 + </view>
  21 + <view class="btn font24r">充值</view>
22 </view> 22 </view>
23 </view> 23 </view>
24 </view> 24 </view>
@@ -3,42 +3,55 @@ page{ @@ -3,42 +3,55 @@ page{
3 background: #F3F3F3; 3 background: #F3F3F3;
4 } 4 }
5 .box{ 5 .box{
6 - padding: 32rpx 40rpx; 6 + padding: 32rpx 40rpx;
7 } 7 }
8 .single{ 8 .single{
9 width: 100%; 9 width: 100%;
10 border-radius: 16rpx; 10 border-radius: 16rpx;
11 - background-color: #FFFFFF;  
12 - box-shadow: 0rpx 8rpx 8rpx #00000040; 11 + background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);
13 margin-bottom: 32rpx; 12 margin-bottom: 32rpx;
14 } 13 }
15 .topBox{ 14 .topBox{
16 width: 100%; 15 width: 100%;
17 - display: flex;  
18 - flex-direction: column;  
19 - justify-content: space-between; 16 + display: flex;
  17 + align-items: center;
  18 + justify-content: space-between;
  19 + padding: 20rpx 0;
20 } 20 }
21 .name{ 21 .name{
22 - background-color: #0143A3;  
23 height: 37%; 22 height: 37%;
24 line-height: 60rpx; 23 line-height: 60rpx;
25 - padding-left: 40rpx;  
26 - color: #ffffff; 24 + padding-left: 12rpx;
  25 + color: #F6231B;
27 font-family: PingFang SC; 26 font-family: PingFang SC;
28 font-weight: 500; 27 font-weight: 500;
29 border-top-left-radius: 10rpx; 28 border-top-left-radius: 10rpx;
30 border-top-right-radius: 10rpx; 29 border-top-right-radius: 10rpx;
31 } 30 }
32 -.texts{  
33 - padding-left: 40rpx;  
34 - color: #999999;  
35 - font-family: PingFang SC;  
36 - line-height: 50rpx; 31 +
  32 +.name text {
  33 + font-size: 48rpx;
  34 + font-weight: 600;
37 } 35 }
38 -.topBox{  
39 - height: 68%;  
40 - border-bottom: 2rpx dashed #bfc4d4; 36 +
  37 +.mainBox {
  38 + border-left: 2rpx dashed #f6231b;
  39 + padding-left: 18rpx;
  40 + margin-left: 18rpx;
  41 +}
  42 +
  43 +.btn {
  44 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  45 + border-radius: 198rpx;
  46 + width: 120rpx;
  47 + height: 40rpx;
  48 + line-height: 40rpx;
  49 + color: #fff;
  50 + flex-shrink: 0;
  51 + text-align: center;
  52 + margin: 0 24rpx 0 10rpx;
41 } 53 }
42 -.time{  
43 - line-height: 70rpx; 54 +
  55 +.texts {
  56 + color: #C36607;
44 } 57 }
@@ -2,11 +2,12 @@ @@ -2,11 +2,12 @@
2 <nav bindNavEvent="backFun" class="navhome" place="{{true}}">店铺信息</nav> 2 <nav bindNavEvent="backFun" class="navhome" place="{{true}}">店铺信息</nav>
3 <view class="main"> 3 <view class="main">
4 <view class="imgs"> 4 <view class="imgs">
5 - <image src="https://qn.colorcun.com/collectSeller.png" mode="" /> 5 + <image src="https://qn.colorcun.com/bookSuccess.png" mode="" />
  6 + <text class="font32r">提交成功</text>
6 </view> 7 </view>
7 - <view class="texts">  
8 - <text>感谢您的信任！</text>  
9 - <text>我们已经记录了您的信息。客服人员会在第一时间联系您，处理相关事宜。</text> 8 + <view class="texts font28r">
  9 + <text>感谢您的信任！我们已经记录了您的信息。</text>
  10 + <text>客服人员会在第一时间联系您，处理相关事宜。</text>
10 </view> 11 </view>
11 <view class="btnBox"> 12 <view class="btnBox">
12 <button class="btn" bindtap="backFun">朕知道了</button> 13 <button class="btn" bindtap="backFun">朕知道了</button>
1 /* pages/customer/collectSeller.wxss */ 1 /* pages/customer/collectSeller.wxss */
  2 +page {
  3 + background: #F5F5F5;
  4 +}
  5 +
2 .main { 6 .main {
3 display: flex; 7 display: flex;
4 flex-direction: column; 8 flex-direction: column;
5 - align-items: center; 9 + align-items: center;
  10 + background: #fff;
  11 + border-radius: 10rpx;
  12 + margin: 12rpx;
  13 + padding: 120rpx 0;
6 } 14 }
7 15
8 .imgs { 16 .imgs {
9 - margin: 120rpx 0 20rpx 0;  
10 - border: 4rpx solid #0143a3; 17 + margin-bottom: 20rpx;
11 border-radius: 50%; 18 border-radius: 50%;
12 - width: 140rpx;  
13 - height: 140rpx;  
14 - display: flex; 19 + display: flex;
  20 + flex-direction: column;
15 align-items: center; 21 align-items: center;
16 justify-content: center; 22 justify-content: center;
17 } 23 }
18 24
19 .imgs image { 25 .imgs image {
20 - width: 140rpx;  
21 - height: 140rpx; 26 + width: 88rpx;
  27 + height: 88rpx;
  28 +}
  29 +
  30 +.imgs text {
  31 + font-weight: 600;
  32 + margin: 16rpx 0 32rpx 0;
  33 + color: #000;
22 } 34 }
23 35
24 .texts { 36 .texts {
@@ -27,20 +39,29 @@ @@ -27,20 +39,29 @@
27 margin: 0 40rpx; 39 margin: 0 40rpx;
28 color: #000000; 40 color: #000000;
29 font-family: PingFang SC; 41 font-family: PingFang SC;
30 - font-size: 32rpx;  
31 } 42 }
32 43
33 .btnBox { 44 .btnBox {
34 - width: 100%;  
35 - margin-top: 120rpx;  
36 - background: #FAFAFA;  
37 - padding: 24rpx 0 50rpx 0; 45 + position: fixed;
  46 + bottom: 0;
  47 + left: 0;
  48 + width: 100%;
  49 + background: #fff;
  50 + height: 200rpx;
  51 + display: flex;
  52 + justify-content: space-between;
  53 + align-items: center;
  54 + padding: 0 40rpx;
  55 + box-sizing: border-box;
38 } 56 }
39 57
40 .btn { 58 .btn {
41 - width: 75%; 59 + width: 90%;
42 color: #fff; 60 color: #fff;
43 - font-size: 32rpx;  
44 - border-radius: 40rpx;  
45 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 61 + border-radius: 40rpx;
  62 + height: 72rpx;
  63 + line-height: 72rpx;
  64 + position: relative;
  65 + top: -20rpx;
  66 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
46 } 67 }
1 <!--pages/customer/joinSeller.wxml--> 1 <!--pages/customer/joinSeller.wxml-->
2 <nav class="navhome" place="{{true}}">店铺信息</nav> 2 <nav class="navhome" place="{{true}}">店铺信息</nav>
3 <view class="main"> 3 <view class="main">
4 - <view class="topBox">在开始之前，请告诉我们关于您的一些信息，以方便专属客服给您提供周到的服务。</view> 4 + <view class="topBox font28r">在开始之前，请告诉我们关于您的一些信息，以方便专属客服给您提供周到的服务。</view>
5 <view class="items"> 5 <view class="items">
6 - <view class="left">店铺名称：</view>  
7 - <input type="text" class="right" model:value="{{sellername}}" placeholder="点击输入店铺名称" /> 6 + <view class="left font28r">店铺名称</view>
  7 + <input type="text" class="right font28r" model:value="{{sellername}}" placeholder="请输入您的店铺名称" />
8 </view> 8 </view>
9 <view class="items"> 9 <view class="items">
10 - <view class="left">城市选择：</view>  
11 - <picker mode="region" bindchange="bindRegionChange" value="{{region}}" style="flex:1;"> 10 + <view class="left font28r">城市选择</view>
  11 + <picker mode="region font28r" bindchange="bindRegionChange" value="{{region}}" style="flex:1;">
12 <view class="picker {{region.length>0 ? 'black-font' : 'gray-font'}}"> {{region.length>0?region[0]+region[1]+region[2]:'请选择城市'}}</view> 12 <view class="picker {{region.length>0 ? 'black-font' : 'gray-font'}}"> {{region.length>0?region[0]+region[1]+region[2]:'请选择城市'}}</view>
13 </picker> 13 </picker>
14 </view> 14 </view>
15 <view class="items"> 15 <view class="items">
16 - <view class="left">店铺地址：</view>  
17 - <view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点这里，选择店铺地图位置' : map_address}}</view> 16 + <view class="left font28r">店铺地址</view>
  17 + <view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth font28r" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点击选择店铺位置' : map_address}}</view>
18 </view> 18 </view>
19 <view class="items"> 19 <view class="items">
20 - <view class="left">联系电话：</view>  
21 - <input type="text" class="right" model:value="{{phone}}" placeholder="点击输入您的电话号码" /> 20 + <view class="left font28r">联系电话</view>
  21 + <input type="text" class="right font28r" model:value="{{phone}}" placeholder="请输入您的手机号码" />
22 </view> 22 </view>
23 <view class="items"> 23 <view class="items">
24 - <view class="left">验证码：</view>  
25 - <input type="text" class="right" model:value="{{verifyCode}}" placeholder="点击输入验证码" />  
26 - <button class="verifyBox" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>  
27 - <button class='verifyBox verifyBoxDis' wx:else>重新获取({{ countDown }})</button> 24 + <view class="left font28r">验证码</view>
  25 + <input type="text" class="right font28r" model:value="{{verifyCode}}" placeholder="点击输入验证码" />
  26 + <button class="verifyBox font28r" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>
  27 + <button class='verifyBox verifyBoxDis font28r' wx:else>{{ countDown }}</button>
28 </view> 28 </view>
29 <view class="items"> 29 <view class="items">
30 - <view class="left">联系人：</view>  
31 - <input class="right" type="text" model:value="{{rname}}" placeholder="点击输入您的姓名" /> 30 + <view class="left font28r">联系人</view>
  31 + <input class="right font28r" type="text" model:value="{{rname}}" placeholder="请输入您的姓名" />
32 </view> 32 </view>
33 <view class="info"> 33 <view class="info">
34 <view class="font28r">注：</view> 34 <view class="font28r">注：</view>
@@ -36,6 +36,6 @@ @@ -36,6 +36,6 @@
36 <view class="font28r">2、如果您需要预订餐厅包间，请直接联系商家。</view> 36 <view class="font28r">2、如果您需要预订餐厅包间，请直接联系商家。</view>
37 </view> 37 </view>
38 <view class="btnBox"> 38 <view class="btnBox">
39 - <button class="btn" bindtap="submitInfo">提交店铺注册信息</button> 39 + <button class="btn font28r" bindtap="submitInfo">提交店铺注册信息</button>
40 </view> 40 </view>
41 </view> 41 </view>
1 /* pages/customer/joinSeller.wxss */ 1 /* pages/customer/joinSeller.wxss */
  2 +page {
  3 + background: #F5F5F5;
  4 +}
  5 +
  6 +.main {
  7 + background: #fff;
  8 + border-radius: 10rpx;
  9 + margin: 12rpx;
  10 + padding: 40rpx;
  11 +}
  12 +
2 .topBox { 13 .topBox {
3 - margin: 40rpx 80rpx 40rpx 40rpx;  
4 - color: #000000; 14 + color: #000000;
  15 + margin-bottom: 40rpx;
5 font-family: PingFang SC; 16 font-family: PingFang SC;
6 - font-size: 32rpx;  
7 } 17 }
8 18
9 .items { 19 .items {
10 display: flex; 20 display: flex;
11 justify-content: space-between; 21 justify-content: space-between;
12 - margin-left: 32rpx;  
13 border-bottom: 2rpx solid #E7E7E7; 22 border-bottom: 2rpx solid #E7E7E7;
14 - padding: 24rpx 32rpx 24rpx 0; 23 + padding: 32rpx 0;
15 align-items: center; 24 align-items: center;
16 } 25 }
17 26
@@ -38,23 +47,37 @@ input::-webkit-input-placeholder { @@ -38,23 +47,37 @@ input::-webkit-input-placeholder {
38 } 47 }
39 48
40 .info { 49 .info {
41 - margin-top: 100rpx;  
42 - padding: 0 40rpx; 50 + margin-top: 40rpx;
43 line-height: 48rpx; 51 line-height: 48rpx;
44 } 52 }
45 53
  54 +.info text {
  55 + font-weight: 400;
  56 +}
  57 +
46 .btnBox { 58 .btnBox {
47 - margin: 0 40rpx;  
48 - background: #FAFAFA;  
49 - padding: 24rpx 0 50rpx 0; 59 + position: fixed;
  60 + bottom: 0;
  61 + left: 0;
  62 + width: 100%;
  63 + background: #fff;
  64 + height: 200rpx;
  65 + display: flex;
  66 + justify-content: space-between;
  67 + align-items: center;
  68 + padding: 0 40rpx;
  69 + box-sizing: border-box;
50 } 70 }
51 71
52 .btn { 72 .btn {
53 - width: 75%; 73 + width: 90%;
54 color: #fff; 74 color: #fff;
55 - font-size: 32rpx;  
56 - border-radius: 40rpx;  
57 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 75 + border-radius: 40rpx;
  76 + height: 72rpx;
  77 + line-height: 72rpx;
  78 + position: relative;
  79 + top: -20rpx;
  80 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
58 } 81 }
59 82
60 .picker { 83 .picker {
@@ -65,12 +88,16 @@ input::-webkit-input-placeholder { @@ -65,12 +88,16 @@ input::-webkit-input-placeholder {
65 margin-left: 10rpx; 88 margin-left: 10rpx;
66 height: 50rpx; 89 height: 50rpx;
67 line-height: 50rpx; 90 line-height: 50rpx;
68 - border-radius: 6rpx;  
69 - color: #fff; 91 + border-radius: 198rpx;
70 font-size: 24rpx; 92 font-size: 24rpx;
71 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 93 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  94 + -webkit-background-clip: text;
  95 + -webkit-text-fill-color: transparent;
  96 + border: 2rpx solid #fe6806;
72 } 97 }
73 98
74 .verifyBoxDis{ 99 .verifyBoxDis{
75 - background: #999; 100 + border: 2rpx solid #CBCBCB;
  101 + color: #CBCBCB;
  102 + -webkit-text-fill-color:#CBCBCB;
76 } 103 }
@@ -164,19 +164,93 @@ Page({ @@ -164,19 +164,93 @@ Page({
164 id 164 id
165 }).then(res => { 165 }).then(res => {
166 if (res.data.length > 0) { 166 if (res.data.length > 0) {
167 - let couponData = res.data[0]  
168 - couponData.use = couponData.use ? util.determine(couponData.use) : '';  
169 - couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';  
170 - if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {  
171 - let cash = couponData.use.cash * 1;  
172 - let price = couponData.price * 1;  
173 - couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : ''; 167 + let detail = res.data[0]
  168 + let data = detail.expiration_date ? util.determine(detail.expiration_date) : '';
  169 + detail.use = detail.use ? util.determine(detail.use) : '';
  170 + detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
  171 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  172 + let cash = detail.use.cash * 1;
  173 + let price = detail.price * 1;
  174 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  175 + }
  176 + detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
  177 + detail.arule = detail.arule ? util.determine(detail.arule) : '';
  178 + detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';
  179 + detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';
  180 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  181 + let cash = detail.use.cash * 1;
  182 + let price = detail.price * 1;
  183 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  184 + }
  185 + let num = detail.grant_num*1-detail.grant_last*1;
  186 + if (num > 0) {
  187 + detail.receiveNumText = ''
  188 + if (num >= 0 && num <= 100) {
  189 + detail.receiveNumText = num.toString();
  190 + } else if (num >= 101 && num <= 199) {
  191 + detail.receiveNumText = '100+';
  192 + } else if (num >= 200 && num <= 299) {
  193 + detail.receiveNumText = '200+';
  194 + } else {
  195 + detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
  196 + }
  197 + }
  198 + if(num == 0){
  199 + let str = detail.grant_num*1
  200 + detail.receiveNumText = ''
  201 + if (str >= 0 && str <= 100) {
  202 + detail.receiveNumText = str.toString();
  203 + } else if (str >= 101 && str <= 199) {
  204 + detail.receiveNumText = '100+';
  205 + } else if (str >= 200 && str <= 299) {
  206 + detail.receiveNumText = '200+';
  207 + } else {
  208 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  209 + }
  210 + }
  211 + if (detail.exp_date && detail.exp_date.week_data) {
  212 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  213 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  214 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  215 + if (mor) mor = '早餐：' + mor
  216 + if (noon) noon = '午餐：' + noon
  217 + if (nig) nig = '晚餐：' + nig
  218 + detail.morText = mor;
  219 + detail.noonText = noon;
  220 + detail.nigText = nig;
  221 + }
  222 + detail.resultCoupon = '1'; // 显示已领取
  223 + detail.cdate = detail.cdate * 1;
  224 + detail.useStime = '';
  225 + detail.useEtime = '';
  226 + let condition = detail.aexpiration
  227 + if (condition.valid_forever === '0' && condition.stime && condition.etime) {
  228 + detail.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');
  229 + detail.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');
  230 + }
  231 + if (condition.valid_forever === '1') {
  232 + detail.foreverText = '永久有效';
  233 + }
  234 + if (condition.valid_forever === '0' && condition.today) {
  235 + let obj = this.setTimeRange(detail.cdate, 0, parseInt(condition.today) - 1);
  236 + detail.useStime = obj.useStime;
  237 + detail.useEtime = obj.useEtime;
  238 + }
  239 + if (condition.valid_forever === '0' && condition.tomorrow) {
  240 + let obj = this.setTimeRange(detail.cdate, 1, condition.tomorrow * 1);
  241 + detail.useStime = obj.useStime;
  242 + detail.useEtime = obj.useEtime;
  243 + }
  244 + if (condition.valid_forever === '0' && condition.sday && condition.eday) {
  245 + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);
  246 + detail.useStime = obj.useStime;
  247 + detail.useEtime = obj.useEtime;
174 } 248 }
175 // showCoupon 代表赠送的券没过有效期 && 是开启状态 249 // showCoupon 代表赠送的券没过有效期 && 是开启状态
176 - couponData.showCoupon = (this.data.dataStr<(couponData.etime*1) && couponData.is_open=='1') ? '1' : '0';  
177 - console.log('邀请函--------------------评价赠送的优惠券',couponData); 250 + detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0';
  251 + console.log('邀请函--------------------评价赠送的优惠券',detail);
178 this.setData({ 252 this.setData({
179 - couponData:res.data[0] 253 + couponData:detail
180 }) 254 })
181 } 255 }
182 }) 256 })
@@ -3,109 +3,133 @@ @@ -3,109 +3,133 @@
3 <nav id='nav'>商家有礼</nav> 3 <nav id='nav'>商家有礼</nav>
4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
5 <view class="title" wx:if="{{options.form == '1'}}"> 5 <view class="title" wx:if="{{options.form == '1'}}">
6 - <view class="sign"></view><text class="font32r">专属优惠券</text> 6 + <view class="sign"></view><text class="font28r">专属优惠券</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 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'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="couponWrap"> 10 <view class="couponWrap">
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 - <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>  
14 - <view class="priceText" wx:if="{{item.price}}">  
15 - <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>  
16 - </view>  
17 - <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view> 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 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  14 + <view class="priceText" wx:if="{{item.price}}">
  15 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
18 </view> 16 </view>
19 - <view class="couponLine"></view>  
20 - <view class="itemRight">  
21 - <view class="btns">  
22 - <text class="font32r anameText">{{item.aname}}</text>  
23 - <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">  
24 - <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>  
25 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">  
26 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
27 - </view>  
28 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">  
29 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}  
30 - </view>  
31 - </block>  
32 - <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">  
33 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
34 - <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>  
35 - <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>  
36 - <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>  
37 - <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>  
38 - <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>  
39 - <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>  
40 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>  
41 - </block>  
42 - </view>  
43 - <view class="btnBox" wx:if="{{item.is_type == '3'}}" >  
44 - <view class="font24r orderingFood orderingFood1">已领取</view>  
45 - <view class="grantNum" wx:if="{{item.receiveNumText}}">  
46 - <view class="font24r">已被领取</view>  
47 - <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 17 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
  18 + </view>
  19 + <view class="couponLine"></view>
  20 + <view class="itemRight">
  21 + <view class="btns">
  22 + <text class="font32r anameText">{{item.aname}}</text>
  23 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  24 + <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>
  25 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  26 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
48 </view> 27 </view>
  28 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  29 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  30 + </view>
  31 + </block>
  32 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  33 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  34 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  35 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  36 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  37 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  38 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  39 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  40 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  41 + </block>
  42 + </view>
  43 + <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
  44 + <view class="font24r orderingFood orderingFood1">已领取</view>
  45 + <view class="grantNum" wx:if="{{item.receiveNumText}}">
  46 + <view class="font24r">已被领取</view>
  47 + <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
49 </view> 48 </view>
50 - <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">  
51 - 立即抢购  
52 - </view> 49 + </view>
  50 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood orderingFood2">
  51 + 抢购
53 </view> 52 </view>
54 </view> 53 </view>
  54 + </view>
55 </navigator> 55 </navigator>
56 </block> 56 </block>
57 </view> 57 </view>
58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}"> 58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}">
59 <view class="title"> 59 <view class="title">
60 - <view class="sign"></view><text class="font32r">会员充值优惠</text> 60 + <view class="sign"></view><text class="font28r">会员充值优惠</text>
61 </view> 61 </view>
62 <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"> 62 <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">
63 - <view class="rechargeItems"> 63 + <view class="couponWrap">
64 <view class="itemLeft"> 64 <view class="itemLeft">
65 - <view class="itemTop font36r">  
66 - {{recharge_data.rname}} 65 + <view class="priceText" wx:if="{{recharge_data.recharge_money}}">
  66 + <view class="icons font24r">￥</view><text class="font48r">{{recharge_data.recharge_money}}</text>
67 </view> 67 </view>
68 - <view class="itemBottom font24r" wx:if="{{priceInfo}}">  
69 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
70 - </view>  
71 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
72 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}} 68 + </view>
  69 + <view class="couponLine"></view>
  70 + <view class="itemRight">
  71 + <view class="btns">
  72 + <view class="bottom font24r" wx:if="{{priceInfo}}">
  73 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  74 + </view>
  75 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  76 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
  77 + </view>
  78 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  79 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
  80 + </view>
73 </view> 81 </view>
74 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
75 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。 82 + <view class="font24r orderingFood orderingFood2">
  83 + 充值
76 </view> 84 </view>
77 </view> 85 </view>
78 - <view class="font24r orderingFood">  
79 - 充值  
80 - </view>  
81 </view> 86 </view>
82 </navigator> 87 </navigator>
83 </view> 88 </view>
84 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据--> 89 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据-->
85 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}"> 90 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}">
86 <view class="title"> 91 <view class="title">
87 - <view class="sign"></view><text class="font32r">反馈有礼</text> 92 + <view class="sign"></view><text class="font28r">反馈有礼</text>
88 </view> 93 </view>
89 - <view class="preferentialItems" bindtap="evaluateFun"> 94 + <view class="couponWrap" bindtap="evaluateFun">
90 <view class="itemLeft"> 95 <view class="itemLeft">
91 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text> 96 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
  97 + <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
92 <view class="priceText" wx:if="{{couponData.price}}"> 98 <view class="priceText" wx:if="{{couponData.price}}">
93 - <text class="icons font40r">￥</text><text>{{couponData.price}}</text> 99 + <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text>
94 </view> 100 </view>
  101 + <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
95 </view> 102 </view>
  103 + <view class="couponLine"></view>
96 <view class="itemRight"> 104 <view class="itemRight">
97 <view class="btns"> 105 <view class="btns">
98 - <text class="font40r">{{couponData.aname}}</text>  
99 - <view class="font24r orderingFood">  
100 - 领取  
101 - </view>  
102 - </view>  
103 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>  
104 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">  
105 - 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}} 106 + <text class="font32r anameText">{{couponData.aname}}</text>
  107 + <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
  108 + <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>
  109 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  110 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  111 + </view>
  112 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  113 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  114 + </view>
  115 + </block>
  116 + <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
  117 + <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>
  118 + <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
  119 + <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>
  120 + <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
  121 + <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
  122 + <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
  123 + <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  124 + <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
  125 + </block>
106 </view> 126 </view>
107 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">  
108 - 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}} 127 + <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
  128 + <view class="font24r orderingFood">免费领取</view>
  129 + <view class="grantNum" wx:if="{{couponData.receiveNumText}}">
  130 + <view class="font24r">已被领取</view>
  131 + <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
  132 + </view>
109 </view> 133 </view>
110 </view> 134 </view>
111 </view> 135 </view>
@@ -4,31 +4,32 @@ page { @@ -4,31 +4,32 @@ page {
4 } 4 }
5 5
6 .box { 6 .box {
7 - margin: 24rpx; 7 + margin: 12rpx;
8 border-radius: 10rpx; 8 border-radius: 10rpx;
9 background: #fff; 9 background: #fff;
10 - padding: 40rpx 20rpx; 10 + padding: 12rpx;
11 margin-bottom: 24rpx; 11 margin-bottom: 24rpx;
12 } 12 }
13 13
14 .title { 14 .title {
15 display: flex; 15 display: flex;
16 align-items: center; 16 align-items: center;
17 - border-bottom: 2rpx solid #dbdbdb;  
18 padding: 0 0 12rpx 24rpx; 17 padding: 0 0 12rpx 24rpx;
19 - margin-bottom: 30rpx;  
20 } 18 }
21 19
22 .sign { 20 .sign {
23 width: 6rpx; 21 width: 6rpx;
24 height: 30rpx; 22 height: 30rpx;
25 border-radius: 16rpx; 23 border-radius: 16rpx;
26 - background: #0143a3; 24 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
27 } 25 }
28 26
29 .title text { 27 .title text {
30 margin-left: 10rpx; 28 margin-left: 10rpx;
31 - color: #000; 29 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  30 + -webkit-background-clip: text;
  31 + -webkit-text-fill-color: transparent;
  32 + font-weight: 600;
32 } 33 }
33 34
34 .couponWrap .nodate{ 35 .couponWrap .nodate{
@@ -50,7 +51,6 @@ page { @@ -50,7 +51,6 @@ page {
50 min-height: 160rpx; 51 min-height: 160rpx;
51 padding-bottom: 10rpx; 52 padding-bottom: 10rpx;
52 border-radius: 20rpx; 53 border-radius: 20rpx;
53 - border: 2rpx solid #ff7e06;  
54 } 54 }
55 55
56 56
@@ -93,7 +93,10 @@ page { @@ -93,7 +93,10 @@ page {
93 height: 44rpx; 93 height: 44rpx;
94 width: max-content; 94 width: max-content;
95 flex-shrink: 0; 95 flex-shrink: 0;
96 - background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%); 96 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  97 +}
  98 +.orderingFood2 {
  99 + width: 74rpx !important;
97 } 100 }
98 .couponWrap .icons { 101 .couponWrap .icons {
99 color: #F6231B !important; 102 color: #F6231B !important;
@@ -252,7 +255,7 @@ page { @@ -252,7 +255,7 @@ page {
252 border-radius: 20rpx; 255 border-radius: 20rpx;
253 line-height: 44rpx; 256 line-height: 44rpx;
254 height: 44rpx; 257 height: 44rpx;
255 - background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%); 258 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
256 width: max-content; 259 width: max-content;
257 flex-shrink: 0; 260 flex-shrink: 0;
258 } 261 }