jufubao-base 1.0.34-beta2 → 1.0.34-beta4

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -277,9 +277,20 @@ export default {
   created() {
     this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
+    
 
     //#ifdef H5
     this.isWx = isWechat();
+    jfbRootExec("getH5WxAuthorize", {
+      vm: this,
+      data: {site_id: "wx_pub"},
+    })
+      .then()
+      .catch(error=>{
+        this.$xdAlert({
+          content: error,
+        });
+      })
     // #endif
 
     //设置
@@ -346,39 +357,24 @@ export default {
       this.$xdShowLoading({});
       try {
         //#ifdef H5
-        jfbRootExec("getH5WxAuthorize", {
-          vm: this,
-          data: {site_id: "wx_pub" },
-        })
-          .then((res) => {
-            this.$xdHideLoading();
-            if (this.jwxSDK !== null) {
-              setTimeout(() => {
-                this.jwxSDK.scanQRCode({
-                  needResult: 1,
-                  scanType: ["qrCode"],
-                  success: (res) => {
-                    this.$xdUniHelper.navigateTo({
-                      url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
-                        res.resultStr
-                      )}`,
-                    });
-                  },
-                  fail:(error)=>{
-                    if(typeof error === 'string') error = {error: error}
-                    if(window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
-                    this.$xdLog.setARMSError(error)
-                  }
-                });
-              }, 100);
+        if (this.jwxSDK !== null) {
+          this.jwxSDK.scanQRCode({
+            needResult: 1,
+            scanType: ["qrCode"],
+            success: (res) => {
+              this.$xdUniHelper.navigateTo({
+                url: `${this.confirmUrl}?qrcode=${encodeURIComponent(
+                  res.resultStr
+                )}`,
+              });
+            },
+            fail: (error) => {
+              if (typeof error === 'string') error = {error: error}
+              if (window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
+              this.$xdLog.setARMSError(error)
             }
-          })
-          .catch((err) => {
-            this.$xdHideLoading();
-            this.$xdAlert({
-              content: err,
-            });
           });
+        }
         //#endif
         //#ifdef MP-WEIXIN
         uni.scanCode({