jufubao-base 1.0.33 → 1.0.34-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.33",
+  "version": "1.0.34-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -343,7 +343,6 @@ export default {
      * @description 扫码绑定
      */
     handleScan() {
-      console.log(getApp().globalData, "pageAtrr");
       this.$xdShowLoading({});
       try {
         //#ifdef H5
@@ -366,6 +365,8 @@ export default {
                     });
                   },
                   fail:(error)=>{
+                    if(typeof error === 'string') error = {error: error}
+                    if(window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
                     this.$xdLog.setARMSError(error)
                   }
                 });
@@ -377,7 +378,6 @@ export default {
             this.$xdAlert({
               content: err,
             });
-            this.$xdLog.setARMSError(err)
           });
         //#endif
         //#ifdef MP-WEIXIN

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -370,7 +370,6 @@ export default {
           console.log("pay success", res);
           uni.showToast({
             title: "支付成功",
-            icon: "none",
           });
           cb(res);
         },
@@ -378,19 +377,15 @@ export default {
           this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
           uni.showToast({
             title: "取消支付",
-            icon: "none",
           });
         },
-        fail: (err) => {
-          this.$xdLog.setARMSInfo({
-            options:this.options,
-            error: JSON.stringify(err)
-          }, 'pay_fail');
+        fail: (error) => {
+          if (typeof error === 'string') error = {error: error}
+          if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
+          this.$xdLog.setARMSError(error)
           uni.showToast({
             title: "支付失败",
-            icon: "none",
           });
-          console.log("pay fail", err);
         },
       });
       // #endif
@@ -406,10 +401,10 @@ export default {
           cb(res);
         },
         fail: (err) => {
-          this.$xdLog.setARMSInfo({
+          this.$xdLog.setARMSError({
             options: this.options,
             error: JSON.stringify(err)
-          },'pay_fail');
+          });
           uni.showToast({
             title: "支付失败",
             icon: "none",