xiaoe_mp_npm 1.0.0-live13 → 1.0.0-live15

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 (19) hide show
  1. package/miniprogram_dist/Task/TaskBubble/index.js +6 -2
  2. package/miniprogram_dist/Task/TaskBubble/index.wxml +2 -7
  3. package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js +5 -2
  4. package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.scss +3 -0
  5. package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.wxss +8 -0
  6. package/miniprogram_dist/Task/TaskPopup/index.js +9 -1
  7. package/miniprogram_dist/Task/TaskPopup/index.scss +8 -0
  8. package/miniprogram_dist/Task/TaskPopup/index.wxml +6 -3
  9. package/miniprogram_dist/Task/TaskPopup/index.wxss +32 -0
  10. package/package.json +1 -1
  11. package/src/Task/TaskBubble/index.js +6 -2
  12. package/src/Task/TaskBubble/index.wxml +2 -7
  13. package/src/Task/TaskPopup/component/TaskItem/index.js +5 -2
  14. package/src/Task/TaskPopup/component/TaskList/index.scss +3 -0
  15. package/src/Task/TaskPopup/component/TaskList/index.wxss +118 -1
  16. package/src/Task/TaskPopup/index.js +9 -1
  17. package/src/Task/TaskPopup/index.scss +8 -0
  18. package/src/Task/TaskPopup/index.wxml +6 -3
  19. package/src/Task/TaskPopup/index.wxss +1 -1
package/miniprogram_dist/Task/TaskBubble/index.js CHANGED
@@ -9,6 +9,10 @@ Component({
9
9
  type: Object,
10
10
  value: {},
11
11
  },
12
+ zIndex: {
13
+ type: Number,
14
+ value: 1,
15
+ },
12
16
  },
13
17
 
14
18
  /**
@@ -26,8 +30,8 @@ Component({
26
30
  // 奖品类型
27
31
  rewardValue(data){
28
32
  if(data.taskMsg.live_task?.task_type === 1){
29
- const hours = Math.floor(data.taskMsg.live_task?.reward_value / 60);
30
- const remainingMinutes = data.taskMsg.live_task?.reward_value % 60;
33
+ const hours = Math.floor(data.taskMsg.live_task?.task_condition / 60);
34
+ const remainingMinutes = data.taskMsg.live_task?.task_condition % 60;
31
35
 
32
36
  if (hours === 0) {
33
37
  return `达${remainingMinutes}分钟`;
package/miniprogram_dist/Task/TaskBubble/index.wxml CHANGED
@@ -1,4 +1,4 @@
1
- <view class="barrage-container" catch:tap="bubbleClick">
1
+ <view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
2
2
  <view class="barrage-wrap">
3
3
  <view class="barrage-item" animation="{{animationData}}">
4
4
  <view class="barrage-content">
@@ -9,11 +9,7 @@
9
9
  />
10
10
  <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
11
11
  <view>{{ rewardValue }}</view>
12
- <image
13
- class="prize-icon"
14
- src="{{taskIconImg}}"
15
- alt="奖励"
16
- />
12
+ <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
17
13
  <view class="prize-num">+{{ prizeNum }}</view>
18
14
  <image
19
15
  class="right-arrow-icon"
@@ -24,4 +20,3 @@
24
20
  </view>
25
21
  </view>
26
22
  </view>
27
-
package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js CHANGED
@@ -177,8 +177,11 @@ Component({
177
177
  this.triggerEvent("btnClick","toShare")
178
178
  return
179
179
  }else if(this.data.btnText === "去使用"){
180
- // 去转发
181
- this.triggerEvent("btnClick","reward")
180
+ // 去使用
181
+ this.triggerEvent("btnClick",{
182
+ type:"reward",
183
+ reward_type
184
+ })
182
185
  return
183
186
  }else if(this.data.btnText === "领奖励"){
184
187
  // 去转发
package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.scss CHANGED
@@ -6,6 +6,9 @@ $deviceWidth: 750;
6
6
 
7
7
  @mixin task-list{
8
8
  height: 100%;
9
+ min-height: 40vmin;
10
+ // padding-bottom: vmin(32);
11
+ box-sizing: border-box;
9
12
  .error-box{
10
13
  background: #fff;
11
14
  padding: vmin(2) vmin(2) 0 vmin(2);
package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.wxss CHANGED
@@ -1,5 +1,7 @@
1
1
  .task-list {
2
2
  height: 100%;
3
+ min-height: 40vmin;
4
+ box-sizing: border-box;
3
5
  }
4
6
  .task-list .error-box {
5
7
  background: #fff;
@@ -27,6 +29,8 @@
27
29
  @media screen and (min-width: 768px) and (orientation: portrait) {
28
30
  .task-list {
29
31
  height: 100%;
32
+ min-height: 40vmin;
33
+ box-sizing: border-box;
30
34
  }
31
35
  .task-list .error-box {
32
36
  background: #fff;
@@ -55,6 +59,8 @@
55
59
  @media screen and (min-height: 630px) and (orientation: landscape) {
56
60
  .task-list {
57
61
  height: 100%;
62
+ min-height: 40vmin;
63
+ box-sizing: border-box;
58
64
  }
59
65
  .task-list .error-box {
60
66
  background: #fff;
@@ -83,6 +89,8 @@
83
89
  @media screen and (min-height: 768px) and (orientation: landscape) {
84
90
  .task-list {
85
91
  height: 100%;
92
+ min-height: 40vmin;
93
+ box-sizing: border-box;
86
94
  }
87
95
  .task-list .error-box {
88
96
  background: #fff;
package/miniprogram_dist/Task/TaskPopup/index.js CHANGED
@@ -98,5 +98,13 @@ Component({
98
98
  this.triggerEvent("onLoad",e)
99
99
  }
100
100
  },
101
- observers: {},
101
+ observers: {
102
+ showPopup(newVal){
103
+ if(newVal){
104
+ this.setData({
105
+ isShowTaskList: true
106
+ })
107
+ }
108
+ }
109
+ },
102
110
  })
package/miniprogram_dist/Task/TaskPopup/index.scss CHANGED
@@ -6,6 +6,7 @@ $deviceWidth: 750;
6
6
 
7
7
  @mixin task-popup {
8
8
  z-index: 500;
9
+ background: #F5F5F5;
9
10
  .task-popup-header{
10
11
  background: #F5F5F5;
11
12
  padding: vmin(24) vmin(32);
@@ -41,6 +42,9 @@ $deviceWidth: 750;
41
42
  .close{
42
43
  width: vmin(32);
43
44
  height: vmin(32);
45
+ &.hidden{
46
+ opacity: 0;
47
+ }
44
48
  }
45
49
  }
46
50
  .reward-popup-header{
@@ -61,10 +65,14 @@ $deviceWidth: 750;
61
65
  .close{
62
66
  width: vmin(32);
63
67
  height: vmin(32);
68
+ &.hidden{
69
+ opacity: 0;
70
+ }
64
71
  }
65
72
  }
66
73
 
67
74
  .popup-content{
75
+ margin-bottom: vmin(32);
68
76
  background: #F5F5F5;
69
77
  padding: 0 vmin(32) vmin(32) vmin(32);
70
78
  min-height: 40vmin;
package/miniprogram_dist/Task/TaskPopup/index.wxml CHANGED
@@ -22,8 +22,7 @@
22
22
  </view>
23
23
  </view>
24
24
  <image
25
- wx:if="{{isShowClose}}"
26
- class="close"
25
+ class="close {{!isShowClose?'hidden':''}}"
27
26
  catch:tap="closePop"
28
27
  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png"
29
28
  />
@@ -37,7 +36,11 @@
37
36
  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxzkwv90q6c.png"
38
37
  />
39
38
  <view class="title">查看已获得的奖励</view>
40
- <image class="close" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png" />
39
+ <image
40
+ class="close {{!isShowClose?'hidden':''}}"
41
+ catch:tap="closePop"
42
+ src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png"
43
+ />
41
44
  </view>
42
45
  </view>
43
46
 
package/miniprogram_dist/Task/TaskPopup/index.wxss CHANGED
@@ -1,5 +1,6 @@
1
1
  .task-popup {
2
2
  z-index: 500;
3
+ background: #F5F5F5;
3
4
  }
4
5
  .task-popup .task-popup-header {
5
6
  background: #F5F5F5;
@@ -38,6 +39,9 @@
38
39
  width: 4.26667vmin;
39
40
  height: 4.26667vmin;
40
41
  }
42
+ .task-popup .task-popup-header .close.hidden {
43
+ opacity: 0;
44
+ }
41
45
  .task-popup .reward-popup-header {
42
46
  background: #F5F5F5;
43
47
  display: flex;
@@ -58,7 +62,11 @@
58
62
  width: 4.26667vmin;
59
63
  height: 4.26667vmin;
60
64
  }
65
+ .task-popup .reward-popup-header .close.hidden {
66
+ opacity: 0;
67
+ }
61
68
  .task-popup .popup-content {
69
+ margin-bottom: 4.26667vmin;
62
70
  background: #F5F5F5;
63
71
  padding: 0 4.26667vmin 4.26667vmin 4.26667vmin;
64
72
  min-height: 40vmin;
@@ -68,6 +76,7 @@
68
76
  @media screen and (min-width: 768px) and (orientation: portrait) {
69
77
  .task-popup {
70
78
  z-index: 500;
79
+ background: #F5F5F5;
71
80
  }
72
81
  .task-popup .task-popup-header {
73
82
  background: #F5F5F5;
@@ -106,6 +115,9 @@
106
115
  width: 2.08333vmin;
107
116
  height: 2.08333vmin;
108
117
  }
118
+ .task-popup .task-popup-header .close.hidden {
119
+ opacity: 0;
120
+ }
109
121
  .task-popup .reward-popup-header {
110
122
  background: #F5F5F5;
111
123
  display: flex;
@@ -126,7 +138,11 @@
126
138
  width: 2.08333vmin;
127
139
  height: 2.08333vmin;
128
140
  }
141
+ .task-popup .reward-popup-header .close.hidden {
142
+ opacity: 0;
143
+ }
129
144
  .task-popup .popup-content {
145
+ margin-bottom: 2.08333vmin;
130
146
  background: #F5F5F5;
131
147
  padding: 0 2.08333vmin 2.08333vmin 2.08333vmin;
132
148
  min-height: 40vmin;
@@ -137,6 +153,7 @@
137
153
  @media screen and (min-height: 630px) and (orientation: landscape) {
138
154
  .task-popup {
139
155
  z-index: 500;
156
+ background: #F5F5F5;
140
157
  }
141
158
  .task-popup .task-popup-header {
142
159
  background: #F5F5F5;
@@ -175,6 +192,9 @@
175
192
  width: 2.53968vmin;
176
193
  height: 2.53968vmin;
177
194
  }
195
+ .task-popup .task-popup-header .close.hidden {
196
+ opacity: 0;
197
+ }
178
198
  .task-popup .reward-popup-header {
179
199
  background: #F5F5F5;
180
200
  display: flex;
@@ -195,7 +215,11 @@
195
215
  width: 2.53968vmin;
196
216
  height: 2.53968vmin;
197
217
  }
218
+ .task-popup .reward-popup-header .close.hidden {
219
+ opacity: 0;
220
+ }
198
221
  .task-popup .popup-content {
222
+ margin-bottom: 2.53968vmin;
199
223
  background: #F5F5F5;
200
224
  padding: 0 2.53968vmin 2.53968vmin 2.53968vmin;
201
225
  min-height: 40vmin;
@@ -206,6 +230,7 @@
206
230
  @media screen and (min-height: 768px) and (orientation: landscape) {
207
231
  .task-popup {
208
232
  z-index: 500;
233
+ background: #F5F5F5;
209
234
  }
210
235
  .task-popup .task-popup-header {
211
236
  background: #F5F5F5;
@@ -244,6 +269,9 @@
244
269
  width: 2.08333vmin;
245
270
  height: 2.08333vmin;
246
271
  }
272
+ .task-popup .task-popup-header .close.hidden {
273
+ opacity: 0;
274
+ }
247
275
  .task-popup .reward-popup-header {
248
276
  background: #F5F5F5;
249
277
  display: flex;
@@ -264,7 +292,11 @@
264
292
  width: 2.08333vmin;
265
293
  height: 2.08333vmin;
266
294
  }
295
+ .task-popup .reward-popup-header .close.hidden {
296
+ opacity: 0;
297
+ }
267
298
  .task-popup .popup-content {
299
+ margin-bottom: 2.08333vmin;
268
300
  background: #F5F5F5;
269
301
  padding: 0 2.08333vmin 2.08333vmin 2.08333vmin;
270
302
  min-height: 40vmin;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.0-live13",
3
+ "version": "1.0.0-live15",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/Task/TaskBubble/index.js CHANGED
@@ -9,6 +9,10 @@ Component({
9
9
  type: Object,
10
10
  value: {},
11
11
  },
12
+ zIndex: {
13
+ type: Number,
14
+ value: 1,
15
+ },
12
16
  },
13
17
 
14
18
  /**
@@ -26,8 +30,8 @@ Component({
26
30
  // 奖品类型
27
31
  rewardValue(data){
28
32
  if(data.taskMsg.live_task?.task_type === 1){
29
- const hours = Math.floor(data.taskMsg.live_task?.reward_value / 60);
30
- const remainingMinutes = data.taskMsg.live_task?.reward_value % 60;
33
+ const hours = Math.floor(data.taskMsg.live_task?.task_condition / 60);
34
+ const remainingMinutes = data.taskMsg.live_task?.task_condition % 60;
31
35
 
32
36
  if (hours === 0) {
33
37
  return `达${remainingMinutes}分钟`;
package/src/Task/TaskBubble/index.wxml CHANGED
@@ -1,4 +1,4 @@
1
- <view class="barrage-container" catch:tap="bubbleClick">
1
+ <view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
2
2
  <view class="barrage-wrap">
3
3
  <view class="barrage-item" animation="{{animationData}}">
4
4
  <view class="barrage-content">
@@ -9,11 +9,7 @@
9
9
  />
10
10
  <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
11
11
  <view>{{ rewardValue }}</view>
12
- <image
13
- class="prize-icon"
14
- src="{{taskIconImg}}"
15
- alt="奖励"
16
- />
12
+ <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
17
13
  <view class="prize-num">+{{ prizeNum }}</view>
18
14
  <image
19
15
  class="right-arrow-icon"
@@ -24,4 +20,3 @@
24
20
  </view>
25
21
  </view>
26
22
  </view>
27
-
package/src/Task/TaskPopup/component/TaskItem/index.js CHANGED
@@ -177,8 +177,11 @@ Component({
177
177
  this.triggerEvent("btnClick","toShare")
178
178
  return
179
179
  }else if(this.data.btnText === "去使用"){
180
- // 去转发
181
- this.triggerEvent("btnClick","reward")
180
+ // 去使用
181
+ this.triggerEvent("btnClick",{
182
+ type:"reward",
183
+ reward_type
184
+ })
182
185
  return
183
186
  }else if(this.data.btnText === "领奖励"){
184
187
  // 去转发
package/src/Task/TaskPopup/component/TaskList/index.scss CHANGED
@@ -6,6 +6,9 @@ $deviceWidth: 750;
6
6
 
7
7
  @mixin task-list{
8
8
  height: 100%;
9
+ min-height: 40vmin;
10
+ // padding-bottom: vmin(32);
11
+ box-sizing: border-box;
9
12
  .error-box{
10
13
  background: #fff;
11
14
  padding: vmin(2) vmin(2) 0 vmin(2);
package/src/Task/TaskPopup/component/TaskList/index.wxss CHANGED
@@ -1 +1,118 @@
1
- .task-list{height:100%}.task-list .error-box{background:#fff;padding:.26667vmin .26667vmin 0 .26667vmin;position:relative;margin-bottom:3.2vmin;border-radius:2.13333vmin;overflow:hidden}.task-list .nothing{display:flex;align-items:center;margin-top:21.33333vmin;flex-direction:column}.task-list .nothing image{width:23.46667vmin;height:23.46667vmin}.task-list .nothing .text{font-size:3.73333vmin;color:#999999;margin-top:4.26667vmin}@media screen and (min-width: 768px) and (orientation: portrait){.task-list{height:100%}.task-list .error-box{background:#fff;padding:.13021vmin .13021vmin 0 .13021vmin;position:relative;margin-bottom:1.5625vmin;border-radius:1.04167vmin;overflow:hidden}.task-list .nothing{display:flex;align-items:center;margin-top:10.41667vmin;flex-direction:column}.task-list .nothing image{width:11.45833vmin;height:11.45833vmin}.task-list .nothing .text{font-size:1.82292vmin;color:#999999;margin-top:2.08333vmin}}@media screen and (min-height: 630px) and (orientation: landscape){.task-list{height:100%}.task-list .error-box{background:#fff;padding:.15873vmin .15873vmin 0 .15873vmin;position:relative;margin-bottom:1.90476vmin;border-radius:1.26984vmin;overflow:hidden}.task-list .nothing{display:flex;align-items:center;margin-top:12.69841vmin;flex-direction:column}.task-list .nothing image{width:13.96825vmin;height:13.96825vmin}.task-list .nothing .text{font-size:2.22222vmin;color:#999999;margin-top:2.53968vmin}}@media screen and (min-height: 768px) and (orientation: landscape){.task-list{height:100%}.task-list .error-box{background:#fff;padding:.13021vmin .13021vmin 0 .13021vmin;position:relative;margin-bottom:1.5625vmin;border-radius:1.04167vmin;overflow:hidden}.task-list .nothing{display:flex;align-items:center;margin-top:10.41667vmin;flex-direction:column}.task-list .nothing image{width:11.45833vmin;height:11.45833vmin}.task-list .nothing .text{font-size:1.82292vmin;color:#999999;margin-top:2.08333vmin}}
1
+ .task-list {
2
+ height: 100%;
3
+ min-height: 40vmin;
4
+ box-sizing: border-box;
5
+ }
6
+ .task-list .error-box {
7
+ background: #fff;
8
+ padding: 0.26667vmin 0.26667vmin 0 0.26667vmin;
9
+ position: relative;
10
+ margin-bottom: 3.2vmin;
11
+ border-radius: 2.13333vmin;
12
+ overflow: hidden;
13
+ }
14
+ .task-list .nothing {
15
+ display: flex;
16
+ align-items: center;
17
+ margin-top: 21.33333vmin;
18
+ flex-direction: column;
19
+ }
20
+ .task-list .nothing image {
21
+ width: 23.46667vmin;
22
+ height: 23.46667vmin;
23
+ }
24
+ .task-list .nothing .text {
25
+ font-size: 3.73333vmin;
26
+ color: #999999;
27
+ margin-top: 4.26667vmin;
28
+ }
29
+ @media screen and (min-width: 768px) and (orientation: portrait) {
30
+ .task-list {
31
+ height: 100%;
32
+ min-height: 40vmin;
33
+ box-sizing: border-box;
34
+ }
35
+ .task-list .error-box {
36
+ background: #fff;
37
+ padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
38
+ position: relative;
39
+ margin-bottom: 1.5625vmin;
40
+ border-radius: 1.04167vmin;
41
+ overflow: hidden;
42
+ }
43
+ .task-list .nothing {
44
+ display: flex;
45
+ align-items: center;
46
+ margin-top: 10.41667vmin;
47
+ flex-direction: column;
48
+ }
49
+ .task-list .nothing image {
50
+ width: 11.45833vmin;
51
+ height: 11.45833vmin;
52
+ }
53
+ .task-list .nothing .text {
54
+ font-size: 1.82292vmin;
55
+ color: #999999;
56
+ margin-top: 2.08333vmin;
57
+ }
58
+ }
59
+ @media screen and (min-height: 630px) and (orientation: landscape) {
60
+ .task-list {
61
+ height: 100%;
62
+ min-height: 40vmin;
63
+ box-sizing: border-box;
64
+ }
65
+ .task-list .error-box {
66
+ background: #fff;
67
+ padding: 0.15873vmin 0.15873vmin 0 0.15873vmin;
68
+ position: relative;
69
+ margin-bottom: 1.90476vmin;
70
+ border-radius: 1.26984vmin;
71
+ overflow: hidden;
72
+ }
73
+ .task-list .nothing {
74
+ display: flex;
75
+ align-items: center;
76
+ margin-top: 12.69841vmin;
77
+ flex-direction: column;
78
+ }
79
+ .task-list .nothing image {
80
+ width: 13.96825vmin;
81
+ height: 13.96825vmin;
82
+ }
83
+ .task-list .nothing .text {
84
+ font-size: 2.22222vmin;
85
+ color: #999999;
86
+ margin-top: 2.53968vmin;
87
+ }
88
+ }
89
+ @media screen and (min-height: 768px) and (orientation: landscape) {
90
+ .task-list {
91
+ height: 100%;
92
+ min-height: 40vmin;
93
+ box-sizing: border-box;
94
+ }
95
+ .task-list .error-box {
96
+ background: #fff;
97
+ padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
98
+ position: relative;
99
+ margin-bottom: 1.5625vmin;
100
+ border-radius: 1.04167vmin;
101
+ overflow: hidden;
102
+ }
103
+ .task-list .nothing {
104
+ display: flex;
105
+ align-items: center;
106
+ margin-top: 10.41667vmin;
107
+ flex-direction: column;
108
+ }
109
+ .task-list .nothing image {
110
+ width: 11.45833vmin;
111
+ height: 11.45833vmin;
112
+ }
113
+ .task-list .nothing .text {
114
+ font-size: 1.82292vmin;
115
+ color: #999999;
116
+ margin-top: 2.08333vmin;
117
+ }
118
+ }
package/src/Task/TaskPopup/index.js CHANGED
@@ -98,5 +98,13 @@ Component({
98
98
  this.triggerEvent("onLoad",e)
99
99
  }
100
100
  },
101
- observers: {},
101
+ observers: {
102
+ showPopup(newVal){
103
+ if(newVal){
104
+ this.setData({
105
+ isShowTaskList: true
106
+ })
107
+ }
108
+ }
109
+ },
102
110
  })
package/src/Task/TaskPopup/index.scss CHANGED
@@ -6,6 +6,7 @@ $deviceWidth: 750;
6
6
 
7
7
  @mixin task-popup {
8
8
  z-index: 500;
9
+ background: #F5F5F5;
9
10
  .task-popup-header{
10
11
  background: #F5F5F5;
11
12
  padding: vmin(24) vmin(32);
@@ -41,6 +42,9 @@ $deviceWidth: 750;
41
42
  .close{
42
43
  width: vmin(32);
43
44
  height: vmin(32);
45
+ &.hidden{
46
+ opacity: 0;
47
+ }
44
48
  }
45
49
  }
46
50
  .reward-popup-header{
@@ -61,10 +65,14 @@ $deviceWidth: 750;
61
65
  .close{
62
66
  width: vmin(32);
63
67
  height: vmin(32);
68
+ &.hidden{
69
+ opacity: 0;
70
+ }
64
71
  }
65
72
  }
66
73
 
67
74
  .popup-content{
75
+ margin-bottom: vmin(32);
68
76
  background: #F5F5F5;
69
77
  padding: 0 vmin(32) vmin(32) vmin(32);
70
78
  min-height: 40vmin;
package/src/Task/TaskPopup/index.wxml CHANGED
@@ -22,8 +22,7 @@
22
22
  </view>
23
23
  </view>
24
24
  <image
25
- wx:if="{{isShowClose}}"
26
- class="close"
25
+ class="close {{!isShowClose?'hidden':''}}"
27
26
  catch:tap="closePop"
28
27
  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png"
29
28
  />
@@ -37,7 +36,11 @@
37
36
  src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxzkwv90q6c.png"
38
37
  />
39
38
  <view class="title">查看已获得的奖励</view>
40
- <image class="close" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png" />
39
+ <image
40
+ class="close {{!isShowClose?'hidden':''}}"
41
+ catch:tap="closePop"
42
+ src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/loxykji90s69.png"
43
+ />
41
44
  </view>
42
45
  </view>
43
46
 
package/src/Task/TaskPopup/index.wxss CHANGED
@@ -1 +1 @@
1
- .task-popup{z-index:500}.task-popup .task-popup-header{background:#F5F5F5;padding:3.2vmin 4.26667vmin;display:flex;align-items:center;justify-content:space-between;height:12.8vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:4.26667vmin}.task-popup .task-popup-header .left .to-reward{padding:1.06667vmin 0 1.06667vmin 2.13333vmin;border-radius:4.53333vmin;margin-left:3.2vmin;font-size:3.2vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:4.26667vmin;height:4.26667vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:4.26667vmin;height:4.26667vmin}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:3.2vmin 4.26667vmin;align-items:center;justify-content:space-between;height:12.8vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:4.26667vmin;height:4.26667vmin}.task-popup .reward-popup-header .title{font-size:4.26667vmin}.task-popup .reward-popup-header .close{width:4.26667vmin;height:4.26667vmin}.task-popup .popup-content{background:#F5F5F5;padding:0 4.26667vmin 4.26667vmin 4.26667vmin;min-height:40vmin;height:100%;overflow:hidden}@media screen and (min-width: 768px) and (orientation: portrait){.task-popup{z-index:500}.task-popup .task-popup-header{background:#F5F5F5;padding:1.5625vmin 2.08333vmin;display:flex;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.08333vmin}.task-popup .task-popup-header .left .to-reward{padding:.52083vmin 0 .52083vmin 1.04167vmin;border-radius:2.21354vmin;margin-left:1.5625vmin;font-size:1.5625vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.5625vmin 2.08333vmin;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .title{font-size:2.08333vmin}.task-popup .reward-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .popup-content{background:#F5F5F5;padding:0 2.08333vmin 2.08333vmin 2.08333vmin;min-height:40vmin;height:100%;overflow:hidden}}@media screen and (min-height: 630px) and (orientation: landscape){.task-popup{z-index:500}.task-popup .task-popup-header{background:#F5F5F5;padding:1.90476vmin 2.53968vmin;display:flex;align-items:center;justify-content:space-between;height:7.61905vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.53968vmin}.task-popup .task-popup-header .left .to-reward{padding:.63492vmin 0 .63492vmin 1.26984vmin;border-radius:2.69841vmin;margin-left:1.90476vmin;font-size:1.90476vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.53968vmin;height:2.53968vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.53968vmin;height:2.53968vmin}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.90476vmin 2.53968vmin;align-items:center;justify-content:space-between;height:7.61905vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.53968vmin;height:2.53968vmin}.task-popup .reward-popup-header .title{font-size:2.53968vmin}.task-popup .reward-popup-header .close{width:2.53968vmin;height:2.53968vmin}.task-popup .popup-content{background:#F5F5F5;padding:0 2.53968vmin 2.53968vmin 2.53968vmin;min-height:40vmin;height:100%;overflow:hidden}}@media screen and (min-height: 768px) and (orientation: landscape){.task-popup{z-index:500}.task-popup .task-popup-header{background:#F5F5F5;padding:1.5625vmin 2.08333vmin;display:flex;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.08333vmin}.task-popup .task-popup-header .left .to-reward{padding:.52083vmin 0 .52083vmin 1.04167vmin;border-radius:2.21354vmin;margin-left:1.5625vmin;font-size:1.5625vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.5625vmin 2.08333vmin;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .title{font-size:2.08333vmin}.task-popup .reward-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .popup-content{background:#F5F5F5;padding:0 2.08333vmin 2.08333vmin 2.08333vmin;min-height:40vmin;height:100%;overflow:hidden}}
1
+ .task-popup{z-index:500;background:#F5F5F5}.task-popup .task-popup-header{background:#F5F5F5;padding:3.2vmin 4.26667vmin;display:flex;align-items:center;justify-content:space-between;height:12.8vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:4.26667vmin}.task-popup .task-popup-header .left .to-reward{padding:1.06667vmin 0 1.06667vmin 2.13333vmin;border-radius:4.53333vmin;margin-left:3.2vmin;font-size:3.2vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:4.26667vmin;height:4.26667vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:4.26667vmin;height:4.26667vmin}.task-popup .task-popup-header .close.hidden{opacity:0}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:3.2vmin 4.26667vmin;align-items:center;justify-content:space-between;height:12.8vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:4.26667vmin;height:4.26667vmin}.task-popup .reward-popup-header .title{font-size:4.26667vmin}.task-popup .reward-popup-header .close{width:4.26667vmin;height:4.26667vmin}.task-popup .reward-popup-header .close.hidden{opacity:0}.task-popup .popup-content{margin-bottom:4.26667vmin;background:#F5F5F5;padding:0 4.26667vmin 4.26667vmin 4.26667vmin;min-height:40vmin;height:100%;overflow:hidden}@media screen and (min-width: 768px) and (orientation: portrait){.task-popup{z-index:500;background:#F5F5F5}.task-popup .task-popup-header{background:#F5F5F5;padding:1.5625vmin 2.08333vmin;display:flex;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.08333vmin}.task-popup .task-popup-header .left .to-reward{padding:.52083vmin 0 .52083vmin 1.04167vmin;border-radius:2.21354vmin;margin-left:1.5625vmin;font-size:1.5625vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .close.hidden{opacity:0}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.5625vmin 2.08333vmin;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .title{font-size:2.08333vmin}.task-popup .reward-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .close.hidden{opacity:0}.task-popup .popup-content{margin-bottom:2.08333vmin;background:#F5F5F5;padding:0 2.08333vmin 2.08333vmin 2.08333vmin;min-height:40vmin;height:100%;overflow:hidden}}@media screen and (min-height: 630px) and (orientation: landscape){.task-popup{z-index:500;background:#F5F5F5}.task-popup .task-popup-header{background:#F5F5F5;padding:1.90476vmin 2.53968vmin;display:flex;align-items:center;justify-content:space-between;height:7.61905vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.53968vmin}.task-popup .task-popup-header .left .to-reward{padding:.63492vmin 0 .63492vmin 1.26984vmin;border-radius:2.69841vmin;margin-left:1.90476vmin;font-size:1.90476vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.53968vmin;height:2.53968vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.53968vmin;height:2.53968vmin}.task-popup .task-popup-header .close.hidden{opacity:0}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.90476vmin 2.53968vmin;align-items:center;justify-content:space-between;height:7.61905vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.53968vmin;height:2.53968vmin}.task-popup .reward-popup-header .title{font-size:2.53968vmin}.task-popup .reward-popup-header .close{width:2.53968vmin;height:2.53968vmin}.task-popup .reward-popup-header .close.hidden{opacity:0}.task-popup .popup-content{margin-bottom:2.53968vmin;background:#F5F5F5;padding:0 2.53968vmin 2.53968vmin 2.53968vmin;min-height:40vmin;height:100%;overflow:hidden}}@media screen and (min-height: 768px) and (orientation: landscape){.task-popup{z-index:500;background:#F5F5F5}.task-popup .task-popup-header{background:#F5F5F5;padding:1.5625vmin 2.08333vmin;display:flex;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .task-popup-header .left{display:flex;align-items:center}.task-popup .task-popup-header .left .title{font-size:2.08333vmin}.task-popup .task-popup-header .left .to-reward{padding:.52083vmin 0 .52083vmin 1.04167vmin;border-radius:2.21354vmin;margin-left:1.5625vmin;font-size:1.5625vmin;background:linear-gradient(90deg, #ffebcd 0%, #ffebcd00 100%);display:flex;color:#FF781F}.task-popup .task-popup-header .left .to-reward image{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .left .not-reward{background:linear-gradient(90deg, #EBEBEB 0%, #ebebeb00 100%);color:#CCCCCC}.task-popup .task-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .task-popup-header .close.hidden{opacity:0}.task-popup .reward-popup-header{background:#F5F5F5;display:flex;padding:1.5625vmin 2.08333vmin;align-items:center;justify-content:space-between;height:6.25vmin;box-sizing:border-box}.task-popup .reward-popup-header .back{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .title{font-size:2.08333vmin}.task-popup .reward-popup-header .close{width:2.08333vmin;height:2.08333vmin}.task-popup .reward-popup-header .close.hidden{opacity:0}.task-popup .popup-content{margin-bottom:2.08333vmin;background:#F5F5F5;padding:0 2.08333vmin 2.08333vmin 2.08333vmin;min-height:40vmin;height:100%;overflow:hidden}}