jufubao-base 1.0.311-beta3 → 1.0.311-beta4
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/JfbBaseCardDetail/JfbBaseCardDetail.vue +1 -1
- package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +1 -1
- package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue +16 -3
- package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue +17 -5
package/package.json
CHANGED
|
@@ -129,7 +129,7 @@
|
|
|
129
129
|
<view>打开支付宝APP,点击扫一扫直接扫码或点击相册中保存图片</view>
|
|
130
130
|
<view class="code_box">
|
|
131
131
|
<view class="qr_code">
|
|
132
|
-
<image mode="aspectFit" :src="sign_url_qrcode"></image>
|
|
132
|
+
<image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
|
|
133
133
|
</view>
|
|
134
134
|
<view>长按保存二维码</view>
|
|
135
135
|
</view>
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
<view>打开支付宝APP,点击扫一扫直接扫码或点击相册中保存图片</view>
|
|
144
144
|
<view class="code_box">
|
|
145
145
|
<view class="qr_code">
|
|
146
|
-
<image mode="aspectFit" :src="sign_url_qrcode"></image>
|
|
146
|
+
<image show-menu-by-longpress mode="aspectFit" :src="sign_url_qrcode"></image>
|
|
147
147
|
</view>
|
|
148
148
|
<view>长按保存二维码</view>
|
|
149
149
|
</view>
|
|
@@ -247,8 +247,14 @@ export default {
|
|
|
247
247
|
this.handleBindConfirm();
|
|
248
248
|
return;
|
|
249
249
|
}
|
|
250
|
-
|
|
251
|
-
|
|
250
|
+
let card_number
|
|
251
|
+
if(this.card_number){
|
|
252
|
+
card_number = this.card_number;
|
|
253
|
+
}
|
|
254
|
+
if(this.qrcode&&this.info.card_number){
|
|
255
|
+
card_number = this.info.card_number;
|
|
256
|
+
}
|
|
257
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
|
|
252
258
|
//有优惠券处理
|
|
253
259
|
if(this.hasCon){
|
|
254
260
|
this.toShowCouponDialog();
|
|
@@ -276,6 +282,13 @@ export default {
|
|
|
276
282
|
|
|
277
283
|
//卡券已被自己绑定时的弹框
|
|
278
284
|
handleBindConfirm(){
|
|
285
|
+
let card_number
|
|
286
|
+
if(this.card_number){
|
|
287
|
+
card_number = this.card_number;
|
|
288
|
+
}
|
|
289
|
+
if(this.qrcode&&this.info.card_number){
|
|
290
|
+
card_number = this.info.card_number;
|
|
291
|
+
}
|
|
279
292
|
this.$xdConfirm({
|
|
280
293
|
styles: this.styles,
|
|
281
294
|
width: '90%',
|
|
@@ -285,7 +298,7 @@ export default {
|
|
|
285
298
|
showClose: false,
|
|
286
299
|
success: (res) => {
|
|
287
300
|
if (res.confirm) {
|
|
288
|
-
let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${
|
|
301
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`;
|
|
289
302
|
this.$xdUniHelper.redirectTo({ url: path});
|
|
290
303
|
}else{
|
|
291
304
|
}
|
|
@@ -266,12 +266,18 @@ export default {
|
|
|
266
266
|
this.handleBindConfirm();
|
|
267
267
|
return;
|
|
268
268
|
}
|
|
269
|
-
|
|
269
|
+
let card_number
|
|
270
|
+
if(this.card_number){
|
|
271
|
+
card_number = this.card_number;
|
|
272
|
+
}
|
|
273
|
+
if(this.qrcode&&this.info.card_number){
|
|
274
|
+
card_number = this.info.card_number;
|
|
275
|
+
}
|
|
270
276
|
if(this.hasCon){
|
|
271
277
|
this.toShowCouponDialog();
|
|
272
278
|
this.$bus.$on("onCloseConDialog",(container_id) => {
|
|
273
279
|
if(container_id === this.hasCon){
|
|
274
|
-
let path = this.getUrlCallback(this.backUrl)+`?card_number=${
|
|
280
|
+
let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
|
|
275
281
|
this.$xdUniHelper.redirectTo({
|
|
276
282
|
url: path,
|
|
277
283
|
});
|
|
@@ -281,7 +287,7 @@ export default {
|
|
|
281
287
|
this.$xdAlert({
|
|
282
288
|
content: "票券绑定成功",
|
|
283
289
|
close: () => {
|
|
284
|
-
let path = this.getUrlCallback(this.backUrl)+`?card_number=${
|
|
290
|
+
let path = this.getUrlCallback(this.backUrl)+`?card_number=${card_number}`
|
|
285
291
|
this.$xdUniHelper.redirectTo({
|
|
286
292
|
url: path,
|
|
287
293
|
});
|
|
@@ -291,6 +297,13 @@ export default {
|
|
|
291
297
|
},
|
|
292
298
|
//卡券已被自己绑定时的弹框
|
|
293
299
|
handleBindConfirm(){
|
|
300
|
+
let card_number
|
|
301
|
+
if(this.card_number){
|
|
302
|
+
card_number = this.card_number;
|
|
303
|
+
}
|
|
304
|
+
if(this.qrcode&&this.info.card_number){
|
|
305
|
+
card_number = this.info.card_number;
|
|
306
|
+
}
|
|
294
307
|
this.$xdConfirm({
|
|
295
308
|
styles: this.styles,
|
|
296
309
|
width: '90%',
|
|
@@ -300,7 +313,7 @@ export default {
|
|
|
300
313
|
showClose: false,
|
|
301
314
|
success: (res) => {
|
|
302
315
|
if (res.confirm) {
|
|
303
|
-
let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${
|
|
316
|
+
let path = this.getUrlCallback(this.my_card_url || this.backUrl)+`?card_number=${card_number}`
|
|
304
317
|
this.$xdUniHelper.redirectTo({
|
|
305
318
|
url: path,
|
|
306
319
|
});
|
|
@@ -327,7 +340,6 @@ export default {
|
|
|
327
340
|
this.qrcode = decodeURIComponent(this.qrcode);
|
|
328
341
|
}
|
|
329
342
|
//#endif
|
|
330
|
-
|
|
331
343
|
if(options.inCallback) {
|
|
332
344
|
this.inCallbackUrlOrg = options.inCallback;
|
|
333
345
|
}
|