xiaoe_mp_npm 1.0.12-alpha1 → 1.0.12-alpha3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/miniprogram_dist/CouponList/components/CouponItem/index.scss +122 -42
- package/miniprogram_dist/CouponList/components/CouponItem/index.wxml +4 -4
- package/miniprogram_dist/CouponList/components/CouponItem/index.wxss +468 -148
- package/miniprogram_dist/CouponReceivePopup/index.scss +6 -0
- package/miniprogram_dist/CouponReceivePopup/index.wxml +4 -3
- package/miniprogram_dist/CouponReceivePopup/index.wxss +6 -0
- package/package.json +1 -1
- package/src/CouponList/components/CouponItem/index.scss +122 -42
- package/src/CouponList/components/CouponItem/index.wxml +4 -4
- package/src/CouponList/components/CouponItem/index.wxss +1 -1
- package/src/CouponReceivePopup/index.scss +6 -0
- package/src/CouponReceivePopup/index.wxml +4 -3
- package/src/CouponReceivePopup/index.wxss +1 -1
|
@@ -19,15 +19,19 @@ $deviceWidth: 750;
|
|
|
19
19
|
flex-direction: column;
|
|
20
20
|
position: relative;
|
|
21
21
|
width: 100%;
|
|
22
|
-
min-height: vmin(
|
|
23
|
-
background
|
|
22
|
+
min-height: vmin(320);
|
|
23
|
+
background: none !important;
|
|
24
24
|
.couponValue {
|
|
25
25
|
padding: vmin(40) vmin(16) vmin(16) vmin(16);
|
|
26
|
-
width:
|
|
27
|
-
height: vmin(
|
|
26
|
+
width: 98%;
|
|
27
|
+
height: vmin(140);
|
|
28
28
|
background: rgba(255, 120, 31, 1);
|
|
29
29
|
color: #fff;
|
|
30
30
|
border-radius: vmin(16) vmin(16) 0 0;
|
|
31
|
+
margin: 0;
|
|
32
|
+
.couponUseCondition{
|
|
33
|
+
color: #fff;
|
|
34
|
+
}
|
|
31
35
|
}
|
|
32
36
|
|
|
33
37
|
.couponInfo {
|
|
@@ -35,6 +39,7 @@ $deviceWidth: 750;
|
|
|
35
39
|
background: rgba(255, 255, 255, 1);
|
|
36
40
|
padding: vmin(16) vmin(16) vmin(30) vmin(16);
|
|
37
41
|
border-radius: 0 0 vmin(16) vmin(16);
|
|
42
|
+
margin: 0;
|
|
38
43
|
|
|
39
44
|
.couponName {
|
|
40
45
|
height: vmin(32);
|
|
@@ -68,11 +73,10 @@ $deviceWidth: 750;
|
|
|
68
73
|
}
|
|
69
74
|
}
|
|
70
75
|
}
|
|
71
|
-
|
|
72
76
|
}
|
|
73
77
|
|
|
74
78
|
&.vertical-screen {
|
|
75
|
-
width: vmin(
|
|
79
|
+
width: vmin(476);
|
|
76
80
|
margin: 0 auto;
|
|
77
81
|
|
|
78
82
|
&.not-pop-card {
|
|
@@ -80,7 +84,46 @@ $deviceWidth: 750;
|
|
|
80
84
|
}
|
|
81
85
|
|
|
82
86
|
.coupon_style1 {
|
|
83
|
-
height: vmin(
|
|
87
|
+
height: vmin(176);
|
|
88
|
+
width: vmin(476);
|
|
89
|
+
background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lwho4h4o0bls.png') center no-repeat !important;
|
|
90
|
+
.couponValue {
|
|
91
|
+
width: vmin(192);
|
|
92
|
+
margin-left: 1vmin;
|
|
93
|
+
box-sizing: border-box;
|
|
94
|
+
padding: 0 .4vmin;
|
|
95
|
+
.couponPriceWrap{
|
|
96
|
+
margin-top: -1.6vmin;
|
|
97
|
+
}
|
|
98
|
+
.coupon-price-long{
|
|
99
|
+
margin-top: 1vmin;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
.couponName {
|
|
103
|
+
font-size: vmin(24) !important;
|
|
104
|
+
}
|
|
105
|
+
.couponInfo {
|
|
106
|
+
height: vmin(170);
|
|
107
|
+
justify-content: flex-start;
|
|
108
|
+
overflow: hidden;
|
|
109
|
+
padding: vmin(16) vmin(22) vmin(16) vmin(26);
|
|
110
|
+
}
|
|
111
|
+
.couponState {
|
|
112
|
+
position: absolute;
|
|
113
|
+
right: vmin(12);
|
|
114
|
+
top: 90%;
|
|
115
|
+
transform: translateY(-90%);
|
|
116
|
+
height: vmin(38);
|
|
117
|
+
line-height: vmin(38);
|
|
118
|
+
background: #FF5429;
|
|
119
|
+
border-radius: vmin(38);
|
|
120
|
+
text-align: center;
|
|
121
|
+
color: #fff;
|
|
122
|
+
border: none;
|
|
123
|
+
cursor: pointer;
|
|
124
|
+
font-size: vmin(24);
|
|
125
|
+
font-weight: 500;
|
|
126
|
+
}
|
|
84
127
|
}
|
|
85
128
|
}
|
|
86
129
|
|
|
@@ -95,6 +138,7 @@ $deviceWidth: 750;
|
|
|
95
138
|
|
|
96
139
|
.coupon_style1 {
|
|
97
140
|
display: flex;
|
|
141
|
+
align-items: center;
|
|
98
142
|
position: relative;
|
|
99
143
|
width: 100%;
|
|
100
144
|
background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lw67cw3y0qse.png') center no-repeat;
|
|
@@ -114,6 +158,17 @@ $deviceWidth: 750;
|
|
|
114
158
|
font-size: vmin(36);
|
|
115
159
|
font-weight: 500;
|
|
116
160
|
}
|
|
161
|
+
.giftCouponTitle{
|
|
162
|
+
font-size: vmin(32);
|
|
163
|
+
font-weight: 500;
|
|
164
|
+
overflow: hidden;
|
|
165
|
+
text-overflow: ellipsis;
|
|
166
|
+
display: -webkit-box;
|
|
167
|
+
-webkit-line-clamp: 2;
|
|
168
|
+
-webkit-box-orient: vertical;
|
|
169
|
+
text-align: center;
|
|
170
|
+
|
|
171
|
+
}
|
|
117
172
|
.couponPriceWrap {
|
|
118
173
|
position: relative;
|
|
119
174
|
display: flex;
|
|
@@ -122,7 +177,7 @@ $deviceWidth: 750;
|
|
|
122
177
|
font-weight: 600;
|
|
123
178
|
|
|
124
179
|
.coupon-symbol {
|
|
125
|
-
margin-right: vmin(4);
|
|
180
|
+
// margin-right: vmin(4);
|
|
126
181
|
font-size: vmin(32);
|
|
127
182
|
}
|
|
128
183
|
|
|
@@ -136,7 +191,10 @@ $deviceWidth: 750;
|
|
|
136
191
|
font-weight: 500;
|
|
137
192
|
}
|
|
138
193
|
}
|
|
139
|
-
|
|
194
|
+
.discount-percent {
|
|
195
|
+
margin-top: -2vmin;
|
|
196
|
+
padding-top: vmin(6) !important;
|
|
197
|
+
}
|
|
140
198
|
.couponUseCondition {
|
|
141
199
|
color: #FF5429;
|
|
142
200
|
font-size: vmin(24);
|
|
@@ -149,14 +207,15 @@ $deviceWidth: 750;
|
|
|
149
207
|
}
|
|
150
208
|
|
|
151
209
|
.couponInfo {
|
|
210
|
+
flex: 1;
|
|
152
211
|
position: relative;
|
|
153
212
|
display: flex;
|
|
154
213
|
flex-direction: column;
|
|
155
214
|
justify-content: space-around;
|
|
156
|
-
max-width: vmin(340);
|
|
215
|
+
// max-width: vmin(340);
|
|
157
216
|
height: 100%;
|
|
158
217
|
box-sizing: border-box;
|
|
159
|
-
padding: vmin(16) 0 vmin(16) vmin(
|
|
218
|
+
padding: vmin(16) 0 vmin(16) vmin(20);
|
|
160
219
|
color: #999999;
|
|
161
220
|
font-size: vmin(20);
|
|
162
221
|
line-height: vmin(24);
|
|
@@ -166,14 +225,13 @@ $deviceWidth: 750;
|
|
|
166
225
|
.couponName {
|
|
167
226
|
width: 100%;
|
|
168
227
|
line-height: vmin(40);
|
|
169
|
-
overflow: hidden;
|
|
170
|
-
text-overflow: ellipsis;
|
|
171
|
-
margin-bottom: 2.13vmin;
|
|
172
228
|
color: #333333;
|
|
173
229
|
font-size: vmin(28);
|
|
174
230
|
font-weight: 500;
|
|
231
|
+
overflow: hidden;
|
|
232
|
+
text-overflow: ellipsis;
|
|
175
233
|
display: -webkit-box;
|
|
176
|
-
-webkit-line-clamp:
|
|
234
|
+
-webkit-line-clamp: 1;
|
|
177
235
|
-webkit-box-orient: vertical;
|
|
178
236
|
}
|
|
179
237
|
.moreCouponInfo{
|
|
@@ -205,11 +263,6 @@ $deviceWidth: 750;
|
|
|
205
263
|
}
|
|
206
264
|
|
|
207
265
|
.couponState {
|
|
208
|
-
position: absolute;
|
|
209
|
-
right: vmin(16);
|
|
210
|
-
top: 50%;
|
|
211
|
-
transform: translateY(-50%);
|
|
212
|
-
// width: vmin(100);
|
|
213
266
|
height: vmin(48);
|
|
214
267
|
line-height: vmin(48);
|
|
215
268
|
background: #FF5429;
|
|
@@ -218,19 +271,20 @@ $deviceWidth: 750;
|
|
|
218
271
|
color: #fff;
|
|
219
272
|
border: none;
|
|
220
273
|
cursor: pointer;
|
|
274
|
+
margin-right: vmin(10);
|
|
221
275
|
|
|
222
276
|
&.fullscreen-btn {
|
|
223
277
|
width: vmin(136);
|
|
224
278
|
}
|
|
225
279
|
|
|
226
280
|
&.vertical-btn {
|
|
227
|
-
width: vmin(
|
|
281
|
+
width: vmin(106);
|
|
228
282
|
}
|
|
229
283
|
|
|
230
284
|
.couponBtn {
|
|
231
285
|
color: rgba(255, 255, 255, 1);
|
|
232
286
|
font-size: vmin(24);
|
|
233
|
-
font-weight:
|
|
287
|
+
font-weight: 500;
|
|
234
288
|
text-align: center;
|
|
235
289
|
font-family: "PingFang SC";
|
|
236
290
|
}
|
|
@@ -433,17 +487,44 @@ $deviceWidth: 750;
|
|
|
433
487
|
|
|
434
488
|
@mixin styleType1_wrapper-v {
|
|
435
489
|
&.vertical-screen {
|
|
436
|
-
width: vmin(
|
|
437
|
-
height: vmin(
|
|
490
|
+
width: vmin(476);
|
|
491
|
+
height: vmin(176);
|
|
438
492
|
margin: 0 auto;
|
|
439
493
|
|
|
440
494
|
&.not-pop-card {
|
|
441
|
-
width: vmin(
|
|
495
|
+
width: vmin(476);
|
|
442
496
|
margin-bottom: 0;
|
|
443
497
|
}
|
|
444
498
|
|
|
445
499
|
.coupon_style1 {
|
|
446
|
-
height: vmin(
|
|
500
|
+
height: vmin(176);
|
|
501
|
+
background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lwho4h4o0bls.png') center no-repeat !important;
|
|
502
|
+
.couponValue {
|
|
503
|
+
width: vmin(190);
|
|
504
|
+
}
|
|
505
|
+
.couponName {
|
|
506
|
+
font-size: vmin(24) !important;
|
|
507
|
+
}
|
|
508
|
+
.couponInfo {
|
|
509
|
+
justify-content: flex-start;
|
|
510
|
+
padding: vmin(16) vmin(22) vmin(16) vmin(26);
|
|
511
|
+
}
|
|
512
|
+
.couponState {
|
|
513
|
+
position: absolute;
|
|
514
|
+
right: vmin(12);
|
|
515
|
+
top: 90%;
|
|
516
|
+
transform: translateY(-90%);
|
|
517
|
+
height: vmin(38);
|
|
518
|
+
line-height: vmin(38);
|
|
519
|
+
background: #FF5429;
|
|
520
|
+
border-radius: vmin(38);
|
|
521
|
+
text-align: center;
|
|
522
|
+
color: #fff;
|
|
523
|
+
border: none;
|
|
524
|
+
cursor: pointer;
|
|
525
|
+
font-size: vmin(24);
|
|
526
|
+
font-weight: 500;
|
|
527
|
+
}
|
|
447
528
|
}
|
|
448
529
|
}
|
|
449
530
|
|
|
@@ -458,6 +539,7 @@ $deviceWidth: 750;
|
|
|
458
539
|
|
|
459
540
|
.coupon_style1 {
|
|
460
541
|
display: flex;
|
|
542
|
+
align-items: center;
|
|
461
543
|
position: relative;
|
|
462
544
|
width: 100%;
|
|
463
545
|
background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lw67cw3y0qse.png') center no-repeat;
|
|
@@ -495,6 +577,9 @@ $deviceWidth: 750;
|
|
|
495
577
|
align-items: baseline;
|
|
496
578
|
font-weight: 500;
|
|
497
579
|
font-size: vmin(64) !important;
|
|
580
|
+
&.discount-percent {
|
|
581
|
+
margin-top: -1vmin;
|
|
582
|
+
}
|
|
498
583
|
}
|
|
499
584
|
|
|
500
585
|
.coupon-price-long {
|
|
@@ -527,11 +612,13 @@ $deviceWidth: 750;
|
|
|
527
612
|
}
|
|
528
613
|
|
|
529
614
|
.couponInfo {
|
|
615
|
+
flex: 1;
|
|
530
616
|
display: flex;
|
|
531
617
|
flex-direction: column;
|
|
532
618
|
justify-content: flex-start;
|
|
533
|
-
width: 100%;
|
|
534
|
-
height: vmin(192);
|
|
619
|
+
// width: 100%;
|
|
620
|
+
// height: vmin(192);
|
|
621
|
+
height: 100%;
|
|
535
622
|
box-sizing: border-box;
|
|
536
623
|
padding: vmin(16);
|
|
537
624
|
color: #999999;
|
|
@@ -541,18 +628,15 @@ $deviceWidth: 750;
|
|
|
541
628
|
text-align: left;
|
|
542
629
|
|
|
543
630
|
.couponName {
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
width: vmin(232);
|
|
631
|
+
width: 100%;
|
|
632
|
+
line-height: vmin(40);
|
|
633
|
+
color: #333333;
|
|
634
|
+
font-size: vmin(28);
|
|
549
635
|
font-weight: 500;
|
|
550
|
-
margin-bottom: vmin(8);
|
|
551
636
|
overflow: hidden;
|
|
552
|
-
// white-space: nowrap;
|
|
553
637
|
text-overflow: ellipsis;
|
|
554
638
|
display: -webkit-box;
|
|
555
|
-
-webkit-line-clamp:
|
|
639
|
+
-webkit-line-clamp: 1;
|
|
556
640
|
-webkit-box-orient: vertical;
|
|
557
641
|
}
|
|
558
642
|
|
|
@@ -566,11 +650,6 @@ $deviceWidth: 750;
|
|
|
566
650
|
}
|
|
567
651
|
|
|
568
652
|
.couponState {
|
|
569
|
-
position: absolute;
|
|
570
|
-
right: vmin(16);
|
|
571
|
-
top: 50%;
|
|
572
|
-
transform: translateY(-50%);
|
|
573
|
-
// width: vmin(100);
|
|
574
653
|
height: vmin(48);
|
|
575
654
|
line-height: vmin(48);
|
|
576
655
|
background: #FF5429;
|
|
@@ -579,12 +658,13 @@ $deviceWidth: 750;
|
|
|
579
658
|
color: #fff;
|
|
580
659
|
border: none;
|
|
581
660
|
cursor: pointer;
|
|
661
|
+
margin-right: vmin(10);
|
|
582
662
|
|
|
583
663
|
// &.fullscreen-btn {
|
|
584
664
|
// width: vmin(136);
|
|
585
665
|
// }
|
|
586
666
|
&.vertical-btn {
|
|
587
|
-
width: vmin(
|
|
667
|
+
width: vmin(106);
|
|
588
668
|
}
|
|
589
669
|
|
|
590
670
|
.couponBtn {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<view wx:else class="couponValue">
|
|
13
13
|
<view class="couponPriceWrap {{item.discount_way == 2 && aliveMode?'couponPriceWrap-discount-v':''}}">
|
|
14
14
|
<!-- discount_way优惠方式 1-满减券 2-折扣券 -->
|
|
15
|
-
<block wx:if="{{item.discount_way == 1}}">
|
|
15
|
+
<block wx:if="{{item.discount_way == 1}}" >
|
|
16
16
|
<view class="coupon-symbol">￥</view>
|
|
17
17
|
<view style="font-size: {{isLongNumStyle1}}" class="coupon-price {{isVerLongNumStyle1?'coupon-price-long':''}}" >
|
|
18
18
|
<view>{{price.ToFilter(item.price)}}</view>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
</view>
|
|
21
21
|
</block>
|
|
22
22
|
<block wx:if="{{item.discount_way == 2}}">
|
|
23
|
-
<view class="coupon-price">
|
|
23
|
+
<view class="coupon-price discount-percent">
|
|
24
24
|
<view>{{price.ToFilter(item.discount_percent, false)}}</view>
|
|
25
25
|
<view wx:if="{{item.discount_percent % 10 != 0 && !aliveMode}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>
|
|
26
26
|
</view>
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
</block>
|
|
31
31
|
</view>
|
|
32
32
|
<view wx:if="{{item.require_price == 0}}"
|
|
33
|
-
class="couponUseCondition">无门槛</view>
|
|
33
|
+
class="couponUseCondition {{item.discount_way == 2 ? 'discount-percent':''}}">无门槛</view>
|
|
34
34
|
<view wx:if="{{item.require_price != 0}}"
|
|
35
|
-
class="couponUseCondition">
|
|
35
|
+
class="couponUseCondition {{item.discount_way == 2 ? 'discount-percent':''}}">
|
|
36
36
|
满{{item.require_price / 100}}元可用
|
|
37
37
|
</view>
|
|
38
38
|
</view>
|