jufubao-base 1.0.162-beta7 → 1.0.162-beta9

package/package.json

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

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -40,11 +40,11 @@
       </view>
       <view :style="{height:bottomHeight+100+'rpx'}"></view>
       <view class="jfb-base-card-shift__body-footer" :style="prod_bottom">
+        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
         <view class="jfb-base-card-shift__body-agree">
           <xd-radio size="small" v-model="isCheck"></xd-radio>
           <view>我已经阅读和同意积分转换规则</view>
         </view>
-        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -55,14 +55,22 @@
         :cancel="false"
       >
         <view class="jfb-base-card-shift__body-success">
-          <xd-font-icon
-            size="100"
-            color="#52C41A"
-            icon="icondui-01"
-          ></xd-font-icon>
-          <view class="jfb-base-card-shift__body-success-title">转换成功</view>
-          <view class="jfb-base-card-shift__body-success-content">您已成功将{{ card_number }} 转换为{{ changeNumber }}已自动帮您绑定成功，可在卡列表查询</view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
+          <view class="jfb-base-card-shift__body-success-head">
+            <xd-font-icon
+              size="42"
+              :color="mainColor"
+              icon="icondui-01"
+            ></xd-font-icon>
+            <view class="jfb-base-card-shift__body-success-title" :style="{
+              color: mainColor
+            }">票券转换成功</view>
+          </view>
+          
+          <view class="jfb-base-card-shift__body-success-content">
+            已成功将 <text class="b">{{ card_number }}</text><br/> 转换成为 <text class="b">{{ changeNumber }}</text><br/>
+            <text @click="handleToLink">可在券包中查看</text>
+          </view>
+          <!-- <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button> -->
         </view>
       </xd-dailog>
     </view>
@@ -270,8 +278,7 @@ export default {
       justify-content: center;
       font-size: unit(24, rpx);
       color: #bbb;
-      padding: unit(20, rpx) 0;
-      margin-bottom: unit(40,rpx);
+      margin: unit(40,rpx) 0;
 
       & > view {
         margin-left: unit(25, rpx);
@@ -284,13 +291,21 @@ export default {
       right: 0;
       // bottom: unit(120,rpx) !important;
       height: unit(100, rpx);
+      background: #FFFFFF;
+      padding-top: unit(20, rpx);
     }
 
     &-success {
       padding: unit(70, rpx);
       &-title {
-        font-size: unit(42, rpx);
+        font-size: unit(36, rpx);
         color: #242424;
+        margin-left: 8px;
+      }
+      &-head{
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
       &-content {
@@ -298,7 +313,11 @@ export default {
         color: #5a5a5a;
         text-align: center;
         line-height: unit(42, rpx);
-        margin: unit(50, rpx) 0;
+        margin: unit(40, rpx) 0 0;
+        .b{
+          font-weight: bold;
+          margin-left: 8rpx;
+        }
       }
     }
 

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -33,11 +33,22 @@
           <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="20" width="40%"
+          <XdButton @click="scan" type="primary" radius="50rpx" width="50%"
             >重试</XdButton
           >
         </view>
       </view>
+       <view class="jfb-base-sweep__body-other" v-if="show">
+        <view>
+          <image style="width: 500rpx;height:500rpx" src="https://img0.jufubao.cn/common/qrcode-dome.png?ver=1"></image>
+          <view style="color:#000000;font-size:48rpx" 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
+          >
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -66,6 +77,7 @@ export default {
       isPreview: false,
       backgroundColor: "",
       other: false,
+      show: true
     };
   },
   computed: {
@@ -80,27 +92,36 @@ export default {
     container(value) {
       this.init(value);
     },
-    jwxSDK(value) {
-      //#ifdef H5
-      if (value) {
-        this.$xdHideLoading();
-        this.scan();
-      }
-      //#endif
-    },
   },
   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)
+          this.$xdHideLoading();
+          this.scan();
+        })
+        .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();
@@ -147,7 +168,8 @@ export default {
             }
             if (queryobjArr["pa"]) {
               // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
-              let path = `${this.bind_url}?pa=${queryobjArr["pa"]}`;
+              console.log(this.bind_url,'pathpath');
+              let path = `${this.bind_url}?pa=${res.resultStr}`;
               this.$xdUniHelper.navigateTo({
                 url: path,
               });
@@ -171,9 +193,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 +208,11 @@ export default {
             // 调用$xdLog的setARMSError方法，记录错误信息
             this.$xdLog.setARMSError(error);
           },
+          error: ()=>{
+             console.log(44444);
+            this.other = true;
+            this.show = false;
+          }
         });
       }
     },
@@ -212,7 +243,7 @@ export default {
           }
           if (queryobjArr["pa"]) {
             // 如果queryobjArr中有pa属性，则获取pa属性的值，并将其拼接到bind_url后面，然后使用navigateTo方法跳转到该路径
-            let path = `${this.bind_url}?pa=${queryobjArr["pa"]}`;
+            let path = `${this.bind_url}?pa=${res.result}`;
             this.$xdUniHelper.navigateTo({
               url: path,
             });
@@ -238,9 +269,12 @@ export default {
             }
           }
           this.other = true;
+          this.show = false;
         },
         fail: (error) => {
           // 如果扫描失败，则调用$xdLog.setARMSError方法记录错误信息
+          this.other = true;
+          this.show = false;
           this.$xdLog.setARMSError(error);
         },
       });
@@ -310,7 +344,7 @@ export default {
       position: fixed;
       left: 0;
       right: 0;
-      height: unit(110, rpx);
+      height: unit(200, rpx);
     }
   }
 }