jufubao-base 1.0.158-beta1 → 1.0.158-beta3
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/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue +2 -2
- package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue +3 -25
- package/src/components/JfbBaseConDialog/XdCouCardBind.vue +2 -30
- package/src/components/JfbBaseConList/Api.js +0 -12
- package/src/components/JfbBaseConList/JfbBaseConList.vue +111 -271
- package/src/components/JfbBaseConList/Mock.js +1 -1
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +3 -1
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +1 -1
package/package.json
CHANGED
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
class="jfb-base-after-order-detail__body-movie-content-info-bottom"
|
|
64
64
|
>
|
|
65
65
|
<view >
|
|
66
|
-
<xd-unit v-if="info.business_icon !== 'gift'" :price="item.sale_price"></xd-unit>
|
|
66
|
+
<xd-unit v-if="info.business_icon !== 'gift' && info.is_not_show_price !== 'Y'" :price="item.sale_price"></xd-unit>
|
|
67
67
|
</view>
|
|
68
68
|
<view style=" font-size: 28rpx; display: flex; align-items: center; color: #666;">x {{ item.buy_count }}</view>
|
|
69
69
|
</view>
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
:style="{ color: mainColor }"
|
|
81
81
|
>补发快递:{{ info['express_name'] }}</view> -->
|
|
82
82
|
<view v-else :style="{ color: mainColor }">
|
|
83
|
-
<view v-if="info.business_code !== 'gift'">
|
|
83
|
+
<view v-if="info.business_code !== 'gift' && info.is_not_show_price !== 'Y'">
|
|
84
84
|
已退款:¥{{ info.total_refund_sale_amount }}
|
|
85
85
|
</view>
|
|
86
86
|
</view>
|
|
@@ -53,14 +53,10 @@
|
|
|
53
53
|
</view>
|
|
54
54
|
<view v-else class="jfb-base-con-dialog__body-dialog-content">
|
|
55
55
|
<xd-cou-card-bind
|
|
56
|
-
:isAll="isAll"
|
|
57
|
-
:isRandom="isRandom"
|
|
58
56
|
:list="couponList"
|
|
59
57
|
:setting="couponOther"
|
|
60
|
-
:btnImage="btnImage"
|
|
61
58
|
@closeDialog="handleCardBindClose"
|
|
62
59
|
@getCoupont="handleGetCoupon"
|
|
63
|
-
@getAllCoupont="getAllCoupont"
|
|
64
60
|
></xd-cou-card-bind>
|
|
65
61
|
</view>
|
|
66
62
|
</view>
|
|
@@ -118,10 +114,6 @@ export default {
|
|
|
118
114
|
//预览是否显示弹窗
|
|
119
115
|
is_preview_hide_dailog: false,
|
|
120
116
|
|
|
121
|
-
isAll: true,
|
|
122
|
-
isRandom: true,
|
|
123
|
-
btnImage: ''
|
|
124
|
-
|
|
125
117
|
};
|
|
126
118
|
},
|
|
127
119
|
computed: {
|
|
@@ -190,6 +182,7 @@ export default {
|
|
|
190
182
|
},
|
|
191
183
|
|
|
192
184
|
getResult() {
|
|
185
|
+
debugger
|
|
193
186
|
jfbRootExec("getCouponResult", {
|
|
194
187
|
vm: this,
|
|
195
188
|
data: {
|
|
@@ -253,7 +246,7 @@ export default {
|
|
|
253
246
|
jfbRootExec("getCouponDialogList", {
|
|
254
247
|
vm: this,
|
|
255
248
|
data: {
|
|
256
|
-
namespace:
|
|
249
|
+
namespace: this.pageBusinessCode,
|
|
257
250
|
distribution_method: this.distribution_method,
|
|
258
251
|
...this.dispatchData
|
|
259
252
|
},
|
|
@@ -288,6 +281,7 @@ export default {
|
|
|
288
281
|
this.couponOther = other;
|
|
289
282
|
if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
|
|
290
283
|
if (this.isPreview) {
|
|
284
|
+
debugger
|
|
291
285
|
console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
|
|
292
286
|
this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
|
|
293
287
|
}else this.isShow = true;
|
|
@@ -305,22 +299,6 @@ export default {
|
|
|
305
299
|
}
|
|
306
300
|
},
|
|
307
301
|
|
|
308
|
-
getAllCoupont() {
|
|
309
|
-
if(this.isRandom){
|
|
310
|
-
this.p_getRandomCouponList();
|
|
311
|
-
}else{
|
|
312
|
-
this.p_getAllDialogList();
|
|
313
|
-
}
|
|
314
|
-
},
|
|
315
|
-
|
|
316
|
-
p_getRandomCouponList() {
|
|
317
|
-
|
|
318
|
-
},
|
|
319
|
-
|
|
320
|
-
p_getAllDialogList() {
|
|
321
|
-
|
|
322
|
-
},
|
|
323
|
-
|
|
324
302
|
handlePop() {
|
|
325
303
|
console.warn(`this.time${this.time * 60 + "分钟"}`);
|
|
326
304
|
storage.set(this.containerId, 1, this.time);
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
backgroundImage: dialogBackground
|
|
7
7
|
}"
|
|
8
8
|
>
|
|
9
|
-
<view
|
|
9
|
+
<view class="ticket_list">
|
|
10
10
|
<view
|
|
11
11
|
class="ticket_item"
|
|
12
12
|
:class="item.can_take_num"
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<view class="item_sub">{{ item.prize_name }}</view>
|
|
21
21
|
|
|
22
22
|
<xd-font-icon class="ticket_icon" :color="item.iconColor" :icon="item.icon"></xd-font-icon>
|
|
23
|
-
<view
|
|
23
|
+
<view class="btn">
|
|
24
24
|
<xd-button
|
|
25
25
|
size="small"
|
|
26
26
|
type="primary"
|
|
@@ -34,19 +34,6 @@
|
|
|
34
34
|
</view>
|
|
35
35
|
</view>
|
|
36
36
|
</view>
|
|
37
|
-
<view v-else>
|
|
38
|
-
随机领取图片
|
|
39
|
-
</view>
|
|
40
|
-
<xd-button
|
|
41
|
-
v-if="isAll"
|
|
42
|
-
size="small"
|
|
43
|
-
type="primary"
|
|
44
|
-
:style="{
|
|
45
|
-
backgroundImage: btnImage,
|
|
46
|
-
backgroundSize: '100% 100%',
|
|
47
|
-
}"
|
|
48
|
-
@click="getAllCoupont"
|
|
49
|
-
>{{isRandom?'开心获取':'一键领取'}}</xd-button>
|
|
50
37
|
</view>
|
|
51
38
|
|
|
52
39
|
<xd-font-icon
|
|
@@ -75,18 +62,6 @@ export default{
|
|
|
75
62
|
return []
|
|
76
63
|
}
|
|
77
64
|
},
|
|
78
|
-
isAll: {
|
|
79
|
-
type: Boolean,
|
|
80
|
-
default: false
|
|
81
|
-
},
|
|
82
|
-
isRandom: {
|
|
83
|
-
type: Boolean,
|
|
84
|
-
default: false
|
|
85
|
-
},
|
|
86
|
-
btnImage: {
|
|
87
|
-
type: String,
|
|
88
|
-
default: ""
|
|
89
|
-
},
|
|
90
65
|
setting: {}
|
|
91
66
|
},
|
|
92
67
|
computed: {
|
|
@@ -124,9 +99,6 @@ export default{
|
|
|
124
99
|
this.$emit("getCoupont", item);
|
|
125
100
|
}
|
|
126
101
|
},
|
|
127
|
-
getAllCoupont() {
|
|
128
|
-
this.$emit("getAllCoupont", item);
|
|
129
|
-
},
|
|
130
102
|
handleClose(){
|
|
131
103
|
this.$emit("closeDialog");
|
|
132
104
|
}
|
|
@@ -32,18 +32,6 @@ module.exports = [
|
|
|
32
32
|
isConsole: true,
|
|
33
33
|
disabled: true,
|
|
34
34
|
},
|
|
35
|
-
{
|
|
36
|
-
mapFnName: 'getOnceCoupon', //自定义方法名字(必选)
|
|
37
|
-
title: '领取优惠券',
|
|
38
|
-
path: '/sms-coupon/v1/activity-prizes-user/set',
|
|
39
|
-
isRule: false,
|
|
40
|
-
params: {
|
|
41
|
-
distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
|
|
42
|
-
namespace: ['业务线', 'String', '必填'],
|
|
43
|
-
},
|
|
44
|
-
isConsole: true,
|
|
45
|
-
disabled: true,
|
|
46
|
-
},
|
|
47
35
|
{
|
|
48
36
|
mapFnName: 'getAllCoupon', //自定义方法名字(必选)
|
|
49
37
|
title: '领取优惠券',
|
|
@@ -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="couponList&&couponList.length > 0" >
|
|
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,10 +34,7 @@
|
|
|
34
34
|
<view>赠送优惠券</view>
|
|
35
35
|
</view>
|
|
36
36
|
<view
|
|
37
|
-
:style="{
|
|
38
|
-
color: '#FA2125',
|
|
39
|
-
backgroundColor: contentBackground,
|
|
40
|
-
}"
|
|
37
|
+
:style="{ color: '#FA2125', backgroundColor: contentBackground }"
|
|
41
38
|
class="jfb-base-con-list__body-content-header-right"
|
|
42
39
|
@click="showRule = true"
|
|
43
40
|
>
|
|
@@ -45,99 +42,64 @@
|
|
|
45
42
|
<xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
|
|
46
43
|
</view>
|
|
47
44
|
</view>
|
|
48
|
-
<view
|
|
49
|
-
v-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
45
|
+
<view v-if="can_take === 'Y' && has_times === 'Y'" class="jfb-base-con-list__body-content-list">
|
|
46
|
+
<view v-for="(item, index) in couponList" :key="index">
|
|
47
|
+
<view
|
|
48
|
+
class="jfb-base-con-list__body-content-list-item"
|
|
49
|
+
:class="'status_' + item.can_take_num"
|
|
50
|
+
:style="{
|
|
51
|
+
backgroundColor: item.can_take_num==='Y'||item.can_take_num==='P'? contentBackground:'#F3F3F3',
|
|
52
|
+
}"
|
|
53
|
+
>
|
|
54
|
+
<view class="item_head">
|
|
55
|
+
<image class="t_icon" mode="widthFix" :src="item.headIcon" ></image>
|
|
56
|
+
<view>{{ item.prize_type }}</view>
|
|
57
|
+
</view>
|
|
58
|
+
<view class="item_sub">{{ item.prize_name }}</view>
|
|
59
|
+
<xd-font-icon
|
|
60
|
+
size="100"
|
|
57
61
|
:style="{
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
color: item.iconColor,
|
|
63
|
+
position: 'absolute',
|
|
64
|
+
right: '0rpx',
|
|
65
|
+
top: '0rpx',
|
|
62
66
|
}"
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
:style="{
|
|
76
|
-
color: item.iconColor,
|
|
77
|
-
position: 'absolute',
|
|
78
|
-
right: '0rpx',
|
|
79
|
-
top: '0rpx',
|
|
80
|
-
}"
|
|
81
|
-
:icon="item.icon"
|
|
82
|
-
></xd-font-icon>
|
|
83
|
-
<view v-if="!isAll" class="btn_wrap">
|
|
84
|
-
<xd-button
|
|
85
|
-
size="small"
|
|
86
|
-
:disabled="
|
|
87
|
-
item.can_take_num !== 'Y' &&
|
|
88
|
-
item.remain_card_count == 0
|
|
89
|
-
"
|
|
90
|
-
@click="getCoupont(item)"
|
|
91
|
-
type="primary"
|
|
92
|
-
style="width: 170rpx; height: 60rpx"
|
|
93
|
-
:style="item.btn"
|
|
94
|
-
:color="item.infoColor"
|
|
95
|
-
>{{ item.btn_txt }}</xd-button
|
|
96
|
-
>
|
|
97
|
-
</view>
|
|
67
|
+
:icon="item.icon"
|
|
68
|
+
></xd-font-icon>
|
|
69
|
+
<view class="btn_wrap">
|
|
70
|
+
<xd-button
|
|
71
|
+
size="small"
|
|
72
|
+
:disabled="item.can_take_num !=='Y' && item.remain_card_count == 0"
|
|
73
|
+
@click="getCoupont(item)"
|
|
74
|
+
type="primary"
|
|
75
|
+
style="width: 170rpx;height: 60rpx;"
|
|
76
|
+
:style="item.btn"
|
|
77
|
+
:color="item.infoColor"
|
|
78
|
+
>{{ item.btn_txt }}</xd-button>
|
|
98
79
|
</view>
|
|
99
80
|
</view>
|
|
100
81
|
</view>
|
|
101
|
-
<view v-else>
|
|
102
|
-
<img
|
|
103
|
-
style="width: 100%"
|
|
104
|
-
mode="widthFix"
|
|
105
|
-
:src="app_coupon_bottom_url"
|
|
106
|
-
alt=""
|
|
107
|
-
/>
|
|
108
|
-
</view>
|
|
109
|
-
<xd-button
|
|
110
|
-
v-if="isAll"
|
|
111
|
-
size="small"
|
|
112
|
-
type="primary"
|
|
113
|
-
:style="btn_style"
|
|
114
|
-
@click="getAllCoupont"
|
|
115
|
-
>{{ btn_txt }}</xd-button
|
|
116
|
-
>
|
|
117
82
|
</view>
|
|
118
|
-
<view
|
|
119
|
-
v-else
|
|
120
|
-
class="jfb-base-con-list__body-content-list"
|
|
121
|
-
style="padding-bottom: 60rpx"
|
|
122
|
-
>
|
|
83
|
+
<view v-else class="jfb-base-con-list__body-content-list" style="padding-bottom: 60rpx;">
|
|
123
84
|
<image mode="widthFix" :src="used_up_url"></image>
|
|
124
85
|
</view>
|
|
125
86
|
</view>
|
|
126
|
-
<view class="jfb-base-con-list__body-content-foot" @click="toCoupon">
|
|
87
|
+
<view class="jfb-base-con-list__body-content-foot" @click="toCoupon" >
|
|
127
88
|
<view
|
|
128
89
|
:style="{
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
>查看已领票券</view
|
|
137
|
-
>
|
|
90
|
+
padding:outPadding,
|
|
91
|
+
border:border,
|
|
92
|
+
borderRadius:radius + 'rpx',
|
|
93
|
+
color: btnTextColor,
|
|
94
|
+
backgroundColor: btnBgColor,
|
|
95
|
+
boxShadow:shadow
|
|
96
|
+
}">查看已领票券</view>
|
|
138
97
|
</view>
|
|
139
98
|
</view>
|
|
140
|
-
<view
|
|
99
|
+
<view
|
|
100
|
+
v-else
|
|
101
|
+
class="empty_data"
|
|
102
|
+
>
|
|
141
103
|
<image :src="emptyBg"></image>
|
|
142
104
|
{{ message }}
|
|
143
105
|
</view>
|
|
@@ -147,10 +109,7 @@
|
|
|
147
109
|
title="活动规则说明"
|
|
148
110
|
:show.sync="showRule"
|
|
149
111
|
>
|
|
150
|
-
<xd-content-xss
|
|
151
|
-
style="text-align: left"
|
|
152
|
-
:html="notice"
|
|
153
|
-
></xd-content-xss>
|
|
112
|
+
<xd-content-xss style="text-align:left" :html="notice"></xd-content-xss>
|
|
154
113
|
</xd-dailog>
|
|
155
114
|
</view>
|
|
156
115
|
</view>
|
|
@@ -208,23 +167,18 @@ export default {
|
|
|
208
167
|
collectedPath: "",
|
|
209
168
|
|
|
210
169
|
//按钮设置
|
|
211
|
-
btnBgColor:
|
|
212
|
-
btnTextColor:
|
|
213
|
-
padding:
|
|
170
|
+
btnBgColor:'',
|
|
171
|
+
btnTextColor:'',
|
|
172
|
+
padding:{},
|
|
214
173
|
radius: 0,
|
|
215
174
|
//边框
|
|
216
|
-
is_border:
|
|
217
|
-
is_border_c:
|
|
218
|
-
is_border_w:
|
|
175
|
+
is_border:'N',
|
|
176
|
+
is_border_c:'',
|
|
177
|
+
is_border_w:'',
|
|
219
178
|
//投影
|
|
220
|
-
is_shadow:
|
|
179
|
+
is_shadow: 'Y',
|
|
221
180
|
is_shadow_bg: 0,
|
|
222
181
|
is_shadow_w: 0,
|
|
223
|
-
|
|
224
|
-
isAll: false,
|
|
225
|
-
isRandom: false,
|
|
226
|
-
btn_txt: "",
|
|
227
|
-
btn_style: {},
|
|
228
182
|
};
|
|
229
183
|
},
|
|
230
184
|
computed: {
|
|
@@ -237,17 +191,15 @@ export default {
|
|
|
237
191
|
str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
|
|
238
192
|
str = `${str} ${this.checkValue(this.padding.bottom, 0)}rpx`;
|
|
239
193
|
str = `${str} ${this.checkValue(this.padding.left, 0)}rpx`;
|
|
240
|
-
return str
|
|
194
|
+
return str
|
|
241
195
|
},
|
|
242
196
|
border() {
|
|
243
|
-
if (this.is_border ===
|
|
244
|
-
|
|
245
|
-
else return "0";
|
|
197
|
+
if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
|
|
198
|
+
else return '0';
|
|
246
199
|
},
|
|
247
|
-
shadow()
|
|
248
|
-
if
|
|
249
|
-
|
|
250
|
-
else return "0 0 0 rgba(0,0,0,0)";
|
|
200
|
+
shadow(){
|
|
201
|
+
if(this.is_shadow === 'Y') return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
|
|
202
|
+
else return '0 0 0 rgba(0,0,0,0)';
|
|
251
203
|
},
|
|
252
204
|
},
|
|
253
205
|
watch: {
|
|
@@ -265,50 +217,22 @@ export default {
|
|
|
265
217
|
},
|
|
266
218
|
methods: {
|
|
267
219
|
init(value) {
|
|
268
|
-
this.contentBackground =
|
|
269
|
-
this.iconColor =
|
|
270
|
-
this.collectedPath = getContainerPropsValue(
|
|
271
|
-
value,
|
|
272
|
-
"content.collectedPath",
|
|
273
|
-
{ value: "" }
|
|
274
|
-
).value;
|
|
220
|
+
this.contentBackground = '#FFF8F8';
|
|
221
|
+
this.iconColor = '#FF4D4A';
|
|
222
|
+
this.collectedPath = getContainerPropsValue(value, "content.collectedPath", {value: ''}).value;
|
|
275
223
|
|
|
276
224
|
this.padding = getContainerPropsValue(value, "content.padding", {});
|
|
277
|
-
this.btnBgColor = getContainerPropsValue(
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
"rgba(0,0,0,0)"
|
|
281
|
-
);
|
|
282
|
-
this.btnTextColor = getContainerPropsValue(
|
|
283
|
-
value,
|
|
284
|
-
"content.btnTextColor",
|
|
285
|
-
"#666"
|
|
286
|
-
);
|
|
287
|
-
this.radius = getContainerPropsValue(value, "content.radius", "0");
|
|
225
|
+
this.btnBgColor = getContainerPropsValue(value, "content.btnBgColor", 'rgba(0,0,0,0)');
|
|
226
|
+
this.btnTextColor = getContainerPropsValue(value, "content.btnTextColor", '#666');
|
|
227
|
+
this.radius = getContainerPropsValue(value, "content.radius", '0');
|
|
288
228
|
|
|
289
|
-
this.is_border = getContainerPropsValue(value, "content.is_border",
|
|
290
|
-
this.is_border_c = getContainerPropsValue(
|
|
291
|
-
|
|
292
|
-
"content.is_border_c",
|
|
293
|
-
"#e5e5e5"
|
|
294
|
-
);
|
|
295
|
-
this.is_border_w = getContainerPropsValue(
|
|
296
|
-
value,
|
|
297
|
-
"content.is_border_w",
|
|
298
|
-
1
|
|
299
|
-
);
|
|
229
|
+
this.is_border = getContainerPropsValue(value, "content.is_border", 'N');
|
|
230
|
+
this.is_border_c = getContainerPropsValue(value, "content.is_border_c", '#e5e5e5');
|
|
231
|
+
this.is_border_w = getContainerPropsValue(value, "content.is_border_w", 1);
|
|
300
232
|
|
|
301
|
-
this.is_shadow = getContainerPropsValue(value,
|
|
302
|
-
this.is_shadow_bg = getContainerPropsValue(
|
|
303
|
-
|
|
304
|
-
"content.is_shadow_bg",
|
|
305
|
-
"#fff"
|
|
306
|
-
);
|
|
307
|
-
this.is_shadow_w = getContainerPropsValue(
|
|
308
|
-
value,
|
|
309
|
-
"content.is_shadow_w",
|
|
310
|
-
"10"
|
|
311
|
-
);
|
|
233
|
+
this.is_shadow = getContainerPropsValue(value, 'content.is_shadow', 'N');
|
|
234
|
+
this.is_shadow_bg = getContainerPropsValue(value, 'content.is_shadow_bg', '#fff');
|
|
235
|
+
this.is_shadow_w = getContainerPropsValue(value, 'content.is_shadow_w', '10');
|
|
312
236
|
},
|
|
313
237
|
|
|
314
238
|
getList() {
|
|
@@ -317,84 +241,37 @@ export default {
|
|
|
317
241
|
data: {
|
|
318
242
|
...this.options,
|
|
319
243
|
distribution_method: this.method,
|
|
320
|
-
namespace:
|
|
244
|
+
namespace: this.pageBusinessCode,
|
|
321
245
|
activity_id: this.activity_id,
|
|
322
246
|
},
|
|
323
247
|
})
|
|
324
248
|
.then((res) => {
|
|
325
249
|
this.background = getServiceUrl(res.background);
|
|
326
250
|
this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
|
|
327
|
-
this.app_activity_button =
|
|
328
|
-
res.app_activity_button && getServiceUrl(res.app_activity_button);
|
|
329
|
-
this.app_activity_url =
|
|
330
|
-
res.app_activity_url && getServiceUrl(res.app_activity_url);
|
|
331
|
-
this.app_coupon_bottom_url =
|
|
332
|
-
res.app_coupon_bottom_url &&
|
|
333
|
-
getServiceUrl(res.app_coupon_bottom_url);
|
|
334
251
|
this.can_take = res.can_take;
|
|
335
252
|
this.has_times = res.has_times;
|
|
336
253
|
this.next_url = res.next_url;
|
|
337
|
-
this.isAll = res.receive_method === "batch";
|
|
338
|
-
this.isRandom = res.distribution_type === "random";
|
|
339
|
-
// 判断是否是一键领取
|
|
340
|
-
if (this.isAll) {
|
|
341
|
-
// 定义按钮文字
|
|
342
|
-
let btn_txt = "";
|
|
343
|
-
// 设置按钮样式
|
|
344
|
-
this.btn_style = res.app_coupon_button_bg_url
|
|
345
|
-
? {
|
|
346
|
-
// 设置背景图片
|
|
347
|
-
backgroundImage: `url(${getServiceUrl(
|
|
348
|
-
res.can_take !== "Y"
|
|
349
|
-
? res.app_coupon_button_see_url
|
|
350
|
-
: res.app_coupon_button_bg_url
|
|
351
|
-
)})`,
|
|
352
|
-
// 设置背景大小
|
|
353
|
-
backgroundSize: "100% 100%",
|
|
354
|
-
// 设置背景重复
|
|
355
|
-
backgroundRepeat: "no-repeat",
|
|
356
|
-
// 设置背景颜色
|
|
357
|
-
backgroundColor: "",
|
|
358
|
-
// 设置外边距
|
|
359
|
-
margin: "0",
|
|
360
|
-
}
|
|
361
|
-
: {
|
|
362
|
-
// 设置背景颜色
|
|
363
|
-
backgroundColor: "#FB5B3F",
|
|
364
|
-
// 设置外边距
|
|
365
|
-
margin: "0",
|
|
366
|
-
};
|
|
367
|
-
// 设置按钮文字
|
|
368
|
-
btn_txt = res.can_take === "Y" ? "一键领取" : "去查看";
|
|
369
|
-
// 判断是否是随机领取
|
|
370
|
-
if (this.isRandom) {
|
|
371
|
-
// 设置按钮文字
|
|
372
|
-
btn_txt = res.can_take === "Y" ? "开心领取" : "去查看";
|
|
373
|
-
}
|
|
374
|
-
// 设置按钮文字
|
|
375
|
-
this.btn_txt = btn_txt;
|
|
376
|
-
}
|
|
377
254
|
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
255
|
+
this.couponList =
|
|
256
|
+
res.list &&
|
|
257
|
+
res.list.length > 0 &&
|
|
258
|
+
res.list.map((item) => {
|
|
259
|
+
let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
|
|
381
260
|
item.btn_txt = mapArr[item.can_take_num];
|
|
382
261
|
if (item.can_take_num === "Y" || item.can_take_num === "P") {
|
|
383
262
|
//按钮样式
|
|
384
263
|
item.btn = res.app_coupon_button_bg_url
|
|
385
264
|
? {
|
|
386
265
|
backgroundImage: `url(${getServiceUrl(
|
|
387
|
-
item.can_take_num === "Y"
|
|
388
|
-
? res.app_coupon_button_see_url
|
|
389
|
-
: res.app_coupon_button_bg_url
|
|
266
|
+
item.can_take_num === "Y" ? res.app_coupon_button_see_url : res.app_coupon_button_bg_url
|
|
390
267
|
)})`,
|
|
391
268
|
backgroundSize: "100% 100%",
|
|
392
269
|
backgroundRepeat: "no-repeat",
|
|
393
|
-
backgroundColor:
|
|
270
|
+
backgroundColor: '',
|
|
394
271
|
margin: "0",
|
|
395
272
|
}
|
|
396
273
|
: {
|
|
397
|
-
backgroundColor:
|
|
274
|
+
backgroundColor: '#FB5B3F',
|
|
398
275
|
margin: "0",
|
|
399
276
|
};
|
|
400
277
|
//整块背景
|
|
@@ -405,39 +282,34 @@ export default {
|
|
|
405
282
|
backgroundRepeat: "no-repeat",
|
|
406
283
|
};
|
|
407
284
|
//icon
|
|
408
|
-
item.icon
|
|
409
|
-
item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
|
|
285
|
+
item.icon=item.can_take_num === "Y"?'iconyilingqu':'icondailingqu'
|
|
410
286
|
//icon颜色
|
|
411
|
-
item.iconColor =
|
|
412
|
-
item.can_take_num === "Y" ? "#D6D6D6" : this.iconColor;
|
|
287
|
+
item.iconColor = item.can_take_num === "Y"?'#D6D6D6':this.iconColor
|
|
413
288
|
//券名称颜色
|
|
414
|
-
item.nameColor =
|
|
289
|
+
item.nameColor = '#FB5B3F'
|
|
415
290
|
//其他文字颜色
|
|
416
|
-
item.infoColor =
|
|
291
|
+
item.infoColor = '#fff'
|
|
417
292
|
} else {
|
|
418
293
|
//按钮样式
|
|
419
294
|
item.btn = { background: "#D6D6D6", margin: "0" };
|
|
420
295
|
//整块背景
|
|
421
|
-
item.headIcon = getServiceUrl(res.app_coupon_invalid_url)
|
|
296
|
+
item.headIcon = getServiceUrl(res.app_coupon_invalid_url)
|
|
422
297
|
item.couponBackground = {
|
|
423
|
-
backgroundImage: `url(${getServiceUrl(
|
|
424
|
-
res.app_coupon_invalid_url
|
|
425
|
-
)})`,
|
|
298
|
+
backgroundImage: `url(${getServiceUrl(res.app_coupon_invalid_url)})`,
|
|
426
299
|
backgroundSize: "100%",
|
|
427
300
|
backgroundRepeat: "no-repeat",
|
|
428
301
|
};
|
|
429
302
|
//icon
|
|
430
|
-
item.icon
|
|
303
|
+
item.icon='iconyifawan'
|
|
431
304
|
//icon颜色
|
|
432
|
-
item.iconColor =
|
|
305
|
+
item.iconColor = '#D6D6D6'
|
|
433
306
|
//券名称颜色
|
|
434
|
-
item.nameColor =
|
|
307
|
+
item.nameColor = '#BBBBBB'
|
|
435
308
|
//其他文字颜色
|
|
436
|
-
item.infoColor =
|
|
309
|
+
item.infoColor = '#BBBBBB'
|
|
437
310
|
}
|
|
438
311
|
return item;
|
|
439
312
|
});
|
|
440
|
-
}
|
|
441
313
|
console.log("couponList", this.couponList);
|
|
442
314
|
this.message = res.message;
|
|
443
315
|
this.notice = res.about;
|
|
@@ -448,59 +320,26 @@ export default {
|
|
|
448
320
|
});
|
|
449
321
|
},
|
|
450
322
|
|
|
451
|
-
toCoupon()
|
|
323
|
+
toCoupon(){
|
|
452
324
|
this.$xdUniHelper.navigateTo({
|
|
453
325
|
url: this.next_url || this.collectedPath,
|
|
454
326
|
});
|
|
455
327
|
},
|
|
456
328
|
|
|
457
329
|
getCoupont(item) {
|
|
458
|
-
if
|
|
330
|
+
if(item.can_take_num === "Y") {
|
|
459
331
|
this.toCoupon();
|
|
460
332
|
return;
|
|
461
333
|
}
|
|
462
|
-
this.$xdShowLoading({});
|
|
463
|
-
jfbRootExec("getOnceCoupon", {
|
|
464
|
-
vm: this,
|
|
465
|
-
data: {
|
|
466
|
-
...this.options,
|
|
467
|
-
distribution_method: this.method,
|
|
468
|
-
namespace: "mall" || this.pageBusinessCode,
|
|
469
|
-
activity_id: this.activity_id,
|
|
470
|
-
prize_id: item.prize_id,
|
|
471
|
-
},
|
|
472
|
-
})
|
|
473
|
-
.then((res) => {
|
|
474
|
-
if (res.code == 400) {
|
|
475
|
-
this.$xdHideLoading();
|
|
476
|
-
this.$xdAlert({
|
|
477
|
-
content: res.message,
|
|
478
|
-
zIndex: 3200,
|
|
479
|
-
time: 2000,
|
|
480
|
-
isClose: false,
|
|
481
|
-
});
|
|
482
|
-
this.getList();
|
|
483
|
-
return;
|
|
484
|
-
}
|
|
485
|
-
this.order_num = res.tmp_order_number;
|
|
486
|
-
setTimeout(() => {
|
|
487
|
-
this.getResult();
|
|
488
|
-
}, 1000);
|
|
489
|
-
})
|
|
490
|
-
.catch((err) => {
|
|
491
|
-
console.log(err, "err");
|
|
492
|
-
});
|
|
493
|
-
},
|
|
494
|
-
|
|
495
|
-
getAllCoupont() {
|
|
496
334
|
this.$xdShowLoading({});
|
|
497
335
|
jfbRootExec("getAllCoupon", {
|
|
498
336
|
vm: this,
|
|
499
337
|
data: {
|
|
500
338
|
...this.options,
|
|
501
339
|
distribution_method: this.method,
|
|
502
|
-
namespace:
|
|
340
|
+
namespace: this.pageBusinessCode,
|
|
503
341
|
activity_id: this.activity_id,
|
|
342
|
+
prize_id: item.prize_id,
|
|
504
343
|
},
|
|
505
344
|
})
|
|
506
345
|
.then((res) => {
|
|
@@ -516,9 +355,9 @@ export default {
|
|
|
516
355
|
return;
|
|
517
356
|
}
|
|
518
357
|
this.order_num = res.tmp_order_number;
|
|
519
|
-
setTimeout(()
|
|
358
|
+
setTimeout(()=>{
|
|
520
359
|
this.getResult();
|
|
521
|
-
},
|
|
360
|
+
},1000)
|
|
522
361
|
})
|
|
523
362
|
.catch((err) => {
|
|
524
363
|
console.log(err, "err");
|
|
@@ -631,7 +470,7 @@ export default {
|
|
|
631
470
|
overflow-y: auto;
|
|
632
471
|
padding-top: 220rpx;
|
|
633
472
|
box-sizing: border-box;
|
|
634
|
-
background-color: #
|
|
473
|
+
background-color: #FAFAFA;
|
|
635
474
|
}
|
|
636
475
|
|
|
637
476
|
.empty_data {
|
|
@@ -692,39 +531,40 @@ export default {
|
|
|
692
531
|
margin: unit(20, rpx) auto 0 auto;
|
|
693
532
|
position: relative;
|
|
694
533
|
|
|
695
|
-
&.status_N
|
|
696
|
-
.item_head
|
|
697
|
-
color: #
|
|
534
|
+
&.status_N{
|
|
535
|
+
.item_head{
|
|
536
|
+
color: #BBBBBB;
|
|
698
537
|
}
|
|
699
|
-
.item_sub
|
|
700
|
-
color: #
|
|
538
|
+
.item_sub{
|
|
539
|
+
color: #BBBBBB;
|
|
701
540
|
}
|
|
702
541
|
}
|
|
703
|
-
.btn_wrap
|
|
542
|
+
.btn_wrap{
|
|
704
543
|
position: absolute;
|
|
705
544
|
right: 30rpx;
|
|
706
545
|
bottom: 40rpx;
|
|
707
546
|
}
|
|
708
547
|
|
|
709
|
-
.item_head
|
|
548
|
+
.item_head{
|
|
710
549
|
display: flex;
|
|
711
550
|
align-items: center;
|
|
712
551
|
font-size: 40rpx;
|
|
713
552
|
color: #000000;
|
|
714
553
|
font-weight: 500;
|
|
715
554
|
|
|
716
|
-
.t_icon
|
|
555
|
+
.t_icon{
|
|
717
556
|
width: 44rpx;
|
|
718
557
|
margin-right: 20rpx;
|
|
719
558
|
max-height: 80rpx;
|
|
720
559
|
}
|
|
721
560
|
}
|
|
722
|
-
.item_sub
|
|
561
|
+
.item_sub{
|
|
723
562
|
margin-top: 26rpx;
|
|
724
|
-
color: #
|
|
563
|
+
color: #FF4D4A;
|
|
725
564
|
font-size: 36rpx;
|
|
726
565
|
font-weight: 400;
|
|
727
566
|
}
|
|
567
|
+
|
|
728
568
|
}
|
|
729
569
|
}
|
|
730
570
|
&-foot {
|
|
@@ -579,7 +579,7 @@
|
|
|
579
579
|
</view>
|
|
580
580
|
</view>
|
|
581
581
|
<view
|
|
582
|
-
v-if="info.pay_info && (biz_code !== 'gift' || info.is_show_gift_price)"
|
|
582
|
+
v-if="info.pay_info && (biz_code !== 'gift' || info.is_show_gift_price) && is_not_show_price !== 'Y'"
|
|
583
583
|
class="jfb-base-order-detail__body-card"
|
|
584
584
|
:style="{
|
|
585
585
|
background: backgroundColor,
|
|
@@ -824,6 +824,7 @@ export default {
|
|
|
824
824
|
viewStatus: "", //业务类型预览
|
|
825
825
|
isPreview: false, //是否预览
|
|
826
826
|
biz_code: "",
|
|
827
|
+
is_not_show_price: "",
|
|
827
828
|
|
|
828
829
|
showPassword: false,
|
|
829
830
|
dialogPassword: "",
|
|
@@ -939,6 +940,7 @@ export default {
|
|
|
939
940
|
})
|
|
940
941
|
.then((res) => {
|
|
941
942
|
this.biz_code = res.biz_code;
|
|
943
|
+
this.is_not_show_price = res.is_not_show_price;
|
|
942
944
|
if (this.isPreview) {
|
|
943
945
|
switch (this.viewStatus) {
|
|
944
946
|
case "mall":
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
</view>
|
|
150
150
|
<view class="jfb-base-order-list__body-order-item-bottom">
|
|
151
151
|
<view>下单时间:{{ item.created_time_text }}</view>
|
|
152
|
-
<view v-if="item.biz_code !== 'gift'">
|
|
152
|
+
<view v-if="item.biz_code !== 'gift' && item.is_not_show_price !== 'Y'">
|
|
153
153
|
<text>合计:</text>
|
|
154
154
|
<xd-unit
|
|
155
155
|
:isOld="false"
|