jufubao-base 1.0.124 → 1.0.126
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/JfbBaseCard/JfbBaseCard.vue +9 -6
- package/src/components/JfbBaseCardBind/JfbBaseCardBind.vue +8 -4
- package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue +8 -8
- package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +9 -4
- package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue +24 -32
- package/src/components/JfbBaseCardInfoEntry/Attr.js +10 -0
- package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue +55 -51
- package/src/components/JfbBaseCardSweepInfo/Attr.js +10 -0
- package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue +26 -17
- package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +8 -2
- package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +8 -4
package/package.json
CHANGED
|
@@ -294,6 +294,7 @@ export default {
|
|
|
294
294
|
data() {
|
|
295
295
|
return {
|
|
296
296
|
options: {},
|
|
297
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
297
298
|
|
|
298
299
|
//提示文案
|
|
299
300
|
noticeBackgroundColor: "",
|
|
@@ -321,7 +322,7 @@ export default {
|
|
|
321
322
|
allEntryPath: "", //综合福利入口页
|
|
322
323
|
disabledUrl: "",
|
|
323
324
|
cardLayout: "1", //票券布局
|
|
324
|
-
|
|
325
|
+
|
|
325
326
|
//样式
|
|
326
327
|
login_text_size: "",
|
|
327
328
|
login_text_color: "",
|
|
@@ -389,6 +390,7 @@ export default {
|
|
|
389
390
|
},
|
|
390
391
|
|
|
391
392
|
handleToLink(path) {
|
|
393
|
+
path = this.getUrlCallback(path);
|
|
392
394
|
this.$xdUniHelper.navigateTo({
|
|
393
395
|
url: path,
|
|
394
396
|
});
|
|
@@ -414,6 +416,7 @@ export default {
|
|
|
414
416
|
});
|
|
415
417
|
},
|
|
416
418
|
|
|
419
|
+
|
|
417
420
|
/**
|
|
418
421
|
* @description 扫码绑定
|
|
419
422
|
*/
|
|
@@ -425,10 +428,9 @@ export default {
|
|
|
425
428
|
needResult: 1,
|
|
426
429
|
scanType: ["qrCode"],
|
|
427
430
|
success: (res) => {
|
|
431
|
+
let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
|
|
428
432
|
this.$xdUniHelper.navigateTo({
|
|
429
|
-
url:
|
|
430
|
-
res.resultStr
|
|
431
|
-
)}`,
|
|
433
|
+
url: path,
|
|
432
434
|
});
|
|
433
435
|
},
|
|
434
436
|
fail: (error) => {
|
|
@@ -443,8 +445,9 @@ export default {
|
|
|
443
445
|
uni.scanCode({
|
|
444
446
|
scanType: ["qrCode"],
|
|
445
447
|
success: (res) => {
|
|
448
|
+
let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
|
|
446
449
|
this.$xdUniHelper.navigateTo({
|
|
447
|
-
url:
|
|
450
|
+
url: path,
|
|
448
451
|
});
|
|
449
452
|
},
|
|
450
453
|
fail: (error) => {
|
|
@@ -469,7 +472,6 @@ export default {
|
|
|
469
472
|
*/
|
|
470
473
|
handleBindLogin(item) {
|
|
471
474
|
if (this.tabIndex === 1) {
|
|
472
|
-
console.log("bindCardLogin", this.inCallback);
|
|
473
475
|
|
|
474
476
|
//无效卡
|
|
475
477
|
if (item["is_valid"] !== "Y") {
|
|
@@ -534,6 +536,7 @@ export default {
|
|
|
534
536
|
this.$storage.set("inCallback", inCallback);
|
|
535
537
|
try{
|
|
536
538
|
inCallback = Base64.decode(inCallback);
|
|
539
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
537
540
|
}catch (e){
|
|
538
541
|
inCallback = null;
|
|
539
542
|
}
|
|
@@ -69,6 +69,7 @@ export default {
|
|
|
69
69
|
|
|
70
70
|
//页面跳转地址
|
|
71
71
|
confirmUrl: "",
|
|
72
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
72
73
|
};
|
|
73
74
|
},
|
|
74
75
|
computed: {
|
|
@@ -107,11 +108,14 @@ export default {
|
|
|
107
108
|
}
|
|
108
109
|
let cardNumber = Base64.encodeURI(this.cardNumber);
|
|
109
110
|
let pwd = Base64.encodeURI(this.card_password);
|
|
110
|
-
this
|
|
111
|
-
|
|
112
|
-
|
|
111
|
+
let url = this.getUrlCallback(`${this.confirmUrl}?card_number=${cardNumber}&pwd=${pwd}`)
|
|
112
|
+
this.$xdUniHelper.navigateTo({url});
|
|
113
|
+
},
|
|
114
|
+
onJfbLoad(options) {
|
|
115
|
+
if(options.inCallback) {
|
|
116
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
117
|
+
}
|
|
113
118
|
},
|
|
114
|
-
onJfbLoad(options) {},
|
|
115
119
|
isEmpty(str) {
|
|
116
120
|
if (str === null || str === "") {
|
|
117
121
|
return true;
|
|
@@ -89,8 +89,8 @@
|
|
|
89
89
|
},
|
|
90
90
|
jwxSDK: null,
|
|
91
91
|
validImageAPIUrl: "",
|
|
92
|
-
//todo
|
|
93
92
|
backUrl: "",
|
|
93
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
96
|
watch: {
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
created() {
|
|
102
102
|
this.init(this.container);
|
|
103
103
|
this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
|
|
104
|
-
|
|
104
|
+
|
|
105
105
|
//#ifdef H5
|
|
106
106
|
if (!this.$configProject.isPreview) {
|
|
107
107
|
jfbRootExec("getH5WxAuthorize", {
|
|
@@ -121,7 +121,9 @@
|
|
|
121
121
|
},
|
|
122
122
|
methods: {
|
|
123
123
|
onJfbLoad(options) {
|
|
124
|
-
|
|
124
|
+
if(options.inCallback) {
|
|
125
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
126
|
+
}
|
|
125
127
|
},
|
|
126
128
|
/**
|
|
127
129
|
* @description 监听事件变化
|
|
@@ -129,16 +131,14 @@
|
|
|
129
131
|
*/
|
|
130
132
|
init(container) {
|
|
131
133
|
this.backUrl = getContainerPropsValue(container, "content.backUrl", {value: "/system/card/login"}).value;
|
|
132
|
-
//this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
|
|
133
|
-
|
|
134
|
-
//this.height = getContainerPropsValue(container, 'content.height', 10);
|
|
135
134
|
},
|
|
136
135
|
handleBindSuccess(){
|
|
137
136
|
this.$xdAlert({
|
|
138
137
|
content: "绑定成功",
|
|
139
138
|
close: () => {
|
|
139
|
+
let path = this.getUrlCallback(`${this.backUrl}}`)
|
|
140
140
|
this.$xdUniHelper.redirectTo({
|
|
141
|
-
url:
|
|
141
|
+
url: path,
|
|
142
142
|
});
|
|
143
143
|
},
|
|
144
144
|
});
|
|
@@ -166,7 +166,7 @@
|
|
|
166
166
|
let valid_token = this.$xdUniHelper.randomChar(20);
|
|
167
167
|
this.$set(this.cardForm, "valid_token", valid_token);
|
|
168
168
|
},
|
|
169
|
-
|
|
169
|
+
|
|
170
170
|
doScanCode(){
|
|
171
171
|
this.jwxSDK.scanQRCode({
|
|
172
172
|
needResult: 1,
|
|
@@ -422,6 +422,7 @@ export default {
|
|
|
422
422
|
data() {
|
|
423
423
|
return {
|
|
424
424
|
options:{},
|
|
425
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
425
426
|
|
|
426
427
|
//提示文案
|
|
427
428
|
noticeBackgroundColor: "",
|
|
@@ -491,6 +492,7 @@ export default {
|
|
|
491
492
|
},
|
|
492
493
|
|
|
493
494
|
handleToLink(path) {
|
|
495
|
+
path = this.getUrlCallback(path)
|
|
494
496
|
this.$xdUniHelper.navigateTo({
|
|
495
497
|
url: path,
|
|
496
498
|
});
|
|
@@ -527,10 +529,9 @@ export default {
|
|
|
527
529
|
needResult: 1,
|
|
528
530
|
scanType: ["qrCode"],
|
|
529
531
|
success: (res) => {
|
|
532
|
+
let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
|
|
530
533
|
this.$xdUniHelper.navigateTo({
|
|
531
|
-
url:
|
|
532
|
-
res.resultStr
|
|
533
|
-
)}`,
|
|
534
|
+
url:path,
|
|
534
535
|
});
|
|
535
536
|
},
|
|
536
537
|
fail: (error) => {
|
|
@@ -545,8 +546,9 @@ export default {
|
|
|
545
546
|
uni.scanCode({
|
|
546
547
|
scanType: ["qrCode"],
|
|
547
548
|
success: (res) => {
|
|
549
|
+
let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
|
|
548
550
|
this.$xdUniHelper.navigateTo({
|
|
549
|
-
url:
|
|
551
|
+
url:path,
|
|
550
552
|
});
|
|
551
553
|
},
|
|
552
554
|
fail: (error) => {
|
|
@@ -664,6 +666,9 @@ export default {
|
|
|
664
666
|
this.$storage.set("inCallback", inCallback);
|
|
665
667
|
try{
|
|
666
668
|
inCallback = Base64.decode(inCallback);
|
|
669
|
+
if(options.inCallback) {
|
|
670
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
671
|
+
}
|
|
667
672
|
}catch (e){
|
|
668
673
|
inCallback = null;
|
|
669
674
|
}
|
|
@@ -56,12 +56,8 @@
|
|
|
56
56
|
v-for="(item, index) in valueKey"
|
|
57
57
|
:key="index"
|
|
58
58
|
>
|
|
59
|
-
<view class="jfb-base-card-info__body-info-label">{{
|
|
60
|
-
|
|
61
|
-
}}</view>
|
|
62
|
-
<view class="jfb-base-card-info__body-info-value">{{
|
|
63
|
-
info[item.key]
|
|
64
|
-
}}</view>
|
|
59
|
+
<view class="jfb-base-card-info__body-info-label">{{item.label}}</view>
|
|
60
|
+
<view class="jfb-base-card-info__body-info-value">{{info[item.key] }}</view>
|
|
65
61
|
</view>
|
|
66
62
|
<view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
|
|
67
63
|
<view class="jfb-base-card-info__body-residue-wrap">
|
|
@@ -95,9 +91,7 @@
|
|
|
95
91
|
<view :style="{ height: '100rpx' }"></view>
|
|
96
92
|
</view>
|
|
97
93
|
<view class="jfb-base-card-info__body-footer" :style="prod_bottom">
|
|
98
|
-
<xd-button type="primary" width="360rpx" @click="handleToLink"
|
|
99
|
-
>立即绑定</xd-button
|
|
100
|
-
>
|
|
94
|
+
<xd-button type="primary" width="360rpx" @click="handleToLink">立即绑定</xd-button>
|
|
101
95
|
</view>
|
|
102
96
|
</view>
|
|
103
97
|
</view>
|
|
@@ -168,6 +162,8 @@ export default {
|
|
|
168
162
|
backUrl: "",
|
|
169
163
|
is_show_balance: "N", //是否显示余额
|
|
170
164
|
my_card_url: "", //我的票券跳转地址
|
|
165
|
+
|
|
166
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
171
167
|
};
|
|
172
168
|
},
|
|
173
169
|
computed: {
|
|
@@ -184,7 +180,6 @@ export default {
|
|
|
184
180
|
created() {},
|
|
185
181
|
methods: {
|
|
186
182
|
toShowCouponDialog(){
|
|
187
|
-
// jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: "10001000001133"})
|
|
188
183
|
if(this.info){
|
|
189
184
|
jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
|
|
190
185
|
}
|
|
@@ -202,7 +197,8 @@ export default {
|
|
|
202
197
|
this.handlerAfterBindCard(res);
|
|
203
198
|
})
|
|
204
199
|
.catch();
|
|
205
|
-
}
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
206
202
|
jfbRootExec("pwdCardBind", {
|
|
207
203
|
vm: this,
|
|
208
204
|
data: {
|
|
@@ -218,31 +214,39 @@ export default {
|
|
|
218
214
|
}
|
|
219
215
|
},
|
|
220
216
|
handlerAfterBindCard(res){
|
|
217
|
+
//已绑定卡券处理
|
|
221
218
|
if(res.pop_info && res.pop_info.pop_code === '1001'){
|
|
222
219
|
this.handleBindConfirm();
|
|
223
220
|
return;
|
|
224
221
|
}
|
|
225
222
|
|
|
223
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl);
|
|
224
|
+
|
|
225
|
+
//有优惠券处理
|
|
226
226
|
if(this.hasCon){
|
|
227
227
|
this.toShowCouponDialog();
|
|
228
228
|
this.$bus.$on("onCloseConDialog",(container_id) => {
|
|
229
229
|
if(container_id === this.hasCon){
|
|
230
230
|
this.$xdUniHelper.redirectTo({
|
|
231
|
-
url:
|
|
231
|
+
url: path,
|
|
232
232
|
});
|
|
233
233
|
}
|
|
234
234
|
})
|
|
235
|
-
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
//票券绑定成功
|
|
238
|
+
else{
|
|
236
239
|
this.$xdAlert({
|
|
237
240
|
content: "票券绑定成功",
|
|
238
241
|
close: () => {
|
|
239
242
|
this.$xdUniHelper.redirectTo({
|
|
240
|
-
url:
|
|
243
|
+
url: path,
|
|
241
244
|
});
|
|
242
245
|
},
|
|
243
246
|
});
|
|
244
247
|
}
|
|
245
248
|
},
|
|
249
|
+
|
|
246
250
|
//卡券已被自己绑定时的弹框
|
|
247
251
|
handleBindConfirm(){
|
|
248
252
|
this.$xdConfirm({
|
|
@@ -254,9 +258,8 @@ export default {
|
|
|
254
258
|
showClose: false,
|
|
255
259
|
success: (res) => {
|
|
256
260
|
if (res.confirm) {
|
|
257
|
-
this
|
|
258
|
-
|
|
259
|
-
});
|
|
261
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl);
|
|
262
|
+
this.$xdUniHelper.redirectTo({ url: path});
|
|
260
263
|
}else{
|
|
261
264
|
}
|
|
262
265
|
}
|
|
@@ -284,17 +287,9 @@ export default {
|
|
|
284
287
|
onJfbLoad(options) {
|
|
285
288
|
this.init();
|
|
286
289
|
this.qrcode = options.qrcode;
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
// if(!this.qrcode) {
|
|
291
|
-
// this.$xdAlert({
|
|
292
|
-
// content: '参数配置错误',
|
|
293
|
-
// type: 'error'
|
|
294
|
-
// });
|
|
295
|
-
// return
|
|
296
|
-
// }
|
|
297
|
-
// }
|
|
290
|
+
if(options.inCallback) {
|
|
291
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
292
|
+
}
|
|
298
293
|
if (this.qrcode) {
|
|
299
294
|
jfbRootExec("getByQrCardDetail", {
|
|
300
295
|
vm: this,
|
|
@@ -353,10 +348,7 @@ export default {
|
|
|
353
348
|
.catch();
|
|
354
349
|
},
|
|
355
350
|
isEmpty(str) {
|
|
356
|
-
|
|
357
|
-
return true;
|
|
358
|
-
}
|
|
359
|
-
return false;
|
|
351
|
+
return str === null || str === "";
|
|
360
352
|
},
|
|
361
353
|
handleGetInfo() {
|
|
362
354
|
if (this.isEmpty(this.card_password)) {
|
|
@@ -44,5 +44,15 @@ export default {
|
|
|
44
44
|
placeholder: '请输入密码框自定义文案',
|
|
45
45
|
className: 'input80'
|
|
46
46
|
},
|
|
47
|
+
{
|
|
48
|
+
label: "票券过期是否展示余额",
|
|
49
|
+
ele: "xd-radio",
|
|
50
|
+
valueKey: "is_show_balance",
|
|
51
|
+
value: "N",
|
|
52
|
+
list: [
|
|
53
|
+
{label: "是", value: "Y"},
|
|
54
|
+
{label: "否", value: "N"},
|
|
55
|
+
]
|
|
56
|
+
}
|
|
47
57
|
],
|
|
48
58
|
};
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
<text>有效期:</text>
|
|
74
74
|
<text>{{info.end_time}}</text>
|
|
75
75
|
</view>
|
|
76
|
-
<view class="card-list__yue">
|
|
76
|
+
<view class="card-list__yue" v-if="isShowBalance">
|
|
77
77
|
<text>余额:</text>
|
|
78
78
|
<text>{{info.card_point}} {{ info.unit }}</text>
|
|
79
79
|
</view>
|
|
@@ -163,6 +163,8 @@ export default {
|
|
|
163
163
|
backUrl: "",
|
|
164
164
|
headerBg: {},
|
|
165
165
|
my_card_url: "", //我的票券跳转地址
|
|
166
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
167
|
+
is_show_balance: "N", //是否显示余额
|
|
166
168
|
};
|
|
167
169
|
},
|
|
168
170
|
watch: {
|
|
@@ -174,6 +176,12 @@ export default {
|
|
|
174
176
|
prod_bottom() {
|
|
175
177
|
return this.fixedStyle({ height: 0, zIndex: 111 });
|
|
176
178
|
},
|
|
179
|
+
isShowBalance(){
|
|
180
|
+
if(this.info.is_expired === "Y"){
|
|
181
|
+
return this.is_show_balance === "Y";
|
|
182
|
+
}
|
|
183
|
+
return true;
|
|
184
|
+
}
|
|
177
185
|
},
|
|
178
186
|
created() {},
|
|
179
187
|
methods: {
|
|
@@ -195,7 +203,7 @@ export default {
|
|
|
195
203
|
}
|
|
196
204
|
},
|
|
197
205
|
});
|
|
198
|
-
return
|
|
206
|
+
return
|
|
199
207
|
}
|
|
200
208
|
this.handleToBind()
|
|
201
209
|
},
|
|
@@ -240,8 +248,9 @@ export default {
|
|
|
240
248
|
this.toShowCouponDialog();
|
|
241
249
|
this.$bus.$on("onCloseConDialog",(container_id) => {
|
|
242
250
|
if(container_id === this.hasCon){
|
|
251
|
+
let path = this.getUrlCallback(this.backUrl)
|
|
243
252
|
this.$xdUniHelper.redirectTo({
|
|
244
|
-
url:
|
|
253
|
+
url: path,
|
|
245
254
|
});
|
|
246
255
|
}
|
|
247
256
|
})
|
|
@@ -249,8 +258,9 @@ export default {
|
|
|
249
258
|
this.$xdAlert({
|
|
250
259
|
content: "票券绑定成功",
|
|
251
260
|
close: () => {
|
|
261
|
+
let path = this.getUrlCallback(this.backUrl)
|
|
252
262
|
this.$xdUniHelper.redirectTo({
|
|
253
|
-
url:
|
|
263
|
+
url: path,
|
|
254
264
|
});
|
|
255
265
|
},
|
|
256
266
|
});
|
|
@@ -267,8 +277,9 @@ export default {
|
|
|
267
277
|
showClose: false,
|
|
268
278
|
success: (res) => {
|
|
269
279
|
if (res.confirm) {
|
|
280
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl)
|
|
270
281
|
this.$xdUniHelper.redirectTo({
|
|
271
|
-
url:
|
|
282
|
+
url: path,
|
|
272
283
|
});
|
|
273
284
|
}else{
|
|
274
285
|
}
|
|
@@ -292,21 +303,14 @@ export default {
|
|
|
292
303
|
"请输入密码"
|
|
293
304
|
);
|
|
294
305
|
this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
|
|
306
|
+
this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
|
|
295
307
|
},
|
|
296
308
|
onJfbLoad(options) {
|
|
297
309
|
this.init();
|
|
298
310
|
this.qrcode = options.qrcode;
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
// if(!this.qrcode) {
|
|
303
|
-
// this.$xdAlert({
|
|
304
|
-
// content: '参数配置错误',
|
|
305
|
-
// type: 'error'
|
|
306
|
-
// });
|
|
307
|
-
// return
|
|
308
|
-
// }
|
|
309
|
-
// }
|
|
311
|
+
if(options.inCallback) {
|
|
312
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
313
|
+
}
|
|
310
314
|
if (this.qrcode) {
|
|
311
315
|
jfbRootExec("getByQrCardDetailEntry", {
|
|
312
316
|
vm: this,
|
|
@@ -469,18 +473,18 @@ export default {
|
|
|
469
473
|
overflow: hidden;
|
|
470
474
|
border-radius: unit(16, rpx);
|
|
471
475
|
margin-bottom: unit(30, rpx);
|
|
472
|
-
|
|
476
|
+
|
|
473
477
|
&:last-child {
|
|
474
478
|
margin-bottom: 0;
|
|
475
479
|
}
|
|
476
|
-
|
|
477
|
-
|
|
480
|
+
|
|
481
|
+
|
|
478
482
|
&__title {
|
|
479
483
|
height: unit(56, rpx);
|
|
480
484
|
display: flex;
|
|
481
485
|
justify-content: flex-start;
|
|
482
486
|
align-items: center;
|
|
483
|
-
|
|
487
|
+
|
|
484
488
|
& > view {
|
|
485
489
|
padding: 0 unit(80, rpx);
|
|
486
490
|
font-size: unit(24, rpx);
|
|
@@ -489,23 +493,23 @@ export default {
|
|
|
489
493
|
color: #fff;
|
|
490
494
|
border-radius: 0 0 unit(16, rpx) 0;
|
|
491
495
|
}
|
|
492
|
-
|
|
496
|
+
|
|
493
497
|
}
|
|
494
|
-
|
|
498
|
+
|
|
495
499
|
&__content {
|
|
496
500
|
padding: unit(10, rpx) unit(40, rpx) 0;
|
|
497
501
|
height: unit(86, rpx);
|
|
498
502
|
display: flex;
|
|
499
503
|
justify-content: space-between;
|
|
500
504
|
align-items: center;
|
|
501
|
-
|
|
505
|
+
|
|
502
506
|
& > view:first-child {
|
|
503
507
|
font-size: unit(36, rpx);
|
|
504
508
|
line-height: unit(86, rpx);
|
|
505
509
|
color: #fff;
|
|
506
510
|
font-weight: 700;
|
|
507
511
|
}
|
|
508
|
-
|
|
512
|
+
|
|
509
513
|
& > view:nth-child(2) {
|
|
510
514
|
font-size: unit(24, rpx);
|
|
511
515
|
display: flex;
|
|
@@ -516,32 +520,32 @@ export default {
|
|
|
516
520
|
color: #fff;
|
|
517
521
|
}
|
|
518
522
|
}
|
|
519
|
-
|
|
523
|
+
|
|
520
524
|
&__date {
|
|
521
525
|
padding: 0 unit(40, rpx);
|
|
522
526
|
font-size: unit(28, rpx);
|
|
523
527
|
line-height: unit(32, rpx);
|
|
524
528
|
color: #fff;
|
|
525
529
|
}
|
|
526
|
-
|
|
530
|
+
|
|
527
531
|
&__yue {
|
|
528
532
|
padding: unit(10, rpx) unit(40, rpx) 0;
|
|
529
533
|
font-size: unit(28, rpx);
|
|
530
534
|
line-height: unit(32, rpx);
|
|
531
535
|
color: #fff;
|
|
532
|
-
|
|
536
|
+
|
|
533
537
|
& > text:nth-child(2) {
|
|
534
538
|
font-weight: 700;
|
|
535
539
|
}
|
|
536
540
|
}
|
|
537
|
-
|
|
541
|
+
|
|
538
542
|
&__other {
|
|
539
543
|
display: flex;
|
|
540
544
|
justify-content: flex-start;
|
|
541
545
|
align-items: center;
|
|
542
546
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
543
547
|
margin-top: unit(0, rpx);
|
|
544
|
-
|
|
548
|
+
|
|
545
549
|
& > view {
|
|
546
550
|
border-radius:unit(8, rpx);
|
|
547
551
|
background: rgba(255, 255, 255, 0.2);
|
|
@@ -555,17 +559,17 @@ export default {
|
|
|
555
559
|
padding: 0 unit(20, rpx);
|
|
556
560
|
color: #fff;
|
|
557
561
|
}
|
|
558
|
-
|
|
559
|
-
|
|
562
|
+
|
|
563
|
+
|
|
560
564
|
}
|
|
561
|
-
|
|
565
|
+
|
|
562
566
|
&__nodata {
|
|
563
567
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
564
568
|
margin-top: unit(0, rpx);
|
|
565
569
|
color: #fff;
|
|
566
570
|
font-size: unit(28, rpx);
|
|
567
571
|
}
|
|
568
|
-
|
|
572
|
+
|
|
569
573
|
&__entry {
|
|
570
574
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
571
575
|
& > view {
|
|
@@ -578,26 +582,26 @@ export default {
|
|
|
578
582
|
font-weight: 500;
|
|
579
583
|
}
|
|
580
584
|
}
|
|
581
|
-
|
|
585
|
+
|
|
582
586
|
&__entrys {
|
|
583
587
|
margin: unit(20, rpx) unit(20, rpx) 0;
|
|
584
588
|
padding: unit(30, rpx);
|
|
585
589
|
border-radius: unit(16, rpx);
|
|
586
590
|
background: rgba(255, 255, 255, 1);
|
|
587
591
|
box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
|
|
588
|
-
|
|
592
|
+
|
|
589
593
|
&-title {
|
|
590
594
|
display: flex;
|
|
591
595
|
justify-content: space-between;
|
|
592
596
|
align-items: center;
|
|
593
|
-
|
|
594
|
-
|
|
597
|
+
|
|
598
|
+
|
|
595
599
|
& > view:first-child {
|
|
596
600
|
font-size: unit(28, rpx);
|
|
597
601
|
font-weight: 500;
|
|
598
602
|
flex: 1;
|
|
599
603
|
}
|
|
600
|
-
|
|
604
|
+
|
|
601
605
|
& > view:nth-child(2) {
|
|
602
606
|
display: flex;
|
|
603
607
|
justify-content: flex-start;
|
|
@@ -607,11 +611,11 @@ export default {
|
|
|
607
611
|
color: #999;
|
|
608
612
|
}
|
|
609
613
|
}
|
|
610
|
-
|
|
614
|
+
|
|
611
615
|
&-scroll {
|
|
612
|
-
|
|
616
|
+
|
|
613
617
|
}
|
|
614
|
-
|
|
618
|
+
|
|
615
619
|
&-item {
|
|
616
620
|
display: flex;
|
|
617
621
|
justify-content: flex-start;
|
|
@@ -619,7 +623,7 @@ export default {
|
|
|
619
623
|
flex-flow: nowrap;
|
|
620
624
|
margin-left: unit(-14, rpx);
|
|
621
625
|
padding-top: unit(20, rpx);
|
|
622
|
-
|
|
626
|
+
|
|
623
627
|
& > view {
|
|
624
628
|
width: unit(120, rpx);
|
|
625
629
|
margin-right: unit(10, rpx);
|
|
@@ -628,25 +632,25 @@ export default {
|
|
|
628
632
|
justify-content: center;
|
|
629
633
|
flex-direction: column;
|
|
630
634
|
align-items: center;
|
|
631
|
-
|
|
635
|
+
|
|
632
636
|
& > view:first-child {
|
|
633
637
|
width: unit(76, rpx);
|
|
634
638
|
height: unit(76, rpx);
|
|
635
639
|
overflow: hidden;
|
|
636
|
-
|
|
640
|
+
|
|
637
641
|
& > image {
|
|
638
642
|
height: 100%;
|
|
639
643
|
width: 100%;
|
|
640
644
|
}
|
|
641
645
|
}
|
|
642
|
-
|
|
646
|
+
|
|
643
647
|
& > view:nth-child(2) {
|
|
644
648
|
margin-top: unit(10, rpx);
|
|
645
649
|
font-size: unit(24, rpx);
|
|
646
650
|
line-height: unit(36, rpx);
|
|
647
651
|
margin-bottom: unit(10, rpx);
|
|
648
652
|
}
|
|
649
|
-
|
|
653
|
+
|
|
650
654
|
& > view:nth-child(3) {
|
|
651
655
|
display: flex;
|
|
652
656
|
justify-content: flex-start;
|
|
@@ -655,17 +659,17 @@ export default {
|
|
|
655
659
|
font-size: unit(20, rpx);
|
|
656
660
|
color: #999;
|
|
657
661
|
}
|
|
658
|
-
|
|
662
|
+
|
|
659
663
|
&:last-child {
|
|
660
664
|
margin-right: 0;
|
|
661
665
|
}
|
|
662
|
-
|
|
666
|
+
|
|
663
667
|
}
|
|
664
|
-
|
|
665
|
-
|
|
668
|
+
|
|
669
|
+
|
|
666
670
|
}
|
|
667
671
|
}
|
|
668
|
-
|
|
672
|
+
|
|
669
673
|
&-warp {
|
|
670
674
|
width: unit(700, rpx);
|
|
671
675
|
// min-height: unit(290, rpx);
|
|
@@ -27,11 +27,9 @@
|
|
|
27
27
|
<view class="jfb-base-card-sweep-info__body-info-value">{{info[item.key]}}</view>
|
|
28
28
|
</view>
|
|
29
29
|
<view class="jfb-base-card-sweep-info__body-residue">
|
|
30
|
-
<view class="jfb-base-card-sweep-info__body-residue-wrap">
|
|
30
|
+
<view class="jfb-base-card-sweep-info__body-residue-wrap" v-if="isShowBalance">
|
|
31
31
|
<view class="jfb-base-card-sweep-info__body-residue-label">
|
|
32
|
-
<view :style="{ color: '#242424', fontSize: '28rpx' }"
|
|
33
|
-
>剩余元宝</view
|
|
34
|
-
>
|
|
32
|
+
<view :style="{ color: '#242424', fontSize: '28rpx' }">剩余元宝</view>
|
|
35
33
|
</view>
|
|
36
34
|
<view class="jfb-base-card-sweep-info__body-residue-value">
|
|
37
35
|
<xd-unit
|
|
@@ -45,15 +43,12 @@
|
|
|
45
43
|
<view
|
|
46
44
|
v-if="info.other_card_point && info.card_point_type !== 1"
|
|
47
45
|
class="jfb-base-card-sweep-info__body-residue-reach"
|
|
48
|
-
|
|
49
|
-
>
|
|
46
|
+
>购买其他物品可抵:{{ info.other_card_point }}</view>
|
|
50
47
|
</view>
|
|
51
48
|
<view
|
|
52
49
|
class="jfb-base-card-sweep-info__body-residue-business"
|
|
53
50
|
v-if="info.card_point_type !== 1"
|
|
54
|
-
>
|
|
55
|
-
所属业务线:{{ info.main_business_code_name }}
|
|
56
|
-
</view>
|
|
51
|
+
>所属业务线:{{ info.main_business_code_name }}</view>
|
|
57
52
|
</view>
|
|
58
53
|
<view :style="{ height: '100rpx' }"></view>
|
|
59
54
|
</view>
|
|
@@ -61,9 +56,7 @@
|
|
|
61
56
|
class="jfb-base-card-sweep-info__body-footer"
|
|
62
57
|
:style="prod_bottom"
|
|
63
58
|
>
|
|
64
|
-
<xd-button type="primary" width="360rpx" @click="handleToLink"
|
|
65
|
-
>立即绑定</xd-button
|
|
66
|
-
>
|
|
59
|
+
<xd-button type="primary" width="360rpx" @click="handleToLink">立即绑定</xd-button>
|
|
67
60
|
</view>
|
|
68
61
|
</view>
|
|
69
62
|
</view>
|
|
@@ -115,6 +108,9 @@ export default {
|
|
|
115
108
|
pa: "", //二维码
|
|
116
109
|
//页面跳转地址
|
|
117
110
|
backUrl: "",
|
|
111
|
+
|
|
112
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
113
|
+
is_show_balance: "N", //是否显示余额
|
|
118
114
|
};
|
|
119
115
|
},
|
|
120
116
|
watch: {
|
|
@@ -128,10 +124,16 @@ export default {
|
|
|
128
124
|
return this.fixedStyle({ height: 0, zIndex: 111 });
|
|
129
125
|
},
|
|
130
126
|
...mapState(["jfbAuthorize"]),
|
|
127
|
+
isShowBalance(){
|
|
128
|
+
if(this.info.is_expired === "Y"){
|
|
129
|
+
return this.is_show_balance === "Y";
|
|
130
|
+
}
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
131
133
|
},
|
|
132
134
|
created() {
|
|
133
135
|
this.init(this.container);
|
|
134
|
-
|
|
136
|
+
|
|
135
137
|
},
|
|
136
138
|
methods: {
|
|
137
139
|
handleToLink(path) {
|
|
@@ -149,19 +151,22 @@ export default {
|
|
|
149
151
|
//#ifdef H5
|
|
150
152
|
let base = this.jfbAuthorize.getBasePath(this);
|
|
151
153
|
let url = `${location.origin}${base}${this.backUrl}`;
|
|
154
|
+
url = this.getUrlCallback(url)
|
|
152
155
|
this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
|
|
156
|
+
|
|
153
157
|
setTimeout(()=>{
|
|
154
158
|
window.location.href = url;
|
|
155
159
|
},50);
|
|
156
160
|
// #endif
|
|
157
|
-
|
|
161
|
+
|
|
158
162
|
//#ifndef H5
|
|
163
|
+
let wPath = this.getUrlCallback(this.backUrl)
|
|
159
164
|
this.$xdUniHelper.redirectTo({
|
|
160
|
-
url:
|
|
165
|
+
url:wPath,
|
|
161
166
|
});
|
|
162
167
|
// #endif
|
|
163
|
-
|
|
164
|
-
|
|
168
|
+
|
|
169
|
+
|
|
165
170
|
},
|
|
166
171
|
});
|
|
167
172
|
})
|
|
@@ -170,9 +175,13 @@ export default {
|
|
|
170
175
|
},
|
|
171
176
|
init() {
|
|
172
177
|
this.backUrl = getContainerPropsValue( this.container, "content.back_url", { value: "" }).value;
|
|
178
|
+
this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
|
|
173
179
|
},
|
|
174
180
|
onJfbLoad(options) {
|
|
175
181
|
this.pa = options.pa;
|
|
182
|
+
if(options.inCallback) {
|
|
183
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
184
|
+
}
|
|
176
185
|
//正式环境判断参数错误
|
|
177
186
|
if(!this.$configProject.isPreview) {
|
|
178
187
|
if(!this.pa) {
|
|
@@ -150,7 +150,9 @@
|
|
|
150
150
|
bottom: 0,
|
|
151
151
|
right: 0
|
|
152
152
|
},
|
|
153
|
-
loadingCardList: true
|
|
153
|
+
loadingCardList: true,
|
|
154
|
+
|
|
155
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
154
156
|
}
|
|
155
157
|
},
|
|
156
158
|
watch: {
|
|
@@ -177,6 +179,9 @@
|
|
|
177
179
|
this.$storage.set("inCallback", inCallback);
|
|
178
180
|
try{
|
|
179
181
|
inCallback = Base64.decode(inCallback);
|
|
182
|
+
if(options.inCallback) {
|
|
183
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
184
|
+
}
|
|
180
185
|
}catch (e){
|
|
181
186
|
inCallback = null;
|
|
182
187
|
}
|
|
@@ -242,8 +247,9 @@
|
|
|
242
247
|
});
|
|
243
248
|
},
|
|
244
249
|
toBindCard(){
|
|
250
|
+
let path = this.getUrlCallback(this.cardBindPath)
|
|
245
251
|
this.$xdUniHelper.navigateTo({
|
|
246
|
-
url:
|
|
252
|
+
url:path
|
|
247
253
|
})
|
|
248
254
|
},
|
|
249
255
|
toOrderList(){
|
|
@@ -72,6 +72,8 @@
|
|
|
72
72
|
detailUrl: "",
|
|
73
73
|
login_name:'',
|
|
74
74
|
loadingCardList: true,
|
|
75
|
+
|
|
76
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
75
77
|
}
|
|
76
78
|
},
|
|
77
79
|
watch: {
|
|
@@ -86,8 +88,6 @@
|
|
|
86
88
|
},
|
|
87
89
|
created() {
|
|
88
90
|
this.init(this.container);
|
|
89
|
-
|
|
90
|
-
//todo
|
|
91
91
|
},
|
|
92
92
|
methods: {
|
|
93
93
|
onJfbLoad(options) {
|
|
@@ -97,6 +97,9 @@
|
|
|
97
97
|
this.$storage.set("inCallback", inCallback);
|
|
98
98
|
try{
|
|
99
99
|
inCallback = Base64.decode(inCallback);
|
|
100
|
+
if(options.inCallback) {
|
|
101
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
102
|
+
}
|
|
100
103
|
}catch (e){
|
|
101
104
|
inCallback = null;
|
|
102
105
|
}
|
|
@@ -127,12 +130,13 @@
|
|
|
127
130
|
init(container) {
|
|
128
131
|
this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
|
|
129
132
|
this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
|
|
130
|
-
this.detailUrl =
|
|
133
|
+
this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
|
|
131
134
|
this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
|
|
132
135
|
},
|
|
133
136
|
toBindCard(){
|
|
137
|
+
let path = this.getUrlCallback(this.cardBindPath)
|
|
134
138
|
this.$xdUniHelper.navigateTo({
|
|
135
|
-
url:
|
|
139
|
+
url: path
|
|
136
140
|
})
|
|
137
141
|
},
|
|
138
142
|
toDetail(item) {
|