jufubao-base 1.0.39-beta2 → 1.0.39
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
|
@@ -281,16 +281,18 @@ export default {
|
|
|
281
281
|
|
|
282
282
|
//#ifdef H5
|
|
283
283
|
this.isWx = isWechat();
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
.then()
|
|
289
|
-
.catch(error=>{
|
|
290
|
-
this.$xdAlert({
|
|
291
|
-
content: error,
|
|
292
|
-
});
|
|
284
|
+
if (!this.$configProject.isPreview) {
|
|
285
|
+
jfbRootExec("getH5WxAuthorize", {
|
|
286
|
+
vm: this,
|
|
287
|
+
data: {site_id: "wx_pub"},
|
|
293
288
|
})
|
|
289
|
+
.then()
|
|
290
|
+
.catch(error=>{
|
|
291
|
+
this.$xdAlert({
|
|
292
|
+
content: error,
|
|
293
|
+
});
|
|
294
|
+
})
|
|
295
|
+
}
|
|
294
296
|
// #endif
|
|
295
297
|
|
|
296
298
|
//设置
|
|
@@ -228,7 +228,7 @@
|
|
|
228
228
|
}).then(res => {
|
|
229
229
|
cb(res)
|
|
230
230
|
}).catch(e => {
|
|
231
|
-
this.$xdLog.setARMSCustomError('
|
|
231
|
+
this.$xdLog.setARMSCustomError('get_city_info_by_location_base_header', this.$runtime.getErrorInfo(e));
|
|
232
232
|
cb({data: this.$settings.defaultCity})
|
|
233
233
|
})
|
|
234
234
|
},
|
|
@@ -231,7 +231,11 @@ export default {
|
|
|
231
231
|
},
|
|
232
232
|
created() {
|
|
233
233
|
this.init(this.container);
|
|
234
|
-
|
|
234
|
+
// #ifdef H5
|
|
235
|
+
if (!this.$configProject.isPreview){
|
|
236
|
+
this.p_getH5WxAuthorize()
|
|
237
|
+
}
|
|
238
|
+
// #endif
|
|
235
239
|
},
|
|
236
240
|
methods: {
|
|
237
241
|
onJfbLoad(options) {
|
|
@@ -241,9 +245,6 @@ export default {
|
|
|
241
245
|
this.type = options.type;
|
|
242
246
|
this.p_getPayOrderDetail();
|
|
243
247
|
this.p_getListUserPayChannel();
|
|
244
|
-
// #ifdef H5
|
|
245
|
-
if(!this.$configProject.isPreview) this.p_getH5WxAuthorize();
|
|
246
|
-
// #endif
|
|
247
248
|
},
|
|
248
249
|
/**
|
|
249
250
|
* @description 监听事件变化
|
|
@@ -308,12 +309,16 @@ export default {
|
|
|
308
309
|
p_getH5WxAuthorize() {
|
|
309
310
|
jfbRootExec("getH5WxAuthorize", {
|
|
310
311
|
vm: this,
|
|
311
|
-
data: {
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
312
|
+
data: {jsApiList: ["chooseWXPay"],},
|
|
313
|
+
})
|
|
314
|
+
.then((res) => {
|
|
315
|
+
this.jwxSDK = res.jwxSDK;
|
|
316
|
+
})
|
|
317
|
+
.catch(error => {
|
|
318
|
+
this.$xdAlert({
|
|
319
|
+
content: error,
|
|
320
|
+
});
|
|
321
|
+
});
|
|
317
322
|
},
|
|
318
323
|
//第三方支付
|
|
319
324
|
doThirdPay() {
|