jufubao-base 1.0.130-beta2 → 1.0.130-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/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +20 -4
- package/src/components/JfbBasePoster/JfbBasePoster.vue +2 -1
- package/src/components/JfbBasePoster/MoreScreen.vue +2 -1
- package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue +2 -1
- package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue +2 -1
- package/src/components/JfbBasePosterType/FourScreen.vue +2 -1
- package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +20 -10
package/package.json
CHANGED
|
@@ -336,9 +336,7 @@
|
|
|
336
336
|
padding: 10rpx 0;
|
|
337
337
|
margin: 32rpx 0 32rpx 32rpx;
|
|
338
338
|
"
|
|
339
|
-
>{{
|
|
340
|
-
info.codes.length > 10 ? index + 1 : `0${index + 1}`
|
|
341
|
-
}}</view
|
|
339
|
+
>{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view
|
|
342
340
|
>
|
|
343
341
|
<view
|
|
344
342
|
class="jfb-base-order-detail__body-card jfb-base-order-detail__body-num"
|
|
@@ -999,12 +997,30 @@ export default {
|
|
|
999
997
|
if(item.logo) {
|
|
1000
998
|
item.logo = getServiceUrl(item.logo)
|
|
1001
999
|
}
|
|
1002
|
-
if (
|
|
1000
|
+
if (
|
|
1001
|
+
item.show_type === "qrcode"
|
|
1002
|
+
|| item.show_type === "barcode"
|
|
1003
|
+
|| item.show_type === "qrcode-pass"
|
|
1004
|
+
|| item.show_type === "barcode-pass"
|
|
1005
|
+
) {
|
|
1003
1006
|
let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
|
|
1004
1007
|
item.code_url = reg.test(item.code_url)? item.code_url:`${this.brandInfo['api_host']}${item.code_url}`
|
|
1005
1008
|
}
|
|
1009
|
+
|
|
1010
|
+
//二维码 + 密码处理
|
|
1011
|
+
if(item.show_type === "qrcode-pass") {
|
|
1012
|
+
item.show_type = 'qrcode';
|
|
1013
|
+
item.can_read_code = item.can_read_password;
|
|
1014
|
+
}
|
|
1015
|
+
//条形码 + 密码处理
|
|
1016
|
+
if(item.show_type === "barcode-pass") {
|
|
1017
|
+
item.show_type = 'barcode';
|
|
1018
|
+
item.can_read_code = item.can_read_password;
|
|
1019
|
+
}
|
|
1020
|
+
|
|
1006
1021
|
return item;
|
|
1007
1022
|
});
|
|
1023
|
+
|
|
1008
1024
|
if (res.film_show && Object.keys(res.film_show).length > 0) {
|
|
1009
1025
|
res.film_show.show_time = this.$xdUniHelper.getDate(
|
|
1010
1026
|
res.film_show.show_time * 1000
|
|
@@ -420,7 +420,8 @@
|
|
|
420
420
|
let url = JSON.parse(item.redirect_data);
|
|
421
421
|
if (reg.test(url.url)) {
|
|
422
422
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
423
|
-
window.location.href = url.url;
|
|
423
|
+
//window.location.href = url.url;
|
|
424
|
+
this.$xdUniHelper.navigateTo(url)
|
|
424
425
|
} else {
|
|
425
426
|
throw Error('地址错误')
|
|
426
427
|
}
|
|
@@ -194,7 +194,8 @@
|
|
|
194
194
|
let url = JSON.parse(item.redirect_data);
|
|
195
195
|
if (reg.test(url.url)) {
|
|
196
196
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
197
|
-
window.location.href = url.url;
|
|
197
|
+
//window.location.href = url.url;
|
|
198
|
+
this.$xdUniHelper.navigateTo(url)
|
|
198
199
|
} else {
|
|
199
200
|
throw Error('地址错误')
|
|
200
201
|
}
|
|
@@ -618,7 +618,8 @@ export default {
|
|
|
618
618
|
let url = JSON.parse(item.redirect_data);
|
|
619
619
|
if (reg.test(url.url)) {
|
|
620
620
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
621
|
-
window.location.href = url.url;
|
|
621
|
+
//window.location.href = url.url;
|
|
622
|
+
this.$xdUniHelper.navigateTo(url)
|
|
622
623
|
} else {
|
|
623
624
|
throw Error("地址错误");
|
|
624
625
|
}
|
|
@@ -160,7 +160,8 @@
|
|
|
160
160
|
let url = JSON.parse(item.redirect_data);
|
|
161
161
|
if (reg.test(url.url)) {
|
|
162
162
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
163
|
-
window.location.href = url.url;
|
|
163
|
+
//window.location.href = url.url;
|
|
164
|
+
this.$xdUniHelper.navigateTo(url)
|
|
164
165
|
}
|
|
165
166
|
else {
|
|
166
167
|
throw Error('地址错误')
|
|
@@ -175,6 +175,7 @@
|
|
|
175
175
|
}, 100)
|
|
176
176
|
},
|
|
177
177
|
handleClick(item) {
|
|
178
|
+
debugger
|
|
178
179
|
//内部链接跳转地址
|
|
179
180
|
if (item.redirect_type === 'INN') {
|
|
180
181
|
try {
|
|
@@ -212,7 +213,7 @@
|
|
|
212
213
|
let url = JSON.parse(item.redirect_data);
|
|
213
214
|
if (reg.test(url.url)) {
|
|
214
215
|
console.warn(`广告跳转外站: ${url.url}`);
|
|
215
|
-
|
|
216
|
+
this.$xdUniHelper.navigateTo(url)
|
|
216
217
|
} else {
|
|
217
218
|
throw Error('地址错误')
|
|
218
219
|
}
|
|
@@ -49,9 +49,7 @@
|
|
|
49
49
|
></xd-font-icon>
|
|
50
50
|
</view>
|
|
51
51
|
<view>{{ info.status.status_name }}</view>
|
|
52
|
-
<view class="jfb-base-success__body-icon-item-tip">{{
|
|
53
|
-
info.status.comment
|
|
54
|
-
}}</view>
|
|
52
|
+
<view class="jfb-base-success__body-icon-item-tip">{{info.status.comment }}</view>
|
|
55
53
|
</view>
|
|
56
54
|
<view class="jfb-base-success__body-icon-btn">
|
|
57
55
|
<view v-for="(item, index) in info['btn']" :key="index">
|
|
@@ -107,12 +105,8 @@
|
|
|
107
105
|
></image>
|
|
108
106
|
<image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
|
|
109
107
|
</view>
|
|
110
|
-
<view class="jfb-base-success__body-cashier-text">
|
|
111
|
-
|
|
112
|
-
</view>
|
|
113
|
-
<view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
|
|
114
|
-
{{info.codes[0].refund_tip_text}}
|
|
115
|
-
</view>
|
|
108
|
+
<view class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
|
|
109
|
+
<view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
|
|
116
110
|
<view
|
|
117
111
|
v-if="info.codes[0].code_end_time"
|
|
118
112
|
class="jfb-base-success__body-cashier-code"
|
|
@@ -581,10 +575,26 @@ export default {
|
|
|
581
575
|
if(item.logo) {
|
|
582
576
|
item.logo = getServiceUrl(item.logo)
|
|
583
577
|
}
|
|
584
|
-
if (item.show_type === "qrcode"
|
|
578
|
+
if (item.show_type === "qrcode"
|
|
579
|
+
|| item.show_type === "barcode"
|
|
580
|
+
|| item.show_type === "qrcode-pass"
|
|
581
|
+
|| item.show_type === "barcode-pass"
|
|
582
|
+
) {
|
|
585
583
|
let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
|
|
586
584
|
if (!reg.test(item.code_url)) item.code_url = `${this.brandInfo["api_host"]}${item.code_url}`;
|
|
587
585
|
}
|
|
586
|
+
|
|
587
|
+
//二维码 + 密码处理
|
|
588
|
+
if(item.show_type === "qrcode-pass") {
|
|
589
|
+
item.show_type = 'qrcode';
|
|
590
|
+
item.can_read_code = item.can_read_password;
|
|
591
|
+
}
|
|
592
|
+
//条形码 + 密码处理
|
|
593
|
+
if(item.show_type === "barcode-pass") {
|
|
594
|
+
item.show_type = 'barcode';
|
|
595
|
+
item.can_read_code = item.can_read_password;
|
|
596
|
+
}
|
|
597
|
+
|
|
588
598
|
return item;
|
|
589
599
|
});
|
|
590
600
|
|