xiaoe_mp_npm 0.5.26-alpha5 → 0.5.26-alpha6

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.
Files changed (9) hide show
  1. package/miniprogram_dist/CouponList/components/CouponItem/index.js +9 -9
  2. package/miniprogram_dist/CouponList/components/CouponItem/index.scss +12 -2
  3. package/miniprogram_dist/CouponList/components/CouponItem/index.wxml +6 -10
  4. package/miniprogram_dist/CouponList/components/CouponItem/index.wxss +10 -2
  5. package/package.json +1 -1
  6. package/src/CouponList/components/CouponItem/index.js +9 -9
  7. package/src/CouponList/components/CouponItem/index.scss +12 -2
  8. package/src/CouponList/components/CouponItem/index.wxml +6 -10
  9. package/src/CouponList/components/CouponItem/index.wxss +12 -2
package/miniprogram_dist/CouponList/components/CouponItem/index.js CHANGED
@@ -97,15 +97,15 @@ Component({
97
97
  }
98
98
  },
99
99
  // 判断金额长度，不同金额区间端显示不同样式(竖屏互动页优惠券样式)
100
- // isVerLongNumStyle1(data) {
101
- // if (data.item && data.item.price) {
102
- // let tempPrice = data.item.price / 100;
103
- // if (tempPrice.toString().length >=6 ) {
104
- // return true
105
- // }
106
- // }
107
- // return false
108
- // },
100
+ isVerLongNumStyle1(data) {
101
+ if (data.item && data.item.price) {
102
+ let tempPrice = data.item.price / 100;
103
+ if (tempPrice.toString().length >=6 ) {
104
+ return true
105
+ }
106
+ }
107
+ return false
108
+ },
109
109
  // 格式化使用说明
110
110
  getDesInfo (data) {
111
111
  if (!data.item.instructions) {
package/miniprogram_dist/CouponList/components/CouponItem/index.scss CHANGED
@@ -422,18 +422,28 @@ $deviceWidth: 750;
422
422
 
423
423
  .coupon-price {
424
424
  display: flex;
425
+ align-items: baseline;
425
426
  font-weight: 500;
426
- font-size: vmin(64);
427
+ font-size: vmin(64) !important;
427
428
  }
428
429
 
429
430
  .coupon-price-long {
430
- font-size: vmin(48);
431
+ font-size: vmin(48) !important;
431
432
  }
432
433
 
433
434
  .discountFont {
434
435
  font-size: vmin(32);
435
436
  font-weight: 500;
436
437
  }
438
+
439
+ .discount-decimal{
440
+ display: flex;
441
+ align-items: center;
442
+ }
443
+
444
+ &.couponPriceWrap-discount-v{
445
+ align-items: baseline;
446
+ }
437
447
  }
438
448
 
439
449
  .couponUseCondition {
package/miniprogram_dist/CouponList/components/CouponItem/index.wxml CHANGED
@@ -3,27 +3,23 @@
3
3
  <view class="styleType1_wrapper {{aliveMode? 'styleType1_wrapper-v' : ''}} {{ isFullScreenPopCard? 'pop-card' : 'not-pop-card'}} {{isFullscreenList ? 'full-screen-list' : 'vertical-screen'}}" wx:if="{{styleType === 1}}">
4
4
  <view class="coupon_style1">
5
5
  <view class="couponValue">
6
- <view class="couponPriceWrap">
6
+ <view class="couponPriceWrap {{item.discount_way == 2 && aliveMode?'couponPriceWrap-discount-v':''}}">
7
7
  <!-- discount_way优惠方式 1-满减券 2-折扣券 -->
8
8
  <block wx:if="{{item.discount_way == 1}}">
9
9
  <view class="coupon-symbol">￥</view>
10
- <!-- 竖屏卡片 -->
11
- <view class="coupon-price">
10
+ <view style="font-size: {{isLongNumStyle1}}" class="coupon-price {{isVerLongNumStyle1?'coupon-price-long':''}}" >
12
11
  <view>{{price.ToFilter(item.price)}}</view>
13
12
  <view wx:if="{{item.price % 100 != 0}}">.{{ price.fixedFont(item.price) }}</view>
14
13
  </view>
15
- <!-- 横屏卡片 -->
16
- <!-- <view wx:elif style="font-size: {{isLongNumStyle1}}" class="coupon-price" >
17
- <view>{{price.ToFilter(item.price)}}</view>
18
- <view wx:if="{{item.price % 100 != 0}}">.{{ price.fixedFont(item.price) }}</view>
19
- </view> -->
20
14
  </block>
21
15
  <block wx:if="{{item.discount_way == 2}}">
22
16
  <view class="coupon-price">
23
17
  <view>{{price.ToFilter(item.discount_percent, false)}}</view>
24
- <view wx:if="{{item.discount_percent % 10 != 0}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>
18
+ <view wx:if="{{item.discount_percent % 10 != 0 && !aliveMode}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>
19
+ </view>
20
+ <view class="discountFont {{aliveMode?'discount-decimal':''}}">
21
+ <view wx:if="{{item.discount_percent % 10 != 0 && aliveMode}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>折
25
22
  </view>
26
- <view class="discountFont">折</view>
27
23
  </block>
28
24
  </view>
29
25
  <view wx:if="{{item.require_price == 0}}"
package/miniprogram_dist/CouponList/components/CouponItem/index.wxss CHANGED
@@ -344,16 +344,24 @@
344
344
  }
345
345
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .coupon-price {
346
346
  display: flex;
347
+ align-items: baseline;
347
348
  font-weight: 500;
348
- font-size: 8.53333vmin;
349
+ font-size: 8.53333vmin !important;
349
350
  }
350
351
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .coupon-price-long {
351
- font-size: 6.4vmin;
352
+ font-size: 6.4vmin !important;
352
353
  }
353
354
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .discountFont {
354
355
  font-size: 4.26667vmin;
355
356
  font-weight: 500;
356
357
  }
358
+ .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .discount-decimal {
359
+ display: flex;
360
+ align-items: center;
361
+ }
362
+ .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap.couponPriceWrap-discount-v {
363
+ align-items: baseline;
364
+ }
357
365
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponUseCondition {
358
366
  color: white;
359
367
  font-size: 3.2vmin;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "0.5.26-alpha5",
3
+ "version": "0.5.26-alpha6",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/CouponList/components/CouponItem/index.js CHANGED
@@ -97,15 +97,15 @@ Component({
97
97
  }
98
98
  },
99
99
  // 判断金额长度，不同金额区间端显示不同样式(竖屏互动页优惠券样式)
100
- // isVerLongNumStyle1(data) {
101
- // if (data.item && data.item.price) {
102
- // let tempPrice = data.item.price / 100;
103
- // if (tempPrice.toString().length >=6 ) {
104
- // return true
105
- // }
106
- // }
107
- // return false
108
- // },
100
+ isVerLongNumStyle1(data) {
101
+ if (data.item && data.item.price) {
102
+ let tempPrice = data.item.price / 100;
103
+ if (tempPrice.toString().length >=6 ) {
104
+ return true
105
+ }
106
+ }
107
+ return false
108
+ },
109
109
  // 格式化使用说明
110
110
  getDesInfo (data) {
111
111
  if (!data.item.instructions) {
package/src/CouponList/components/CouponItem/index.scss CHANGED
@@ -422,18 +422,28 @@ $deviceWidth: 750;
422
422
 
423
423
  .coupon-price {
424
424
  display: flex;
425
+ align-items: baseline;
425
426
  font-weight: 500;
426
- font-size: vmin(64);
427
+ font-size: vmin(64) !important;
427
428
  }
428
429
 
429
430
  .coupon-price-long {
430
- font-size: vmin(48);
431
+ font-size: vmin(48) !important;
431
432
  }
432
433
 
433
434
  .discountFont {
434
435
  font-size: vmin(32);
435
436
  font-weight: 500;
436
437
  }
438
+
439
+ .discount-decimal{
440
+ display: flex;
441
+ align-items: center;
442
+ }
443
+
444
+ &.couponPriceWrap-discount-v{
445
+ align-items: baseline;
446
+ }
437
447
  }
438
448
 
439
449
  .couponUseCondition {
package/src/CouponList/components/CouponItem/index.wxml CHANGED
@@ -3,27 +3,23 @@
3
3
  <view class="styleType1_wrapper {{aliveMode? 'styleType1_wrapper-v' : ''}} {{ isFullScreenPopCard? 'pop-card' : 'not-pop-card'}} {{isFullscreenList ? 'full-screen-list' : 'vertical-screen'}}" wx:if="{{styleType === 1}}">
4
4
  <view class="coupon_style1">
5
5
  <view class="couponValue">
6
- <view class="couponPriceWrap">
6
+ <view class="couponPriceWrap {{item.discount_way == 2 && aliveMode?'couponPriceWrap-discount-v':''}}">
7
7
  <!-- discount_way优惠方式 1-满减券 2-折扣券 -->
8
8
  <block wx:if="{{item.discount_way == 1}}">
9
9
  <view class="coupon-symbol">￥</view>
10
- <!-- 竖屏卡片 -->
11
- <view class="coupon-price">
10
+ <view style="font-size: {{isLongNumStyle1}}" class="coupon-price {{isVerLongNumStyle1?'coupon-price-long':''}}" >
12
11
  <view>{{price.ToFilter(item.price)}}</view>
13
12
  <view wx:if="{{item.price % 100 != 0}}">.{{ price.fixedFont(item.price) }}</view>
14
13
  </view>
15
- <!-- 横屏卡片 -->
16
- <!-- <view wx:elif style="font-size: {{isLongNumStyle1}}" class="coupon-price" >
17
- <view>{{price.ToFilter(item.price)}}</view>
18
- <view wx:if="{{item.price % 100 != 0}}">.{{ price.fixedFont(item.price) }}</view>
19
- </view> -->
20
14
  </block>
21
15
  <block wx:if="{{item.discount_way == 2}}">
22
16
  <view class="coupon-price">
23
17
  <view>{{price.ToFilter(item.discount_percent, false)}}</view>
24
- <view wx:if="{{item.discount_percent % 10 != 0}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>
18
+ <view wx:if="{{item.discount_percent % 10 != 0 && !aliveMode}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>
19
+ </view>
20
+ <view class="discountFont {{aliveMode?'discount-decimal':''}}">
21
+ <view wx:if="{{item.discount_percent % 10 != 0 && aliveMode}}">.{{ price.fixedFont(item.discount_percent, false) }}</view>折
25
22
  </view>
26
- <view class="discountFont">折</view>
27
23
  </block>
28
24
  </view>
29
25
  <view wx:if="{{item.require_price == 0}}"
package/src/CouponList/components/CouponItem/index.wxss CHANGED
@@ -403,12 +403,13 @@
403
403
 
404
404
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .coupon-price {
405
405
  display: flex;
406
+ align-items: baseline;
406
407
  font-weight: 500;
407
- font-size: 8.53333vmin;
408
+ font-size: 8.53333vmin !important;
408
409
  }
409
410
 
410
411
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .coupon-price-long {
411
- font-size: 6.4vmin;
412
+ font-size: 6.4vmin !important;
412
413
  }
413
414
 
414
415
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .discountFont {
@@ -416,6 +417,15 @@
416
417
  font-weight: 500;
417
418
  }
418
419
 
420
+ .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap .discount-decimal {
421
+ display: flex;
422
+ align-items: center;
423
+ }
424
+
425
+ .styleType1_wrapper-v .coupon_style1 .couponValue .couponPriceWrap.couponPriceWrap-discount-v {
426
+ align-items: baseline;
427
+ }
428
+
419
429
  .styleType1_wrapper-v .coupon_style1 .couponValue .couponUseCondition {
420
430
  color: white;
421
431
  font-size: 3.2vmin;