jufubao-base 1.0.159-beta8 → 1.0.159
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 +1 -1
- package/src/common/authorize.js +70 -201
- package/src/components/JfbBaseAddress/JfbBaseAddress.vue +6 -7
- package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue +3 -5
- package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +2 -3
- package/src/components/JfbBaseBack/JfbBaseBack.vue +8 -10
- package/src/components/JfbBaseBackground/JfbBaseBackground.vue +2 -3
- package/src/components/JfbBaseBlock/JfbBaseBlock.vue +2 -3
- package/src/components/JfbBaseCard/JfbBaseCard.vue +6 -10
- package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue +26 -57
- package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue +15 -14
- package/src/components/JfbBaseCardDetailEntry/Attr.js +0 -22
- package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +423 -390
- package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +4 -4
- package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue +9 -7
- package/src/components/JfbBaseCardEntry/Attr.js +1 -22
- package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +33 -86
- package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue +19 -36
- package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue +4 -9
- package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue +3 -4
- package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue +18 -23
- package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue +11 -4
- package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue +19 -16
- package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue +2 -3
- package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +18 -34
- package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +14 -14
- package/src/components/JfbBaseCity/JfbBaseCity.vue +2 -3
- package/src/components/JfbBaseClear/JfbBaseClear.vue +2 -3
- package/src/components/JfbBaseConDialog/Api.js +13 -1
- package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue +79 -20
- package/src/components/JfbBaseConDialog/XdCouCardBind.vue +223 -133
- package/src/components/JfbBaseConList/Api.js +13 -1
- package/src/components/JfbBaseConList/Attr.js +11 -0
- package/src/components/JfbBaseConList/JfbBaseConList.vue +355 -123
- package/src/components/JfbBaseConList/Mock.js +1 -1
- package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue +2 -3
- package/src/components/JfbBaseEntry/Attr.js +0 -22
- package/src/components/JfbBaseEntry/JfbBaseEntry.vue +16 -80
- package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetail.vue +4 -3
- package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +20 -31
- package/src/components/JfbBaseFastLink/XdFastNav.vue +2 -2
- package/src/components/JfbBaseFooter/JfbBaseFooter.vue +1 -0
- package/src/components/JfbBaseHeader/JfbBaseHeader.vue +2 -3
- package/src/components/JfbBaseLogin/JfbBaseLogin.vue +11 -28
- package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue +9 -7
- package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue +6 -9
- package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlay.vue +5 -19
- package/src/components/JfbBaseMapOverlay/XdMapOverlay.vue +37 -52
- package/src/components/JfbBaseMapSearch/JfbBaseMapSearch.vue +2 -3
- package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCard.vue +27 -28
- package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpress.vue +5 -5
- package/src/components/JfbBaseMy/JfbBaseMy.vue +3 -3
- package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue +4 -6
- package/src/components/JfbBaseNotice/Attr.js +2 -0
- package/src/components/JfbBaseNotice/JfbBaseNotice.vue +14 -36
- package/src/components/JfbBaseNotice/XdNoticeBar.vue +1 -17
- package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottom.vue +2 -3
- package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTop.vue +2 -3
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +31 -20
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +4 -9
- package/src/components/JfbBasePay/JfbBasePay.vue +2 -3
- package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue +7 -22
- package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue +7 -23
- package/src/components/JfbBasePoster/JfbBasePoster.vue +18 -118
- package/src/components/JfbBasePoster/MoreScreen.vue +37 -155
- package/src/components/JfbBasePosterBigSmall/Attr.js +4 -1
- package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue +67 -191
- package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue +20 -90
- package/src/components/JfbBasePosterType/FourScreen.vue +18 -162
- package/src/components/JfbBasePosterType/JfbBasePosterType.vue +35 -0
- package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue +4 -4
- package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +4 -3
- package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue +7 -4
- package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue +9 -6
- package/src/components/JfbBaseSearch/JfbBaseSearch.vue +2 -3
- package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +4 -5
- package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue +2 -3
- package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +3 -5
- package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue +3 -4
- package/src/components/JfbBaseVideo/JfbBaseVideo.vue +11 -14
- package/src/components/JfbBaseVideo/XdVideo.vue +4 -0
- package/src/components/JfbBaseWallet/JfbBaseWallet.vue +2 -3
- package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetail.vue +8 -5
- package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffective.vue +8 -5
- package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue +17 -7
- package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue +21 -13
- package/src/components/JfbBaseWebview/JfbBaseWebview.vue +3 -4
- package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue +4 -5
- package/src/components/JfbBaseWxAuthorizeError/JfbBaseWxAuthorizeError.vue +4 -3
- package/src/mixins/colorCardMixins.js +1 -1
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
backgroundSize: '100%',
|
|
25
25
|
backgroundRepeat: 'no-repeat',
|
|
26
26
|
minHeight: `${layoutInfo.bodyMinHeightRpx}rpx`,
|
|
27
|
-
|
|
27
|
+
}"
|
|
28
28
|
>
|
|
29
|
-
<view v-if="
|
|
29
|
+
<view v-if="is_blank_page==='N'">
|
|
30
30
|
<view class="jfb-base-con-list__body-content">
|
|
31
31
|
<view class="jfb-base-con-list__body-content-header">
|
|
32
32
|
<view class="jfb-base-con-list__body-content-header-left">
|
|
@@ -34,7 +34,10 @@
|
|
|
34
34
|
<view>赠送优惠券</view>
|
|
35
35
|
</view>
|
|
36
36
|
<view
|
|
37
|
-
:style="{
|
|
37
|
+
:style="{
|
|
38
|
+
color: '#FA2125',
|
|
39
|
+
backgroundColor: contentBackground,
|
|
40
|
+
}"
|
|
38
41
|
class="jfb-base-con-list__body-content-header-right"
|
|
39
42
|
@click="showRule = true"
|
|
40
43
|
>
|
|
@@ -42,72 +45,167 @@
|
|
|
42
45
|
<xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
|
|
43
46
|
</view>
|
|
44
47
|
</view>
|
|
45
|
-
|
|
46
|
-
|
|
48
|
+
|
|
49
|
+
<view v-if="isAll">
|
|
50
|
+
<view v-if="isRandom">
|
|
51
|
+
<view class="jfb-base-con-list__body-content-list">
|
|
52
|
+
<view style="text-align:center;padding-top:140rpx;padding-bottom:54rpx">
|
|
53
|
+
<img
|
|
54
|
+
style="width:360rpx;height:340rpx"
|
|
55
|
+
:src="app_coupon_bottom_url"
|
|
56
|
+
alt=""
|
|
57
|
+
/>
|
|
58
|
+
</view>
|
|
59
|
+
<xd-button
|
|
60
|
+
size="small"
|
|
61
|
+
type="primary"
|
|
62
|
+
:style="btn_style"
|
|
63
|
+
@click="can_take!=='Y'?toCoupon():getAllCoupont()"
|
|
64
|
+
>{{ btn_txt }}</xd-button
|
|
65
|
+
>
|
|
66
|
+
</view>
|
|
67
|
+
</view>
|
|
68
|
+
<view v-else>
|
|
47
69
|
<view
|
|
48
|
-
class="jfb-base-con-list__body-content-list
|
|
49
|
-
:class="'status_' + item.can_take_num"
|
|
50
|
-
:style="{
|
|
51
|
-
backgroundColor: item.can_take_num==='Y'||item.can_take_num==='P'? contentBackground:'#F3F3F3',
|
|
52
|
-
}"
|
|
70
|
+
class="jfb-base-con-list__body-content-list"
|
|
53
71
|
>
|
|
54
|
-
<view
|
|
55
|
-
<
|
|
56
|
-
|
|
72
|
+
<view>
|
|
73
|
+
<view v-for="(item, index) in couponList" :key="index">
|
|
74
|
+
<view
|
|
75
|
+
class="jfb-base-con-list__body-content-list-item"
|
|
76
|
+
:class="'status_' + item.can_take_num"
|
|
77
|
+
:style="{
|
|
78
|
+
backgroundColor:
|
|
79
|
+
item.can_take_num === 'Y' || item.can_take_num === 'P'
|
|
80
|
+
? contentBackground
|
|
81
|
+
: '#F3F3F3',
|
|
82
|
+
}"
|
|
83
|
+
>
|
|
84
|
+
<view class="item_head">
|
|
85
|
+
<image
|
|
86
|
+
class="t_icon"
|
|
87
|
+
mode="widthFix"
|
|
88
|
+
:src="item.headIcon"
|
|
89
|
+
></image>
|
|
90
|
+
<view>{{ item.prize_type }}</view>
|
|
91
|
+
</view>
|
|
92
|
+
<view class="item_sub">{{ item.prize_name }}</view>
|
|
93
|
+
<xd-font-icon
|
|
94
|
+
size="100"
|
|
95
|
+
:style="{
|
|
96
|
+
color: item.iconColor,
|
|
97
|
+
position: 'absolute',
|
|
98
|
+
right: '0rpx',
|
|
99
|
+
top: '0rpx',
|
|
100
|
+
}"
|
|
101
|
+
:icon="item.icon"
|
|
102
|
+
></xd-font-icon>
|
|
103
|
+
</view>
|
|
104
|
+
</view>
|
|
57
105
|
</view>
|
|
58
|
-
<
|
|
59
|
-
|
|
60
|
-
|
|
106
|
+
<xd-button
|
|
107
|
+
size="small"
|
|
108
|
+
type="primary"
|
|
109
|
+
:style="btn_style"
|
|
110
|
+
@click="can_take!=='Y'?toCoupon():getAllCoupont()"
|
|
111
|
+
>{{ btn_txt }}</xd-button
|
|
112
|
+
>
|
|
113
|
+
</view>
|
|
114
|
+
</view>
|
|
115
|
+
</view>
|
|
116
|
+
|
|
117
|
+
<view v-else>
|
|
118
|
+
<view
|
|
119
|
+
v-if="can_take === 'Y' && has_times === 'Y'"
|
|
120
|
+
class="jfb-base-con-list__body-content-list"
|
|
121
|
+
>
|
|
122
|
+
<view v-for="(item, index) in couponList" :key="index">
|
|
123
|
+
<view
|
|
124
|
+
class="jfb-base-con-list__body-content-list-item"
|
|
125
|
+
:class="'status_' + item.can_take_num"
|
|
61
126
|
:style="{
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
127
|
+
backgroundColor:
|
|
128
|
+
item.can_take_num === 'Y' || item.can_take_num === 'P'
|
|
129
|
+
? contentBackground
|
|
130
|
+
: '#F3F3F3',
|
|
66
131
|
}"
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
132
|
+
>
|
|
133
|
+
<view class="item_head">
|
|
134
|
+
<image
|
|
135
|
+
class="t_icon"
|
|
136
|
+
mode="widthFix"
|
|
137
|
+
:src="item.headIcon"
|
|
138
|
+
></image>
|
|
139
|
+
<view>{{ item.prize_type }}</view>
|
|
140
|
+
</view>
|
|
141
|
+
<view class="item_sub">{{ item.prize_name }}</view>
|
|
142
|
+
<xd-font-icon
|
|
143
|
+
size="100"
|
|
144
|
+
:style="{
|
|
145
|
+
color: item.iconColor,
|
|
146
|
+
position: 'absolute',
|
|
147
|
+
right: '0rpx',
|
|
148
|
+
top: '0rpx',
|
|
149
|
+
}"
|
|
150
|
+
:icon="item.icon"
|
|
151
|
+
></xd-font-icon>
|
|
152
|
+
<view class="btn_wrap">
|
|
153
|
+
<xd-button
|
|
154
|
+
size="small"
|
|
155
|
+
:disabled="
|
|
156
|
+
item.can_take_num !== 'Y' &&
|
|
157
|
+
item.remain_card_count == 0
|
|
158
|
+
"
|
|
159
|
+
@click="getCoupont(item)"
|
|
160
|
+
type="primary"
|
|
161
|
+
style="width: 170rpx; height: 60rpx"
|
|
162
|
+
:style="item.btn"
|
|
163
|
+
:color="item.infoColor"
|
|
164
|
+
>{{ item.btn_txt }}</xd-button
|
|
165
|
+
>
|
|
166
|
+
</view>
|
|
79
167
|
</view>
|
|
80
168
|
</view>
|
|
81
169
|
</view>
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
170
|
+
<view
|
|
171
|
+
v-else
|
|
172
|
+
class="jfb-base-con-list__body-content-list"
|
|
173
|
+
style="padding-bottom: 60rpx"
|
|
174
|
+
>
|
|
175
|
+
<image mode="widthFix" :src="used_up_url"></image>
|
|
176
|
+
</view>
|
|
85
177
|
</view>
|
|
86
178
|
</view>
|
|
87
|
-
<view class="jfb-base-con-list__body-content-foot" @click="toCoupon"
|
|
179
|
+
<view class="jfb-base-con-list__body-content-foot" @click="toCoupon">
|
|
88
180
|
<view
|
|
89
181
|
:style="{
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
182
|
+
padding: outPadding,
|
|
183
|
+
border: border,
|
|
184
|
+
borderRadius: radius + 'rpx',
|
|
185
|
+
color: btnTextColor,
|
|
186
|
+
backgroundColor: btnBgColor,
|
|
187
|
+
boxShadow: shadow,
|
|
188
|
+
fontSize: btnTextSize+'rpx'
|
|
189
|
+
}"
|
|
190
|
+
>查看已领票券</view
|
|
191
|
+
>
|
|
97
192
|
</view>
|
|
98
193
|
</view>
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
194
|
+
|
|
195
|
+
<view v-else class="empty_data">
|
|
196
|
+
<image :src="emptyBg"></image>
|
|
197
|
+
{{ message }}
|
|
198
|
+
</view>
|
|
104
199
|
<xd-dailog
|
|
105
200
|
:cancel="false"
|
|
106
201
|
:confirm="false"
|
|
107
202
|
title="活动规则说明"
|
|
108
203
|
:show.sync="showRule"
|
|
109
204
|
>
|
|
110
|
-
<xd-content-xss
|
|
205
|
+
<xd-content-xss
|
|
206
|
+
style="text-align: left"
|
|
207
|
+
:html="notice"
|
|
208
|
+
></xd-content-xss>
|
|
111
209
|
</xd-dailog>
|
|
112
210
|
</view>
|
|
113
211
|
</view>
|
|
@@ -165,18 +263,25 @@ export default {
|
|
|
165
263
|
collectedPath: "",
|
|
166
264
|
|
|
167
265
|
//按钮设置
|
|
168
|
-
btnBgColor:
|
|
169
|
-
btnTextColor:
|
|
170
|
-
padding:{},
|
|
266
|
+
btnBgColor: "",
|
|
267
|
+
btnTextColor: "",
|
|
268
|
+
padding: {},
|
|
171
269
|
radius: 0,
|
|
172
270
|
//边框
|
|
173
|
-
is_border:
|
|
174
|
-
is_border_c:
|
|
175
|
-
is_border_w:
|
|
271
|
+
is_border: "N",
|
|
272
|
+
is_border_c: "",
|
|
273
|
+
is_border_w: "",
|
|
176
274
|
//投影
|
|
177
|
-
is_shadow:
|
|
275
|
+
is_shadow: "Y",
|
|
178
276
|
is_shadow_bg: 0,
|
|
179
277
|
is_shadow_w: 0,
|
|
278
|
+
|
|
279
|
+
isAll: false,
|
|
280
|
+
isRandom: false,
|
|
281
|
+
btn_txt: "",
|
|
282
|
+
btn_style: {},
|
|
283
|
+
btnTextSize: '',
|
|
284
|
+
is_blank_page: 'Y'
|
|
180
285
|
};
|
|
181
286
|
},
|
|
182
287
|
computed: {
|
|
@@ -189,21 +294,22 @@ export default {
|
|
|
189
294
|
str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
|
|
190
295
|
str = `${str} ${this.checkValue(this.padding.bottom, 0)}rpx`;
|
|
191
296
|
str = `${str} ${this.checkValue(this.padding.left, 0)}rpx`;
|
|
192
|
-
return str
|
|
297
|
+
return str;
|
|
193
298
|
},
|
|
194
299
|
border() {
|
|
195
|
-
if (this.is_border ===
|
|
196
|
-
|
|
300
|
+
if (this.is_border === "Y")
|
|
301
|
+
return `${this.is_border_w}rpx solid ${this.is_border_c}`;
|
|
302
|
+
else return "0";
|
|
197
303
|
},
|
|
198
|
-
shadow(){
|
|
199
|
-
if(this.is_shadow ===
|
|
200
|
-
|
|
304
|
+
shadow() {
|
|
305
|
+
if (this.is_shadow === "Y")
|
|
306
|
+
return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
|
|
307
|
+
else return "0 0 0 rgba(0,0,0,0)";
|
|
201
308
|
},
|
|
202
309
|
},
|
|
203
310
|
watch: {
|
|
204
|
-
container(value
|
|
205
|
-
|
|
206
|
-
if (this.$configProject['isPreview']) this.init(value)
|
|
311
|
+
container(value) {
|
|
312
|
+
this.init(value);
|
|
207
313
|
},
|
|
208
314
|
},
|
|
209
315
|
created() {
|
|
@@ -216,22 +322,55 @@ export default {
|
|
|
216
322
|
},
|
|
217
323
|
methods: {
|
|
218
324
|
init(value) {
|
|
219
|
-
this.contentBackground =
|
|
220
|
-
this.iconColor =
|
|
221
|
-
this.collectedPath = getContainerPropsValue(
|
|
325
|
+
this.contentBackground = "#FFF8F8";
|
|
326
|
+
this.iconColor = "#FF4D4A";
|
|
327
|
+
this.collectedPath = getContainerPropsValue(
|
|
328
|
+
value,
|
|
329
|
+
"content.collectedPath",
|
|
330
|
+
{ value: "" }
|
|
331
|
+
).value;
|
|
222
332
|
|
|
223
333
|
this.padding = getContainerPropsValue(value, "content.padding", {});
|
|
224
|
-
this.btnBgColor = getContainerPropsValue(
|
|
225
|
-
|
|
226
|
-
|
|
334
|
+
this.btnBgColor = getContainerPropsValue(
|
|
335
|
+
value,
|
|
336
|
+
"content.btnBgColor",
|
|
337
|
+
"rgba(0,0,0,0)"
|
|
338
|
+
);
|
|
339
|
+
this.btnTextColor = getContainerPropsValue(
|
|
340
|
+
value,
|
|
341
|
+
"content.btnTextColor",
|
|
342
|
+
"#666"
|
|
343
|
+
);
|
|
344
|
+
this.btnTextSize = getContainerPropsValue(
|
|
345
|
+
value,
|
|
346
|
+
"content.btnTextSize",
|
|
347
|
+
"28"
|
|
348
|
+
);
|
|
349
|
+
this.radius = getContainerPropsValue(value, "content.radius", "0");
|
|
227
350
|
|
|
228
|
-
this.is_border = getContainerPropsValue(value, "content.is_border",
|
|
229
|
-
this.is_border_c = getContainerPropsValue(
|
|
230
|
-
|
|
351
|
+
this.is_border = getContainerPropsValue(value, "content.is_border", "N");
|
|
352
|
+
this.is_border_c = getContainerPropsValue(
|
|
353
|
+
value,
|
|
354
|
+
"content.is_border_c",
|
|
355
|
+
"#e5e5e5"
|
|
356
|
+
);
|
|
357
|
+
this.is_border_w = getContainerPropsValue(
|
|
358
|
+
value,
|
|
359
|
+
"content.is_border_w",
|
|
360
|
+
1
|
|
361
|
+
);
|
|
231
362
|
|
|
232
|
-
this.is_shadow = getContainerPropsValue(value,
|
|
233
|
-
this.is_shadow_bg = getContainerPropsValue(
|
|
234
|
-
|
|
363
|
+
this.is_shadow = getContainerPropsValue(value, "content.is_shadow", "N");
|
|
364
|
+
this.is_shadow_bg = getContainerPropsValue(
|
|
365
|
+
value,
|
|
366
|
+
"content.is_shadow_bg",
|
|
367
|
+
"#fff"
|
|
368
|
+
);
|
|
369
|
+
this.is_shadow_w = getContainerPropsValue(
|
|
370
|
+
value,
|
|
371
|
+
"content.is_shadow_w",
|
|
372
|
+
"10"
|
|
373
|
+
);
|
|
235
374
|
},
|
|
236
375
|
|
|
237
376
|
getList() {
|
|
@@ -247,30 +386,79 @@ export default {
|
|
|
247
386
|
.then((res) => {
|
|
248
387
|
this.background = getServiceUrl(res.background);
|
|
249
388
|
this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
|
|
389
|
+
this.app_activity_button =
|
|
390
|
+
res.app_activity_button && getServiceUrl(res.app_activity_button);
|
|
391
|
+
this.app_activity_url =
|
|
392
|
+
res.app_activity_url && getServiceUrl(res.app_activity_url);
|
|
393
|
+
this.app_coupon_bottom_url =
|
|
394
|
+
res.app_coupon_bottom_url &&
|
|
395
|
+
getServiceUrl(res.app_coupon_bottom_url);
|
|
250
396
|
this.can_take = res.can_take;
|
|
251
397
|
this.has_times = res.has_times;
|
|
252
398
|
this.next_url = res.next_url;
|
|
399
|
+
this.isAll = res.receive_method === "batch";
|
|
400
|
+
this.isRandom = res.distribution_type === "random";
|
|
401
|
+
// 判断是否是一键领取
|
|
402
|
+
if (this.isAll) {
|
|
403
|
+
// 定义按钮文字
|
|
404
|
+
let btn_txt = "";
|
|
405
|
+
// 设置按钮样式
|
|
406
|
+
this.btn_style = res.app_coupon_button_bg_url
|
|
407
|
+
? {
|
|
408
|
+
// 设置背景图片
|
|
409
|
+
backgroundImage: `url(${getServiceUrl(
|
|
410
|
+
res.can_take !== "Y"
|
|
411
|
+
? res.app_coupon_button_see_url
|
|
412
|
+
: res.app_coupon_button_bg_url
|
|
413
|
+
)})`,
|
|
414
|
+
// 设置背景大小
|
|
415
|
+
backgroundSize: "100% 100%",
|
|
416
|
+
// 设置背景重复
|
|
417
|
+
backgroundRepeat: "no-repeat",
|
|
418
|
+
// 设置背景颜色
|
|
419
|
+
backgroundColor: "",
|
|
420
|
+
height: '70rpx',
|
|
421
|
+
width: '450rpx',
|
|
422
|
+
marginTop: '26rpx'
|
|
423
|
+
}
|
|
424
|
+
: {
|
|
425
|
+
// 设置背景颜色
|
|
426
|
+
backgroundColor: "#FB5B3F",
|
|
427
|
+
height: '70rpx',
|
|
428
|
+
width: '450rpx',
|
|
429
|
+
marginTop: '26rpx'
|
|
430
|
+
};
|
|
431
|
+
// 设置按钮文字
|
|
432
|
+
btn_txt = res.can_take === "Y" ? "一键领取" : "去查看";
|
|
433
|
+
// 判断是否是随机领取
|
|
434
|
+
if (this.isRandom) {
|
|
435
|
+
// 设置按钮文字
|
|
436
|
+
btn_txt = res.can_take === "Y" ? "开心领取" : "去查看";
|
|
437
|
+
}
|
|
438
|
+
// 设置按钮文字
|
|
439
|
+
this.btn_txt = btn_txt;
|
|
440
|
+
}
|
|
253
441
|
|
|
254
|
-
|
|
255
|
-
res.list
|
|
256
|
-
|
|
257
|
-
res.list.map((item) => {
|
|
258
|
-
let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
|
|
442
|
+
if (res.list && res.list.length) {
|
|
443
|
+
this.couponList = res.list.map((item) => {
|
|
444
|
+
let mapArr = { Y: "去查看", P: "领取", N: "已发完" };
|
|
259
445
|
item.btn_txt = mapArr[item.can_take_num];
|
|
260
446
|
if (item.can_take_num === "Y" || item.can_take_num === "P") {
|
|
261
447
|
//按钮样式
|
|
262
448
|
item.btn = res.app_coupon_button_bg_url
|
|
263
449
|
? {
|
|
264
450
|
backgroundImage: `url(${getServiceUrl(
|
|
265
|
-
item.can_take_num === "Y"
|
|
451
|
+
item.can_take_num === "Y"
|
|
452
|
+
? res.app_coupon_button_see_url
|
|
453
|
+
: res.app_coupon_button_bg_url
|
|
266
454
|
)})`,
|
|
267
455
|
backgroundSize: "100% 100%",
|
|
268
456
|
backgroundRepeat: "no-repeat",
|
|
269
|
-
backgroundColor:
|
|
457
|
+
backgroundColor: "",
|
|
270
458
|
margin: "0",
|
|
271
459
|
}
|
|
272
460
|
: {
|
|
273
|
-
backgroundColor:
|
|
461
|
+
backgroundColor: "#FB5B3F",
|
|
274
462
|
margin: "0",
|
|
275
463
|
};
|
|
276
464
|
//整块背景
|
|
@@ -281,57 +469,63 @@ export default {
|
|
|
281
469
|
backgroundRepeat: "no-repeat",
|
|
282
470
|
};
|
|
283
471
|
//icon
|
|
284
|
-
item.icon=
|
|
472
|
+
item.icon =
|
|
473
|
+
item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
|
|
285
474
|
//icon颜色
|
|
286
|
-
item.iconColor =
|
|
475
|
+
item.iconColor =
|
|
476
|
+
item.can_take_num === "Y" ? "#D6D6D6" : this.iconColor;
|
|
287
477
|
//券名称颜色
|
|
288
|
-
item.nameColor =
|
|
478
|
+
item.nameColor = "#FB5B3F";
|
|
289
479
|
//其他文字颜色
|
|
290
|
-
item.infoColor =
|
|
480
|
+
item.infoColor = "#fff";
|
|
291
481
|
} else {
|
|
292
482
|
//按钮样式
|
|
293
483
|
item.btn = { background: "#D6D6D6", margin: "0" };
|
|
294
484
|
//整块背景
|
|
295
|
-
item.headIcon = getServiceUrl(res.app_coupon_invalid_url)
|
|
485
|
+
item.headIcon = getServiceUrl(res.app_coupon_invalid_url);
|
|
296
486
|
item.couponBackground = {
|
|
297
|
-
backgroundImage: `url(${getServiceUrl(
|
|
487
|
+
backgroundImage: `url(${getServiceUrl(
|
|
488
|
+
res.app_coupon_invalid_url
|
|
489
|
+
)})`,
|
|
298
490
|
backgroundSize: "100%",
|
|
299
491
|
backgroundRepeat: "no-repeat",
|
|
300
492
|
};
|
|
301
493
|
//icon
|
|
302
|
-
item.icon=
|
|
494
|
+
item.icon = "iconyifawan";
|
|
303
495
|
//icon颜色
|
|
304
|
-
item.iconColor =
|
|
496
|
+
item.iconColor = "#D6D6D6";
|
|
305
497
|
//券名称颜色
|
|
306
|
-
item.nameColor =
|
|
498
|
+
item.nameColor = "#BBBBBB";
|
|
307
499
|
//其他文字颜色
|
|
308
|
-
item.infoColor =
|
|
500
|
+
item.infoColor = "#BBBBBB";
|
|
309
501
|
}
|
|
310
502
|
return item;
|
|
311
503
|
});
|
|
504
|
+
}
|
|
312
505
|
console.log("couponList", this.couponList);
|
|
313
506
|
this.message = res.message;
|
|
314
507
|
this.notice = res.about;
|
|
315
508
|
this.done = true;
|
|
509
|
+
this.is_blank_page = res.is_blank_page;
|
|
316
510
|
})
|
|
317
511
|
.catch((err) => {
|
|
318
512
|
console.log(err, "err");
|
|
319
513
|
});
|
|
320
514
|
},
|
|
321
515
|
|
|
322
|
-
toCoupon(){
|
|
516
|
+
toCoupon() {
|
|
323
517
|
this.$xdUniHelper.navigateTo({
|
|
324
518
|
url: this.next_url || this.collectedPath,
|
|
325
519
|
});
|
|
326
520
|
},
|
|
327
521
|
|
|
328
522
|
getCoupont(item) {
|
|
329
|
-
if(item.can_take_num === "Y") {
|
|
523
|
+
if (item.can_take_num === "Y") {
|
|
330
524
|
this.toCoupon();
|
|
331
525
|
return;
|
|
332
526
|
}
|
|
333
527
|
this.$xdShowLoading({});
|
|
334
|
-
jfbRootExec("
|
|
528
|
+
jfbRootExec("getOnceCoupon", {
|
|
335
529
|
vm: this,
|
|
336
530
|
data: {
|
|
337
531
|
...this.options,
|
|
@@ -354,9 +548,42 @@ export default {
|
|
|
354
548
|
return;
|
|
355
549
|
}
|
|
356
550
|
this.order_num = res.tmp_order_number;
|
|
357
|
-
setTimeout(()=>{
|
|
551
|
+
setTimeout(() => {
|
|
358
552
|
this.getResult();
|
|
359
|
-
},1000)
|
|
553
|
+
}, 1000);
|
|
554
|
+
})
|
|
555
|
+
.catch((err) => {
|
|
556
|
+
console.log(err, "err");
|
|
557
|
+
});
|
|
558
|
+
},
|
|
559
|
+
|
|
560
|
+
getAllCoupont() {
|
|
561
|
+
this.$xdShowLoading({});
|
|
562
|
+
jfbRootExec("getAllCoupon", {
|
|
563
|
+
vm: this,
|
|
564
|
+
data: {
|
|
565
|
+
...this.options,
|
|
566
|
+
distribution_method: this.method,
|
|
567
|
+
namespace: this.pageBusinessCode,
|
|
568
|
+
activity_id: this.activity_id,
|
|
569
|
+
},
|
|
570
|
+
})
|
|
571
|
+
.then((res) => {
|
|
572
|
+
if (res.code == 400) {
|
|
573
|
+
this.$xdHideLoading();
|
|
574
|
+
this.$xdAlert({
|
|
575
|
+
content: res.message,
|
|
576
|
+
zIndex: 3200,
|
|
577
|
+
time: 2000,
|
|
578
|
+
isClose: false,
|
|
579
|
+
});
|
|
580
|
+
this.getList();
|
|
581
|
+
return;
|
|
582
|
+
}
|
|
583
|
+
this.order_num = res.tmp_order_number;
|
|
584
|
+
setTimeout(() => {
|
|
585
|
+
this.getResult();
|
|
586
|
+
}, 1000);
|
|
360
587
|
})
|
|
361
588
|
.catch((err) => {
|
|
362
589
|
console.log(err, "err");
|
|
@@ -381,11 +608,14 @@ export default {
|
|
|
381
608
|
time: 2000,
|
|
382
609
|
isClose: false,
|
|
383
610
|
});
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
this.
|
|
387
|
-
|
|
388
|
-
|
|
611
|
+
setTimeout(()=>{
|
|
612
|
+
this.getList();
|
|
613
|
+
this.btn_txt = "去查看";
|
|
614
|
+
if (this.timeer) {
|
|
615
|
+
this.time = 0;
|
|
616
|
+
clearTimeout(this.timeer);
|
|
617
|
+
}
|
|
618
|
+
},2000)
|
|
389
619
|
return;
|
|
390
620
|
}
|
|
391
621
|
if (res.status_type === "error") {
|
|
@@ -396,13 +626,15 @@ export default {
|
|
|
396
626
|
time: 2000,
|
|
397
627
|
isClose: false,
|
|
398
628
|
});
|
|
399
|
-
|
|
629
|
+
setTimeout(()=>{
|
|
630
|
+
if (res.code == 400) {
|
|
400
631
|
this.getList();
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
632
|
+
}
|
|
633
|
+
if (this.timeer) {
|
|
634
|
+
this.time = 0;
|
|
635
|
+
clearTimeout(this.timeer);
|
|
636
|
+
}
|
|
637
|
+
},2000)
|
|
406
638
|
return;
|
|
407
639
|
}
|
|
408
640
|
|
|
@@ -414,6 +646,7 @@ export default {
|
|
|
414
646
|
`pay_${res.status_type}`
|
|
415
647
|
);
|
|
416
648
|
}
|
|
649
|
+
this.btn_txt = `领取中 ${res.success_num}/${res.total_num}`;
|
|
417
650
|
this.time++;
|
|
418
651
|
}, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
|
|
419
652
|
})
|
|
@@ -469,7 +702,7 @@ export default {
|
|
|
469
702
|
overflow-y: auto;
|
|
470
703
|
padding-top: 220rpx;
|
|
471
704
|
box-sizing: border-box;
|
|
472
|
-
background-color: #
|
|
705
|
+
background-color: #fafafa;
|
|
473
706
|
}
|
|
474
707
|
|
|
475
708
|
.empty_data {
|
|
@@ -530,40 +763,39 @@ export default {
|
|
|
530
763
|
margin: unit(20, rpx) auto 0 auto;
|
|
531
764
|
position: relative;
|
|
532
765
|
|
|
533
|
-
&.status_N{
|
|
534
|
-
.item_head{
|
|
535
|
-
color: #
|
|
766
|
+
&.status_N {
|
|
767
|
+
.item_head {
|
|
768
|
+
color: #bbbbbb;
|
|
536
769
|
}
|
|
537
|
-
.item_sub{
|
|
538
|
-
color: #
|
|
770
|
+
.item_sub {
|
|
771
|
+
color: #bbbbbb;
|
|
539
772
|
}
|
|
540
773
|
}
|
|
541
|
-
.btn_wrap{
|
|
774
|
+
.btn_wrap {
|
|
542
775
|
position: absolute;
|
|
543
776
|
right: 30rpx;
|
|
544
777
|
bottom: 40rpx;
|
|
545
778
|
}
|
|
546
779
|
|
|
547
|
-
.item_head{
|
|
780
|
+
.item_head {
|
|
548
781
|
display: flex;
|
|
549
782
|
align-items: center;
|
|
550
783
|
font-size: 40rpx;
|
|
551
784
|
color: #000000;
|
|
552
785
|
font-weight: 500;
|
|
553
786
|
|
|
554
|
-
.t_icon{
|
|
787
|
+
.t_icon {
|
|
555
788
|
width: 44rpx;
|
|
556
789
|
margin-right: 20rpx;
|
|
557
790
|
max-height: 80rpx;
|
|
558
791
|
}
|
|
559
792
|
}
|
|
560
|
-
.item_sub{
|
|
793
|
+
.item_sub {
|
|
561
794
|
margin-top: 26rpx;
|
|
562
|
-
color: #
|
|
795
|
+
color: #ff4d4a;
|
|
563
796
|
font-size: 36rpx;
|
|
564
797
|
font-weight: 400;
|
|
565
798
|
}
|
|
566
|
-
|
|
567
799
|
}
|
|
568
800
|
}
|
|
569
801
|
&-foot {
|