jufubao-base 1.0.32 → 1.0.34-beta1

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCard/JfbBaseCard.vue +5 -4
  3. package/src/components/JfbBasePay/JfbBasePay.vue +6 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.32",
3
+ "version": "1.0.34-beta1",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCard/JfbBaseCard.vue CHANGED
@@ -366,7 +366,9 @@ export default {
366
366
  });
367
367
  },
368
368
  fail:(error)=>{
369
- this.setARMSError(error)
369
+ if(typeof error === 'string') error = {error: error}
370
+ if(window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
371
+ this.$xdLog.setARMSError(error)
370
372
  }
371
373
  });
372
374
  }, 100);
@@ -377,7 +379,6 @@ export default {
377
379
  this.$xdAlert({
378
380
  content: err,
379
381
  });
380
- this.setARMSError(err)
381
382
  });
382
383
  //#endif
383
384
  //#ifdef MP-WEIXIN
@@ -390,14 +391,14 @@ export default {
390
391
  });
391
392
  },
392
393
  fail: (error) => {
393
- this.setARMSError(error)
394
+ this.$xdLog.setARMSError(error)
394
395
  this.$xdHideLoading();
395
396
  },
396
397
  });
397
398
  //#endif
398
399
  } catch (err) {
399
400
  this.$xdHideLoading();
400
- this.setARMSError(err)
401
+ this.$xdLog.setARMSError(err)
401
402
  }
402
403
  },
403
404
 
package/src/components/JfbBasePay/JfbBasePay.vue CHANGED
@@ -381,16 +381,14 @@ export default {
381
381
  icon: "none",
382
382
  });
383
383
  },
384
- fail: (err) => {
385
- this.$xdLog.setARMSInfo({
386
- options:this.options,
387
- error: JSON.stringify(err)
388
- }, 'pay_fail');
384
+ fail: (error) => {
385
+ if (typeof error === 'string') error = {error: error}
386
+ if (window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
387
+ this.$xdLog.setARMSError(error)
389
388
  uni.showToast({
390
389
  title: "支付失败",
391
390
  icon: "none",
392
391
  });
393
- console.log("pay fail", err);
394
392
  },
395
393
  });
396
394
  // #endif
@@ -406,10 +404,10 @@ export default {
406
404
  cb(res);
407
405
  },
408
406
  fail: (err) => {
409
- this.$xdLog.setARMSInfo({
407
+ this.$xdLog.setARMSError({
410
408
  options: this.options,
411
409
  error: JSON.stringify(err)
412
- },'pay_fail');
410
+ });
413
411
  uni.showToast({
414
412
  title: "支付失败",
415
413
  icon: "none",