jufubao-base 1.0.209-beta3 → 1.0.209-beta5

package/package.json

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

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -17,12 +17,6 @@
       :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
       class="jfb-base-sweep__body"
     >
-      <view
-        :style="{ background: backgroundColor, color: warningColor }"
-        class="jfb-base-sweep__body-pop"
-        v-if="isPreview"
-        >设置背景模式方便编辑(占位)，在线上此模块不显</view
-      >
       <view class="jfb-base-sweep__body-other" v-if="other">
         <view>
           <xd-font-icon
@@ -33,19 +27,15 @@
           <view class="jfb-base-sweep__body-other-text">无法识别该界面</view>
         </view>
         <view class="jfb-base-sweep__body-footer" :style="prod_bottom">
-          <XdButton @click="scan" type="primary" radius="50rpx" width="50%"
-            >重试</XdButton
-          >
+          <xd-button @click="scan" type="primary" radius="50rpx" width="50%">重试</xd-button>
         </view>
       </view>
-       <view class="jfb-base-sweep__body-other" v-if="show">
+      <view class="jfb-base-sweep__body-other" v-if="show || isPreview">
         <view>
           <image style="width: 500rpx;height:500rpx" src="https://img0.jufubao.cn/common/qrcode-dome.png?ver=1"></image>
         </view>
         <view class="jfb-base-sweep__body-footer" :style="prod_bottom">
-          <XdButton @click="scan" type="primary" radius="50rpx" width="50%"
-            >扫一扫</XdButton
-          >
+          <xd-button @click="scan" type="primary" radius="50rpx" width="50%">扫一扫</xd-button>
         </view>
       </view>
     </view>
@@ -77,7 +67,8 @@ export default {
       backgroundColor: "",
       other: false,
       show: false,
-      flag: true
+      flag: true,
+      isBack: false, //是否启动返回逻辑
     };
   },
   computed: {
@@ -118,6 +109,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.isBack = options.isBack?options.isBack:false;
       if (!this.isPreview) {
         this.$xdShowLoading({
           isMask: true
@@ -133,6 +125,7 @@ export default {
       const matches = hostname.match(/[^.]+\.[^.]+$/);
       return matches ? matches[0] : hostname;
     },
+    //#ifdef H5
     handleH5() {
       // 判断jwxSDK是否为空
       if (this.jwxSDK !== null) {
@@ -200,7 +193,7 @@ export default {
           },
           // 扫描失败后的回调函数
           fail: (error) => {
-            console.log(44444,'fail');
+            console.log(44444,'fail',error);
             this.other = false;
             this.show = true;
             // 如果error是字符串类型，则将其转换为对象类型
@@ -211,14 +204,22 @@ export default {
             // 调用$xdLog的setARMSError方法，记录错误信息
             this.$xdLog.setARMSError(error);
           },
-          cancel: ()=>{
-            console.log(44444,'fail');
+          cancel: (e)=>{
+            console.log(44444,'fail',e.errMsg);
             this.other = false;
             this.show = true;
+
+            //取消扫描并且需要返回页面时候调用
+            if(this.isBack && e.errMsg.indexOf(':cancel') !== -1) {
+              this.onJfbBack();
+            }
+
           }
         });
       }
     },
+    //#endif
+    //#ifdef MP-WEIXIN
     handleMP() {
       // 调用uni.scanCode方法，扫描二维码
       uni.scanCode({
@@ -244,6 +245,7 @@ export default {
             });
             return;
           }
+          //带pa参数出来
           if (queryobjArr["pa"]) {
             // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
             let qrcode = encodeURIComponent(res.result)
@@ -277,14 +279,24 @@ export default {
           this.flag = false;
         },
         fail: (error) => {
-          // 如果扫描失败，则调用$xdLog.setARMSError方法记录错误信息
-          this.other = false;
-          this.show = true;
-          this.$xdLog.setARMSError(error);
+          //取消扫描并且需要返回页面时候调用
+          if(error.errMsg === 'scanCode:fail cancel') {
+            if(this.isBack) {
+              this.onJfbBack();
+            }
+          }
+          else {
+            this.$xdLog.setARMSError(error);
+            this.other = false;
+            this.show = true;
+          }
+
         }
       });
     },
+    //#endif
     scan() {
+      if(this.$configProject.isPreview) return;
       try {
         //#ifdef H5
         this.handleH5();
@@ -317,6 +329,10 @@ export default {
       }
       console.log("event.onJfbShow", options);
     },
+    onJfbBack(){
+      if(this.$configProject["isPreview"]) return;
+      this.$xdUniHelper.navigateBack();
+    }
   },
 };
 </script>