jufubao-base 1.0.119-beta21 → 1.0.119-beta23
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
CHANGED
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
:bg-color="mainColor"
|
|
84
84
|
width="360rpx"
|
|
85
85
|
radius="20rpx"
|
|
86
|
-
size="
|
|
86
|
+
size="medium"
|
|
87
87
|
@click="handleConfirm"
|
|
88
88
|
>直接领取</XdButton
|
|
89
89
|
>
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
class="jfb-base-con-phone__body-wrap-btn"
|
|
103
103
|
>
|
|
104
104
|
<XdButton
|
|
105
|
-
size="
|
|
105
|
+
size="medium"
|
|
106
106
|
type="primary"
|
|
107
107
|
:bg-color="mainColor"
|
|
108
108
|
radius="20rpx"
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
>{{ btnOneName }}</XdButton
|
|
111
111
|
>
|
|
112
112
|
<XdButton
|
|
113
|
-
size="
|
|
113
|
+
size="medium"
|
|
114
114
|
type="primary"
|
|
115
115
|
:bg-color="mainColor"
|
|
116
116
|
radius="20rpx"
|
|
@@ -266,9 +266,9 @@ export default {
|
|
|
266
266
|
let image1 = await getImageInfo(getServiceUrl(res.used_background));
|
|
267
267
|
console.log({ ...image }, "imageimage");
|
|
268
268
|
this.topHeight = image.imgHeight / this.$rpxNum;
|
|
269
|
-
this.topWidth =
|
|
269
|
+
this.topWidth = "100%";
|
|
270
270
|
this.bottomHeight = image1.imgHeight / this.$rpxNum;
|
|
271
|
-
this.bottomWidth =
|
|
271
|
+
this.bottomWidth = "100%";
|
|
272
272
|
this.background = getServiceUrl(res.background);
|
|
273
273
|
this.used_background = getServiceUrl(res.used_background);
|
|
274
274
|
this.errmessage = res.message;
|
|
@@ -397,9 +397,7 @@ export default {
|
|
|
397
397
|
// #endif
|
|
398
398
|
data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
|
|
399
399
|
}
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
400
|
+
console.warn(`setThirdPlace.data:${data}`);
|
|
403
401
|
jfbRootExec("setThirdPlace", {
|
|
404
402
|
vm: this,
|
|
405
403
|
data,
|
|
@@ -408,10 +406,13 @@ export default {
|
|
|
408
406
|
this.$xdHideLoading();
|
|
409
407
|
// #ifdef H5
|
|
410
408
|
if(res && res.payment_type === 'url') {
|
|
409
|
+
console.warn(`setThirdPlace.type:url`);
|
|
410
|
+
console.warn(`setThirdPlace.res.${res.payment_url}`);
|
|
411
411
|
window.location.replace(res.payment_url);
|
|
412
412
|
return
|
|
413
413
|
}
|
|
414
414
|
// #endif
|
|
415
|
+
console.warn(`setThirdPlace.type:slef`);
|
|
415
416
|
const { channel_data } = res;
|
|
416
417
|
const paySignData = JSON.parse(Base64.decode(channel_data));
|
|
417
418
|
this.openTemplatePay(paySignData, (ps) => {
|