jufubao-base 1.0.119-beta14 → 1.0.119-beta16
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/JfbBaseCardInfoEntry.vue +46 -50
- package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue +13 -5
- package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +8 -2
- package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +8 -4
- package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue +1 -1
- package/src/components/JfbBaseWallet/Api.js +1 -1
- package/src/components/JfbBaseWallet/Attr.js +1 -1
- package/src/components/JfbBaseWallet/JfbBaseWallet.vue +1 -1
- package/src/components/JfbBaseWallet/Mock.js +1 -0
- package/src/components/JfbBaseWalletDetail/Api.js +1 -0
- package/src/components/JfbBaseWalletDetail/Attr.js +1 -0
- package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetail.vue +1 -1
- package/src/components/JfbBaseWalletDetail/Mock.js +1 -0
- package/src/components/JfbBaseWalletEffective/Api.js +1 -0
- package/src/components/JfbBaseWalletEffective/Attr.js +1 -0
- package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffective.vue +1 -1
- package/src/components/JfbBaseWalletEffective/Mock.js +1 -1
- package/src/components/JfbBaseWalletIndex/Api.js +1 -1
- package/src/components/JfbBaseWalletIndex/Attr.js +1 -1
- package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue +1 -1
- package/src/components/JfbBaseWalletIndex/Mock.js +1 -1
- package/src/components/JfbBaseWalletItem/Api.js +1 -1
- package/src/components/JfbBaseWalletItem/Attr.js +1 -1
- package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue +1 -1
- package/src/components/JfbBaseWalletItem/Mock.js +1 -0
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)) {
|
|
@@ -163,6 +163,7 @@ export default {
|
|
|
163
163
|
backUrl: "",
|
|
164
164
|
headerBg: {},
|
|
165
165
|
my_card_url: "", //我的票券跳转地址
|
|
166
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
166
167
|
};
|
|
167
168
|
},
|
|
168
169
|
watch: {
|
|
@@ -195,7 +196,7 @@ export default {
|
|
|
195
196
|
}
|
|
196
197
|
},
|
|
197
198
|
});
|
|
198
|
-
return
|
|
199
|
+
return
|
|
199
200
|
}
|
|
200
201
|
this.handleToBind()
|
|
201
202
|
},
|
|
@@ -240,8 +241,9 @@ export default {
|
|
|
240
241
|
this.toShowCouponDialog();
|
|
241
242
|
this.$bus.$on("onCloseConDialog",(container_id) => {
|
|
242
243
|
if(container_id === this.hasCon){
|
|
244
|
+
let path = this.getUrlCallback(this.backUrl)
|
|
243
245
|
this.$xdUniHelper.redirectTo({
|
|
244
|
-
url:
|
|
246
|
+
url: path,
|
|
245
247
|
});
|
|
246
248
|
}
|
|
247
249
|
})
|
|
@@ -249,8 +251,9 @@ export default {
|
|
|
249
251
|
this.$xdAlert({
|
|
250
252
|
content: "票券绑定成功",
|
|
251
253
|
close: () => {
|
|
254
|
+
let path = this.getUrlCallback(this.backUrl)
|
|
252
255
|
this.$xdUniHelper.redirectTo({
|
|
253
|
-
url:
|
|
256
|
+
url: path,
|
|
254
257
|
});
|
|
255
258
|
},
|
|
256
259
|
});
|
|
@@ -267,8 +270,9 @@ export default {
|
|
|
267
270
|
showClose: false,
|
|
268
271
|
success: (res) => {
|
|
269
272
|
if (res.confirm) {
|
|
273
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl)
|
|
270
274
|
this.$xdUniHelper.redirectTo({
|
|
271
|
-
url:
|
|
275
|
+
url: path,
|
|
272
276
|
});
|
|
273
277
|
}else{
|
|
274
278
|
}
|
|
@@ -296,17 +300,9 @@ export default {
|
|
|
296
300
|
onJfbLoad(options) {
|
|
297
301
|
this.init();
|
|
298
302
|
this.qrcode = options.qrcode;
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
// if(!this.qrcode) {
|
|
303
|
-
// this.$xdAlert({
|
|
304
|
-
// content: '参数配置错误',
|
|
305
|
-
// type: 'error'
|
|
306
|
-
// });
|
|
307
|
-
// return
|
|
308
|
-
// }
|
|
309
|
-
// }
|
|
303
|
+
if(options.inCallback) {
|
|
304
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
305
|
+
}
|
|
310
306
|
if (this.qrcode) {
|
|
311
307
|
jfbRootExec("getByQrCardDetailEntry", {
|
|
312
308
|
vm: this,
|
|
@@ -469,18 +465,18 @@ export default {
|
|
|
469
465
|
overflow: hidden;
|
|
470
466
|
border-radius: unit(16, rpx);
|
|
471
467
|
margin-bottom: unit(30, rpx);
|
|
472
|
-
|
|
468
|
+
|
|
473
469
|
&:last-child {
|
|
474
470
|
margin-bottom: 0;
|
|
475
471
|
}
|
|
476
|
-
|
|
477
|
-
|
|
472
|
+
|
|
473
|
+
|
|
478
474
|
&__title {
|
|
479
475
|
height: unit(56, rpx);
|
|
480
476
|
display: flex;
|
|
481
477
|
justify-content: flex-start;
|
|
482
478
|
align-items: center;
|
|
483
|
-
|
|
479
|
+
|
|
484
480
|
& > view {
|
|
485
481
|
padding: 0 unit(80, rpx);
|
|
486
482
|
font-size: unit(24, rpx);
|
|
@@ -489,23 +485,23 @@ export default {
|
|
|
489
485
|
color: #fff;
|
|
490
486
|
border-radius: 0 0 unit(16, rpx) 0;
|
|
491
487
|
}
|
|
492
|
-
|
|
488
|
+
|
|
493
489
|
}
|
|
494
|
-
|
|
490
|
+
|
|
495
491
|
&__content {
|
|
496
492
|
padding: unit(10, rpx) unit(40, rpx) 0;
|
|
497
493
|
height: unit(86, rpx);
|
|
498
494
|
display: flex;
|
|
499
495
|
justify-content: space-between;
|
|
500
496
|
align-items: center;
|
|
501
|
-
|
|
497
|
+
|
|
502
498
|
& > view:first-child {
|
|
503
499
|
font-size: unit(36, rpx);
|
|
504
500
|
line-height: unit(86, rpx);
|
|
505
501
|
color: #fff;
|
|
506
502
|
font-weight: 700;
|
|
507
503
|
}
|
|
508
|
-
|
|
504
|
+
|
|
509
505
|
& > view:nth-child(2) {
|
|
510
506
|
font-size: unit(24, rpx);
|
|
511
507
|
display: flex;
|
|
@@ -516,32 +512,32 @@ export default {
|
|
|
516
512
|
color: #fff;
|
|
517
513
|
}
|
|
518
514
|
}
|
|
519
|
-
|
|
515
|
+
|
|
520
516
|
&__date {
|
|
521
517
|
padding: 0 unit(40, rpx);
|
|
522
518
|
font-size: unit(28, rpx);
|
|
523
519
|
line-height: unit(32, rpx);
|
|
524
520
|
color: #fff;
|
|
525
521
|
}
|
|
526
|
-
|
|
522
|
+
|
|
527
523
|
&__yue {
|
|
528
524
|
padding: unit(10, rpx) unit(40, rpx) 0;
|
|
529
525
|
font-size: unit(28, rpx);
|
|
530
526
|
line-height: unit(32, rpx);
|
|
531
527
|
color: #fff;
|
|
532
|
-
|
|
528
|
+
|
|
533
529
|
& > text:nth-child(2) {
|
|
534
530
|
font-weight: 700;
|
|
535
531
|
}
|
|
536
532
|
}
|
|
537
|
-
|
|
533
|
+
|
|
538
534
|
&__other {
|
|
539
535
|
display: flex;
|
|
540
536
|
justify-content: flex-start;
|
|
541
537
|
align-items: center;
|
|
542
538
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
543
539
|
margin-top: unit(0, rpx);
|
|
544
|
-
|
|
540
|
+
|
|
545
541
|
& > view {
|
|
546
542
|
border-radius:unit(8, rpx);
|
|
547
543
|
background: rgba(255, 255, 255, 0.2);
|
|
@@ -555,17 +551,17 @@ export default {
|
|
|
555
551
|
padding: 0 unit(20, rpx);
|
|
556
552
|
color: #fff;
|
|
557
553
|
}
|
|
558
|
-
|
|
559
|
-
|
|
554
|
+
|
|
555
|
+
|
|
560
556
|
}
|
|
561
|
-
|
|
557
|
+
|
|
562
558
|
&__nodata {
|
|
563
559
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
564
560
|
margin-top: unit(0, rpx);
|
|
565
561
|
color: #fff;
|
|
566
562
|
font-size: unit(28, rpx);
|
|
567
563
|
}
|
|
568
|
-
|
|
564
|
+
|
|
569
565
|
&__entry {
|
|
570
566
|
padding: unit(20, rpx) unit(40, rpx) 0;
|
|
571
567
|
& > view {
|
|
@@ -578,26 +574,26 @@ export default {
|
|
|
578
574
|
font-weight: 500;
|
|
579
575
|
}
|
|
580
576
|
}
|
|
581
|
-
|
|
577
|
+
|
|
582
578
|
&__entrys {
|
|
583
579
|
margin: unit(20, rpx) unit(20, rpx) 0;
|
|
584
580
|
padding: unit(30, rpx);
|
|
585
581
|
border-radius: unit(16, rpx);
|
|
586
582
|
background: rgba(255, 255, 255, 1);
|
|
587
583
|
box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
|
|
588
|
-
|
|
584
|
+
|
|
589
585
|
&-title {
|
|
590
586
|
display: flex;
|
|
591
587
|
justify-content: space-between;
|
|
592
588
|
align-items: center;
|
|
593
|
-
|
|
594
|
-
|
|
589
|
+
|
|
590
|
+
|
|
595
591
|
& > view:first-child {
|
|
596
592
|
font-size: unit(28, rpx);
|
|
597
593
|
font-weight: 500;
|
|
598
594
|
flex: 1;
|
|
599
595
|
}
|
|
600
|
-
|
|
596
|
+
|
|
601
597
|
& > view:nth-child(2) {
|
|
602
598
|
display: flex;
|
|
603
599
|
justify-content: flex-start;
|
|
@@ -607,11 +603,11 @@ export default {
|
|
|
607
603
|
color: #999;
|
|
608
604
|
}
|
|
609
605
|
}
|
|
610
|
-
|
|
606
|
+
|
|
611
607
|
&-scroll {
|
|
612
|
-
|
|
608
|
+
|
|
613
609
|
}
|
|
614
|
-
|
|
610
|
+
|
|
615
611
|
&-item {
|
|
616
612
|
display: flex;
|
|
617
613
|
justify-content: flex-start;
|
|
@@ -619,7 +615,7 @@ export default {
|
|
|
619
615
|
flex-flow: nowrap;
|
|
620
616
|
margin-left: unit(-14, rpx);
|
|
621
617
|
padding-top: unit(20, rpx);
|
|
622
|
-
|
|
618
|
+
|
|
623
619
|
& > view {
|
|
624
620
|
width: unit(120, rpx);
|
|
625
621
|
margin-right: unit(10, rpx);
|
|
@@ -628,25 +624,25 @@ export default {
|
|
|
628
624
|
justify-content: center;
|
|
629
625
|
flex-direction: column;
|
|
630
626
|
align-items: center;
|
|
631
|
-
|
|
627
|
+
|
|
632
628
|
& > view:first-child {
|
|
633
629
|
width: unit(76, rpx);
|
|
634
630
|
height: unit(76, rpx);
|
|
635
631
|
overflow: hidden;
|
|
636
|
-
|
|
632
|
+
|
|
637
633
|
& > image {
|
|
638
634
|
height: 100%;
|
|
639
635
|
width: 100%;
|
|
640
636
|
}
|
|
641
637
|
}
|
|
642
|
-
|
|
638
|
+
|
|
643
639
|
& > view:nth-child(2) {
|
|
644
640
|
margin-top: unit(10, rpx);
|
|
645
641
|
font-size: unit(24, rpx);
|
|
646
642
|
line-height: unit(36, rpx);
|
|
647
643
|
margin-bottom: unit(10, rpx);
|
|
648
644
|
}
|
|
649
|
-
|
|
645
|
+
|
|
650
646
|
& > view:nth-child(3) {
|
|
651
647
|
display: flex;
|
|
652
648
|
justify-content: flex-start;
|
|
@@ -655,17 +651,17 @@ export default {
|
|
|
655
651
|
font-size: unit(20, rpx);
|
|
656
652
|
color: #999;
|
|
657
653
|
}
|
|
658
|
-
|
|
654
|
+
|
|
659
655
|
&:last-child {
|
|
660
656
|
margin-right: 0;
|
|
661
657
|
}
|
|
662
|
-
|
|
658
|
+
|
|
663
659
|
}
|
|
664
|
-
|
|
665
|
-
|
|
660
|
+
|
|
661
|
+
|
|
666
662
|
}
|
|
667
663
|
}
|
|
668
|
-
|
|
664
|
+
|
|
669
665
|
&-warp {
|
|
670
666
|
width: unit(700, rpx);
|
|
671
667
|
// min-height: unit(290, rpx);
|
|
@@ -115,6 +115,8 @@ export default {
|
|
|
115
115
|
pa: "", //二维码
|
|
116
116
|
//页面跳转地址
|
|
117
117
|
backUrl: "",
|
|
118
|
+
|
|
119
|
+
inCallbackUrlOrg:'',//是否带有回调地址
|
|
118
120
|
};
|
|
119
121
|
},
|
|
120
122
|
watch: {
|
|
@@ -131,7 +133,7 @@ export default {
|
|
|
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
|
})
|
|
@@ -173,6 +178,9 @@ export default {
|
|
|
173
178
|
},
|
|
174
179
|
onJfbLoad(options) {
|
|
175
180
|
this.pa = options.pa;
|
|
181
|
+
if(options.inCallback) {
|
|
182
|
+
this.inCallbackUrlOrg = options.inCallback;
|
|
183
|
+
}
|
|
176
184
|
//正式环境判断参数错误
|
|
177
185
|
if(!this.$configProject.isPreview) {
|
|
178
186
|
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) {
|
|
@@ -93,6 +93,7 @@
|
|
|
93
93
|
<script>
|
|
94
94
|
import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
|
|
95
95
|
import { jfbRootExec } from "@/utils/xd.event";
|
|
96
|
+
import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
|
|
96
97
|
import componentsMixins from "@/mixins/componentsMixins";
|
|
97
98
|
import extsMixins from "@/mixins/extsMixins";
|
|
98
99
|
import { getContainerPropsValue } from "@/utils/xd.base";
|
|
@@ -101,7 +102,6 @@ import XdForm from "@/components/XdForm/XdForm";
|
|
|
101
102
|
import XdFormInput from "@/components/XdFormInput/XdFormInput";
|
|
102
103
|
import XdButton from "@/components/XdButton/XdButton";
|
|
103
104
|
import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
|
|
104
|
-
import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
|
|
105
105
|
|
|
106
106
|
export default {
|
|
107
107
|
name: "JfbBasePhoneCollect",
|
|
@@ -3,3 +3,4 @@
|
|
|
3
3
|
module.exports = {
|
|
4
4
|
getRecordDetail: {"trade_id":"8ICccHHNMFVyGvnetIkJU","trade_type":"recharge","trade_type_name":"充值","operate_type":"A","operate_type_name":"收入","amount":100000,"list":[{"label":"收入账户","value":"综合元宝"},{"label":"收入账号","value":"1000000000000245"},{"label":"收入时间","value":"-"}],"request_id":"0d909e7ad44f21de"}
|
|
5
5
|
}
|
|
6
|
+
|
|
@@ -4,4 +4,4 @@ module.exports = {
|
|
|
4
4
|
getWalletList: {"show_name":"元宝1","icon":"","total_amount":200000,"list":[{"wallet_type":"UB","wallet_name":"福利宝","wallet_virtual_number":"1000000000000244","amount":100000,"business_codes":"cake","business_codes_name":"蛋糕(勿改)","wallet_rule":"UB使用规则说明"},{"wallet_type":"UC","wallet_name":"综合元宝","wallet_virtual_number":"1000000000000245","amount":100000,"business_codes":"cake,movie","business_codes_name":"蛋糕(勿改),电影(勿改)","wallet_rule":"UC使用规则说明"}],"request_id":"3f16d65d03da3594"},
|
|
5
5
|
getWalletRecordList: {"next_page_token":"","total_size":0,"list":[{"trade_id":"8ICccHHNMFVyGvnetIkJU","partner_id":0,"site_id":"","amount":100000,"wallet_type":"UC","operate_type":"A","operate_type_name":"收入","trade_type":"recharge","trade_type_name":"充值","comment":"","created_time":1711421305},{"trade_id":"oxbU0hZYtaWZDnwn-ddtr","partner_id":0,"site_id":"","amount":100000,"wallet_type":"UB","operate_type":"A","operate_type_name":"收入","trade_type":"recharge","trade_type_name":"充值","comment":"","created_time":1711421282}],"request_id":"87730507cec25d22"},
|
|
6
6
|
getWalletQrcode: {"wallet":{"wallet_type":"UB","wallet_name":"福利宝","wallet_virtual_number":"1000000000000244","amount":100000,"business_codes":"cake","business_codes_name":"蛋糕(勿改)","wallet_rule":"UB使用规则说明"},"dynamic_qrcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/qrcode?code_content=h.161.wp2d1klggzfbjuc","dynamic_barcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/barcode?code_content=h.161.wp2d1klggzfbjuc","dynamic_qrcode_expired":600,"request_id":"de739096b3364eca"}
|
|
7
|
-
}
|
|
7
|
+
}
|
|
@@ -4,3 +4,4 @@ module.exports = {
|
|
|
4
4
|
getWalletDetail: {"wallet":{"wallet_type":"UB","wallet_name":"福利宝","wallet_virtual_number":"1000000000000244","amount":100000,"business_codes":"cake","business_codes_name":"蛋糕(勿改)","wallet_rule":"UB使用规则说明"},"request_id":"fa4e778c1443dcda"},
|
|
5
5
|
getWalletRecordList: {"next_page_token":"","total_size":0,"list":[{"trade_id":"8ICccHHNMFVyGvnetIkJU","partner_id":0,"site_id":"","amount":100000,"wallet_type":"UC","operate_type":"A","operate_type_name":"收入","trade_type":"recharge","trade_type_name":"充值","comment":"","created_time":1711421305},{"trade_id":"oxbU0hZYtaWZDnwn-ddtr","partner_id":0,"site_id":"","amount":100000,"wallet_type":"UB","operate_type":"A","operate_type_name":"收入","trade_type":"recharge","trade_type_name":"充值","comment":"","created_time":1711421282}],"request_id":"d332d6696fcc001e"}
|
|
6
6
|
}
|
|
7
|
+
|