xiaoe_mp_npm 1.0.0-live7 → 1.0.0-live8

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 (13) hide show
  1. package/miniprogram_dist/Task/TaskIcon/index.js +5 -1
  2. package/miniprogram_dist/Task/TaskIcon/index.wxml +1 -1
  3. package/miniprogram_dist/Task/taskReceivePopup/coupon/index.scss +7 -0
  4. package/miniprogram_dist/Task/taskReceivePopup/coupon/index.wxml +10 -3
  5. package/miniprogram_dist/Task/taskReceivePopup/coupon/index.wxss +21 -0
  6. package/miniprogram_dist/Task/taskReceivePopup/index.wxml +1 -1
  7. package/package.json +1 -1
  8. package/src/Task/TaskIcon/index.js +5 -1
  9. package/src/Task/TaskIcon/index.wxml +1 -1
  10. package/src/Task/taskReceivePopup/coupon/index.scss +7 -0
  11. package/src/Task/taskReceivePopup/coupon/index.wxml +10 -3
  12. package/src/Task/taskReceivePopup/coupon/index.wxss +1 -1
  13. package/src/Task/taskReceivePopup/index.wxml +1 -1
package/miniprogram_dist/Task/TaskIcon/index.js CHANGED
@@ -6,7 +6,11 @@ Component({
6
6
  aliveMode:{
7
7
  type: Number,
8
8
  value: 1
9
- }
9
+ },
10
+ iconText:{
11
+ type: String,
12
+ value: '得奖励'
13
+ },
10
14
  },
11
15
 
12
16
  /**
package/miniprogram_dist/Task/TaskIcon/index.wxml CHANGED
@@ -1,5 +1,5 @@
1
1
  <view class="taskIcon {{aliveMode === 1? 'verticalStyle' : ''}}" catch:tap="iconClick">
2
2
  <view class="task-icon" />
3
- <view class="task-text">得奖励</view>
3
+ <view class="task-text">{{iconText}}</view>
4
4
  </view>
5
5
 
package/miniprogram_dist/Task/taskReceivePopup/coupon/index.scss CHANGED
@@ -35,6 +35,13 @@ $deviceWidth: 750;
35
35
  font-size: vmin(80);
36
36
  line-height: vmin(80);
37
37
  }
38
+ .discountFont{
39
+ color: #fd2b54;
40
+ font-size: vmin(32);
41
+ line-height: vmin(32);
42
+ margin-left: vmin(4);
43
+ font-weight: 600;
44
+ }
38
45
  }
39
46
  &__content-describe {
40
47
  color: #333333;
package/miniprogram_dist/Task/taskReceivePopup/coupon/index.wxml CHANGED
@@ -10,9 +10,16 @@
10
10
  <view class="receive-container">
11
11
  <view class="receive-container__content">
12
12
  <view class="receive-container__content-price">
13
- <text class="smallIcon">¥</text>
14
- <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
15
- <text class="smallIcon" wx:if="{{isShowPoint}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
13
+ <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
14
+ <text class="smallIcon">¥</text>
15
+ <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
16
+ <text class="smallIcon" wx:if="{{isShowPoint}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
17
+ </view>
18
+ <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
19
+ <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
20
+ <text class="boldIcon" wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
21
+ <text class="discountFont">折</text>
22
+ </text>
16
23
  </view>
17
24
  <view class="receive-container__content-describe">
18
25
  <!-- 无门槛 -->
package/miniprogram_dist/Task/taskReceivePopup/coupon/index.wxss CHANGED
@@ -30,6 +30,13 @@
30
30
  font-size: 10.66667vmin;
31
31
  line-height: 10.66667vmin;
32
32
  }
33
+ .coupon-receive-popup .receive-container__content-price .discountFont {
34
+ color: #fd2b54;
35
+ font-size: 4.26667vmin;
36
+ line-height: 4.26667vmin;
37
+ margin-left: 0.53333vmin;
38
+ font-weight: 600;
39
+ }
33
40
  .coupon-receive-popup .receive-container__content-describe {
34
41
  color: #333333;
35
42
  font-size: 3.73333vmin;
@@ -85,6 +92,13 @@
85
92
  font-size: 5.20833vmin;
86
93
  line-height: 5.20833vmin;
87
94
  }
95
+ .coupon-receive-popup .receive-container__content-price .discountFont {
96
+ color: #fd2b54;
97
+ font-size: 2.08333vmin;
98
+ line-height: 2.08333vmin;
99
+ margin-left: 0.26042vmin;
100
+ font-weight: 600;
101
+ }
88
102
  .coupon-receive-popup .receive-container__content-describe {
89
103
  color: #333333;
90
104
  font-size: 1.82292vmin;
@@ -141,6 +155,13 @@
141
155
  font-size: 5.20833vmin;
142
156
  line-height: 5.20833vmin;
143
157
  }
158
+ .coupon-receive-popup .receive-container__content-price .discountFont {
159
+ color: #fd2b54;
160
+ font-size: 2.08333vmin;
161
+ line-height: 2.08333vmin;
162
+ margin-left: 0.26042vmin;
163
+ font-weight: 600;
164
+ }
144
165
  .coupon-receive-popup .receive-container__content-describe {
145
166
  color: #333333;
146
167
  font-size: 1.82292vmin;
package/miniprogram_dist/Task/taskReceivePopup/index.wxml CHANGED
@@ -10,7 +10,7 @@
10
10
  <coupon-popup
11
11
  rewardData="{{rewardData}}"
12
12
  showCouponReceivePopup="{{rewardData.live_task.reward_type === 2}}"
13
- isFullScreen="{{isFullcreen}}"
13
+ isFullScreen="{{isFullScreen}}"
14
14
  bind:close="handleClose"
15
15
  ></coupon-popup>
16
16
  </view>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.0-live7",
3
+ "version": "1.0.0-live8",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/Task/TaskIcon/index.js CHANGED
@@ -6,7 +6,11 @@ Component({
6
6
  aliveMode:{
7
7
  type: Number,
8
8
  value: 1
9
- }
9
+ },
10
+ iconText:{
11
+ type: String,
12
+ value: '得奖励'
13
+ },
10
14
  },
11
15
 
12
16
  /**
package/src/Task/TaskIcon/index.wxml CHANGED
@@ -1,5 +1,5 @@
1
1
  <view class="taskIcon {{aliveMode === 1? 'verticalStyle' : ''}}" catch:tap="iconClick">
2
2
  <view class="task-icon" />
3
- <view class="task-text">得奖励</view>
3
+ <view class="task-text">{{iconText}}</view>
4
4
  </view>
5
5
 
package/src/Task/taskReceivePopup/coupon/index.scss CHANGED
@@ -35,6 +35,13 @@ $deviceWidth: 750;
35
35
  font-size: vmin(80);
36
36
  line-height: vmin(80);
37
37
  }
38
+ .discountFont{
39
+ color: #fd2b54;
40
+ font-size: vmin(32);
41
+ line-height: vmin(32);
42
+ margin-left: vmin(4);
43
+ font-weight: 600;
44
+ }
38
45
  }
39
46
  &__content-describe {
40
47
  color: #333333;
package/src/Task/taskReceivePopup/coupon/index.wxml CHANGED
@@ -10,9 +10,16 @@
10
10
  <view class="receive-container">
11
11
  <view class="receive-container__content">
12
12
  <view class="receive-container__content-price">
13
- <text class="smallIcon">¥</text>
14
- <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
15
- <text class="smallIcon" wx:if="{{isShowPoint}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
13
+ <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
14
+ <text class="smallIcon">¥</text>
15
+ <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
16
+ <text class="smallIcon" wx:if="{{isShowPoint}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
17
+ </view>
18
+ <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
19
+ <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
20
+ <text class="boldIcon" wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}">.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
21
+ <text class="discountFont">折</text>
22
+ </text>
16
23
  </view>
17
24
  <view class="receive-container__content-describe">
18
25
  <!-- 无门槛 -->
package/src/Task/taskReceivePopup/coupon/index.wxss CHANGED
@@ -1 +1 @@
1
- .coupon-receive-popup .receive-container{width:68.26667vmin;height:93.06667vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:36.26667vmin 4.26667vmin 4.26667vmin;padding:0 3.2vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:6.4vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:5.33333vmin;line-height:5.33333vmin;margin-right:.53333vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:10.66667vmin;line-height:10.66667vmin}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:3.73333vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:5.33333vmin;margin-top:10.13333vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:1.06667vmin}.coupon-receive-popup .receive-container__close{display:block;width:8.53333vmin;height:8.53333vmin;margin:4.26667vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}@media screen and (min-width: 768px) and (orientation: portrait){.coupon-receive-popup .receive-container{width:33.33333vmin;height:45.44271vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:17.70833vmin 2.08333vmin 2.08333vmin;padding:0 1.5625vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:3.125vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:2.60417vmin;line-height:2.60417vmin;margin-right:.26042vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:5.20833vmin;line-height:5.20833vmin}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:1.82292vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:2.60417vmin;margin-top:4.94792vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:.52083vmin}.coupon-receive-popup .receive-container__close{display:block;width:4.16667vmin;height:4.16667vmin;margin:2.08333vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}}@media screen and (min-height: 768px) and (orientation: landscape){.coupon-receive-popup .receive-container{width:33.33333vmin;height:45.44271vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:17.70833vmin 2.08333vmin 2.08333vmin;padding:0 1.5625vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:3.125vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:2.60417vmin;line-height:2.60417vmin;margin-right:.26042vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:5.20833vmin;line-height:5.20833vmin}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:1.82292vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:2.60417vmin;margin-top:4.94792vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:.52083vmin}.coupon-receive-popup .receive-container__close{display:block;width:4.16667vmin;height:4.16667vmin;margin:2.08333vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}}
1
+ .coupon-receive-popup .receive-container{width:68.26667vmin;height:93.06667vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:36.26667vmin 4.26667vmin 4.26667vmin;padding:0 3.2vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:6.4vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:5.33333vmin;line-height:5.33333vmin;margin-right:.53333vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:10.66667vmin;line-height:10.66667vmin}.coupon-receive-popup .receive-container__content-price .discountFont{color:#fd2b54;font-size:4.26667vmin;line-height:4.26667vmin;margin-left:.53333vmin;font-weight:600}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:3.73333vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:5.33333vmin;margin-top:10.13333vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:1.06667vmin}.coupon-receive-popup .receive-container__close{display:block;width:8.53333vmin;height:8.53333vmin;margin:4.26667vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}@media screen and (min-width: 768px) and (orientation: portrait){.coupon-receive-popup .receive-container{width:33.33333vmin;height:45.44271vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:17.70833vmin 2.08333vmin 2.08333vmin;padding:0 1.5625vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:3.125vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:2.60417vmin;line-height:2.60417vmin;margin-right:.26042vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:5.20833vmin;line-height:5.20833vmin}.coupon-receive-popup .receive-container__content-price .discountFont{color:#fd2b54;font-size:2.08333vmin;line-height:2.08333vmin;margin-left:.26042vmin;font-weight:600}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:1.82292vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:2.60417vmin;margin-top:4.94792vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:.52083vmin}.coupon-receive-popup .receive-container__close{display:block;width:4.16667vmin;height:4.16667vmin;margin:2.08333vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}}@media screen and (min-height: 768px) and (orientation: landscape){.coupon-receive-popup .receive-container{width:33.33333vmin;height:45.44271vmin;background-size:100% 100%;background-image:url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png");overflow:hidden}.coupon-receive-popup .receive-container__content{display:flex;flex-direction:column;margin:17.70833vmin 2.08333vmin 2.08333vmin;padding:0 1.5625vmin}.coupon-receive-popup .receive-container__content-price{font-weight:500;font-family:"PingFang SC";text-align:left;display:flex;align-items:baseline;margin-top:3.125vmin}.coupon-receive-popup .receive-container__content-price .smallIcon{color:#fd2b54;font-size:2.60417vmin;line-height:2.60417vmin;margin-right:.26042vmin}.coupon-receive-popup .receive-container__content-price .boldIcon{color:#fd2b54;font-size:5.20833vmin;line-height:5.20833vmin}.coupon-receive-popup .receive-container__content-price .discountFont{color:#fd2b54;font-size:2.08333vmin;line-height:2.08333vmin;margin-left:.26042vmin;font-weight:600}.coupon-receive-popup .receive-container__content-describe{color:#333333;font-size:1.82292vmin;font-weight:400;font-family:"PingFang SC";text-align:left;line-height:2.60417vmin;margin-top:4.94792vmin}.coupon-receive-popup .receive-container__content-describe view{display:block;margin-bottom:.52083vmin}.coupon-receive-popup .receive-container__close{display:block;width:4.16667vmin;height:4.16667vmin;margin:2.08333vmin auto 0}.coupon-receive-popup.coupon-receive-popup-full .receive-container-wrapper{transform:scale(0.8)}}
package/src/Task/taskReceivePopup/index.wxml CHANGED
@@ -10,7 +10,7 @@
10
10
  <coupon-popup
11
11
  rewardData="{{rewardData}}"
12
12
  showCouponReceivePopup="{{rewardData.live_task.reward_type === 2}}"
13
- isFullScreen="{{isFullcreen}}"
13
+ isFullScreen="{{isFullScreen}}"
14
14
  bind:close="handleClose"
15
15
  ></coupon-popup>
16
16
  </view>