jufubao-base 1.0.67-beta220 → 1.0.67-beta222
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/package.json
CHANGED
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<view>赠送优惠券</view>
|
|
34
34
|
</view>
|
|
35
35
|
<view
|
|
36
|
-
:style="{ color: mainColor,
|
|
36
|
+
:style="{ color: mainColor, backgroundColor: contentBackground }"
|
|
37
37
|
class="jfb-base-con-list__body-content-header-right"
|
|
38
38
|
@click="showRule = true"
|
|
39
39
|
>
|
|
@@ -42,69 +42,138 @@
|
|
|
42
42
|
</view>
|
|
43
43
|
</view>
|
|
44
44
|
<view class="jfb-base-con-list__body-content-list">
|
|
45
|
-
<view
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
<view class="jfb-base-con-list__body-content-list-item-left">
|
|
55
|
-
<view
|
|
56
|
-
:style="item.couponBackground"
|
|
57
|
-
class="jfb-base-con-list__body-content-list-item-left-info"
|
|
58
|
-
>
|
|
45
|
+
<view v-for="(item, index) in couponList" :key="index">
|
|
46
|
+
<view
|
|
47
|
+
class="jfb-base-con-list__body-content-list-item"
|
|
48
|
+
:style="{
|
|
49
|
+
backgroundColor: contentBackground,
|
|
50
|
+
}"
|
|
51
|
+
v-if="item.can_take === 'N'"
|
|
52
|
+
>
|
|
53
|
+
<view class="jfb-base-con-list__body-content-list-item-left">
|
|
59
54
|
<view
|
|
60
|
-
:style="
|
|
61
|
-
|
|
62
|
-
textAlign: 'center'
|
|
63
|
-
}"
|
|
64
|
-
>{{ item.prize_type }}</view
|
|
55
|
+
:style="item.couponBackground"
|
|
56
|
+
class="jfb-base-con-list__body-content-list-item-left-info"
|
|
65
57
|
>
|
|
58
|
+
<view
|
|
59
|
+
:style="{
|
|
60
|
+
color: mainColor,
|
|
61
|
+
textAlign: 'center',
|
|
62
|
+
}"
|
|
63
|
+
>{{ item.prize_type }}</view
|
|
64
|
+
>
|
|
65
|
+
<view
|
|
66
|
+
:style="{
|
|
67
|
+
color: '#fff',
|
|
68
|
+
}"
|
|
69
|
+
>{{ item.prize_name }}</view
|
|
70
|
+
>
|
|
71
|
+
</view>
|
|
72
|
+
</view>
|
|
73
|
+
<view class="jfb-base-con-list__body-content-list-item-right">
|
|
66
74
|
<view
|
|
75
|
+
class="jfb-base-con-list__body-content-list-item-right-name"
|
|
76
|
+
>
|
|
77
|
+
<view>{{ item.prize_name }}</view>
|
|
78
|
+
<xd-font-icon
|
|
79
|
+
size="100"
|
|
80
|
+
:style="{
|
|
81
|
+
color: '#D6D6D6',
|
|
82
|
+
position: 'absolute',
|
|
83
|
+
right: '-30rpx',
|
|
84
|
+
top: '-60rpx',
|
|
85
|
+
}"
|
|
86
|
+
icon="iconyilingqu"
|
|
87
|
+
></xd-font-icon>
|
|
88
|
+
</view>
|
|
89
|
+
<view
|
|
90
|
+
class="jfb-base-con-list__body-content-list-item-right-num"
|
|
91
|
+
>
|
|
92
|
+
<!-- <view
|
|
67
93
|
:style="{
|
|
68
|
-
color:
|
|
94
|
+
color: mainColor,
|
|
95
|
+
display: 'flex',
|
|
96
|
+
alignItems: 'center',
|
|
97
|
+
fontSize: '28rpx',
|
|
69
98
|
}"
|
|
70
|
-
>{{ item.prize_name }}</view
|
|
71
99
|
>
|
|
100
|
+
<xd-font-icon
|
|
101
|
+
style="margin-right: 10rpx"
|
|
102
|
+
size="22"
|
|
103
|
+
icon="icondanchuangguanbi_xian"
|
|
104
|
+
></xd-font-icon>
|
|
105
|
+
{{ item.prize_num }}
|
|
106
|
+
</view> -->
|
|
107
|
+
<view></view>
|
|
108
|
+
|
|
109
|
+
<xd-button
|
|
110
|
+
v-if="item.can_take === 'Y'"
|
|
111
|
+
size="small"
|
|
112
|
+
:disabled="item.remain_card_count == 0"
|
|
113
|
+
@click="getCoupont(item)"
|
|
114
|
+
type="primary"
|
|
115
|
+
:style="item.btn"
|
|
116
|
+
:color="item.remain_card_count == 0 ? '#AAA' : '#fff'"
|
|
117
|
+
>领取</xd-button
|
|
118
|
+
>
|
|
119
|
+
</view>
|
|
72
120
|
</view>
|
|
73
121
|
</view>
|
|
74
|
-
<view
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
></xd-font-icon>
|
|
122
|
+
<view
|
|
123
|
+
class="jfb-base-con-list__body-content-list-item"
|
|
124
|
+
:style="{
|
|
125
|
+
backgroundColor:
|
|
126
|
+
item.remain_card_count == 0 ? '#f3f3f3' : contentBackground,
|
|
127
|
+
}"
|
|
128
|
+
v-else
|
|
129
|
+
>
|
|
130
|
+
<view class="jfb-base-con-list__body-content-list-item-left">
|
|
131
|
+
<view
|
|
132
|
+
:style="item.couponBackground"
|
|
133
|
+
class="jfb-base-con-list__body-content-list-item-left-info"
|
|
134
|
+
>
|
|
135
|
+
<view
|
|
136
|
+
:style="{
|
|
137
|
+
color:
|
|
138
|
+
item.remain_card_count == 0 ? '#D6D6D6' : mainColor,
|
|
139
|
+
textAlign: 'center',
|
|
140
|
+
}"
|
|
141
|
+
>{{ item.prize_type }}</view
|
|
142
|
+
>
|
|
143
|
+
<view
|
|
144
|
+
:style="{
|
|
145
|
+
color: item.remain_card_count == 0 ? '#D6D6D6' : '#fff',
|
|
146
|
+
}"
|
|
147
|
+
>{{ item.prize_name }}</view
|
|
148
|
+
>
|
|
149
|
+
</view>
|
|
103
150
|
</view>
|
|
104
|
-
<view
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
151
|
+
<view class="jfb-base-con-list__body-content-list-item-right">
|
|
152
|
+
<view
|
|
153
|
+
class="jfb-base-con-list__body-content-list-item-right-name"
|
|
154
|
+
>
|
|
155
|
+
<view>{{ item.prize_name }}</view>
|
|
156
|
+
<xd-font-icon
|
|
157
|
+
size="100"
|
|
158
|
+
:style="{
|
|
159
|
+
color:
|
|
160
|
+
item.remain_card_count == 0 ? '#D6D6D6' : iconColor,
|
|
161
|
+
position: 'absolute',
|
|
162
|
+
right: '-30rpx',
|
|
163
|
+
top: '-30rpx',
|
|
164
|
+
}"
|
|
165
|
+
:icon="
|
|
166
|
+
item.remain_card_count == 0
|
|
167
|
+
? 'iconyifawan'
|
|
168
|
+
: 'icondailingqu'
|
|
169
|
+
"
|
|
170
|
+
>
|
|
171
|
+
</xd-font-icon>
|
|
172
|
+
</view>
|
|
173
|
+
<view
|
|
174
|
+
class="jfb-base-con-list__body-content-list-item-right-num"
|
|
175
|
+
>
|
|
176
|
+
<!-- <view
|
|
108
177
|
:style="{
|
|
109
178
|
color: mainColor,
|
|
110
179
|
display: 'flex',
|
|
@@ -119,18 +188,23 @@
|
|
|
119
188
|
></xd-font-icon>
|
|
120
189
|
{{ item.prize_num }}
|
|
121
190
|
</view> -->
|
|
122
|
-
|
|
191
|
+
<view></view>
|
|
123
192
|
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
193
|
+
<xd-button
|
|
194
|
+
v-if="item.can_take === 'Y'"
|
|
195
|
+
size="small"
|
|
196
|
+
:disabled="item.remain_card_count == 0"
|
|
197
|
+
@click="getCoupont(item)"
|
|
198
|
+
type="primary"
|
|
199
|
+
:style="
|
|
200
|
+
item.remain_card_count == 0
|
|
201
|
+
? { background: '#DDDDDD', margin: 0 }
|
|
202
|
+
: item.btn
|
|
203
|
+
"
|
|
204
|
+
:color="item.remain_card_count == 0 ? '#AAA' : '#fff'"
|
|
205
|
+
>领取</xd-button
|
|
206
|
+
>
|
|
207
|
+
</view>
|
|
134
208
|
</view>
|
|
135
209
|
</view>
|
|
136
210
|
</view>
|
|
@@ -247,7 +321,7 @@ export default {
|
|
|
247
321
|
if (item.can_take === "Y") {
|
|
248
322
|
item.btn = res.app_coupon_button_bg_url
|
|
249
323
|
? {
|
|
250
|
-
|
|
324
|
+
backgroundImage: `url(${getServiceUrl(
|
|
251
325
|
res.app_coupon_button_bg_url
|
|
252
326
|
)})`,
|
|
253
327
|
backgroundSize: "100%",
|
|
@@ -255,27 +329,28 @@ export default {
|
|
|
255
329
|
margin: "0",
|
|
256
330
|
}
|
|
257
331
|
: {
|
|
258
|
-
|
|
332
|
+
backgroundColor: this.mainColor,
|
|
259
333
|
margin: "0",
|
|
260
334
|
};
|
|
261
335
|
item.couponBackground = {
|
|
262
|
-
|
|
336
|
+
backgroundImage:
|
|
337
|
+
item.remain_card_count > 0
|
|
338
|
+
? `url(${getServiceUrl(res.app_coupon_url)})`
|
|
339
|
+
: `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
|
|
263
340
|
backgroundSize: "100%",
|
|
264
341
|
backgroundRepeat: "no-repeat",
|
|
265
342
|
};
|
|
266
343
|
} else {
|
|
267
344
|
item.btn = { background: "#D6D6D6", margin: "0" };
|
|
268
345
|
item.couponBackground = {
|
|
269
|
-
|
|
270
|
-
res.app_coupon_invalid_url
|
|
271
|
-
)})`,
|
|
346
|
+
backgroundImage: `url(${getServiceUrl(res.app_coupon_url)})`,
|
|
272
347
|
backgroundSize: "100%",
|
|
273
348
|
backgroundRepeat: "no-repeat",
|
|
274
349
|
};
|
|
275
350
|
}
|
|
276
351
|
return item;
|
|
277
352
|
});
|
|
278
|
-
|
|
353
|
+
console.log("couponList", this.couponList);
|
|
279
354
|
this.message = res.message;
|
|
280
355
|
this.done = true;
|
|
281
356
|
})
|
|
@@ -295,6 +370,15 @@ export default {
|
|
|
295
370
|
},
|
|
296
371
|
})
|
|
297
372
|
.then((res) => {
|
|
373
|
+
if (res.code == 400) {
|
|
374
|
+
this.$xdAlert({
|
|
375
|
+
content: res.message,
|
|
376
|
+
zIndex: 3200,
|
|
377
|
+
time: 2000,
|
|
378
|
+
isClose: false,
|
|
379
|
+
});
|
|
380
|
+
return;
|
|
381
|
+
}
|
|
298
382
|
this.order_num = res.tmp_order_number;
|
|
299
383
|
this.getResult();
|
|
300
384
|
})
|
|
@@ -320,6 +404,7 @@ export default {
|
|
|
320
404
|
});
|
|
321
405
|
this.getList();
|
|
322
406
|
if (this.timeer) {
|
|
407
|
+
this.time = 1;
|
|
323
408
|
clearTimeout(this.timeer);
|
|
324
409
|
}
|
|
325
410
|
return;
|
|
@@ -332,7 +417,11 @@ export default {
|
|
|
332
417
|
time: 2000,
|
|
333
418
|
isClose: false,
|
|
334
419
|
});
|
|
420
|
+
if (res.code == 400) {
|
|
421
|
+
this.getList();
|
|
422
|
+
}
|
|
335
423
|
if (this.timeer) {
|
|
424
|
+
this.time = 1;
|
|
336
425
|
clearTimeout(this.timeer);
|
|
337
426
|
}
|
|
338
427
|
return;
|