jufubao-base 1.0.162-beta7 → 1.0.162-beta8

package/package.json

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

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -38,6 +38,16 @@
           >
         </view>
       </view>
+       <view class="jfb-base-sweep__body-other" v-if="show">
+        <view @click="scan">
+          <xd-font-icon
+            color="#ccc"
+            size="240"
+            icon="iconsaoma"
+          ></xd-font-icon>
+          <view class="jfb-base-sweep__body-other-text">点击扫码</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -66,6 +76,7 @@ export default {
       isPreview: false,
       backgroundColor: "",
       other: false,
+      show: true
     };
   },
   computed: {
@@ -90,17 +101,32 @@ export default {
     },
   },
   created() {
-    console.log(this.layoutInfo, "layoutInfo");
     this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject["isPreview"];
     this.init(this.container);
-
-    //todo
+    //#ifdef H5
+    if (!this.$configProject.isPreview) {
+      jfbRootExec("getH5WxAuthorize", {
+        vm: this,
+        data: {site_id: "wx_pub"},
+      })
+        .then(res => {
+          console.log(0)
+        })
+        .catch(error=>{
+          this.$xdAlert({
+            content: error,
+          });
+        })
+    }
+    // #endif
   },
   methods: {
     onJfbLoad(options) {
       if (!this.isPreview) {
-        this.$xdShowLoading({});
+        this.$xdShowLoading({
+          isMask: true
+        });
         //#ifdef MP-WEIXIN
         this.$xdHideLoading();
         this.scan();
@@ -171,9 +197,13 @@ export default {
               }
             }
             this.other = true;
+            this.show = false;
           },
           // 扫描失败后的回调函数
           fail: (error) => {
+            console.log(44444);
+            this.other = true;
+            this.show = false;
             // 如果error是字符串类型，则将其转换为对象类型
             if (typeof error === "string") error = { error: error };
             // 如果window["jwxJfbSDKParams"]存在，则将error对象与window["jwxJfbSDKParams"]合并
@@ -182,6 +212,11 @@ export default {
             // 调用$xdLog的setARMSError方法，记录错误信息
             this.$xdLog.setARMSError(error);
           },
+          error: ()=>{
+             console.log(44444);
+            this.other = true;
+            this.show = false;
+          }
         });
       }
     },
@@ -238,9 +273,12 @@ export default {
             }
           }
           this.other = true;
+          this.show = false;
         },
         fail: (error) => {
           // 如果扫描失败，则调用$xdLog.setARMSError方法记录错误信息
+          this.other = true;
+          this.show = false;
           this.$xdLog.setARMSError(error);
         },
       });