jufubao-base 1.0.329 → 1.0.331-beta3

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -803,8 +803,12 @@ export default {
           }).then(res => {
             //从res.card_qrcode中提取参数code_content
             let code_content = this.getParams(res.card_qrcode, "code_content")
-            let sitePath = site_path.replace("${qrcode}", code_content);
-            this.handleH5ToMP(app_id, sitePath, '');
+            let sitePath = site_path.replace("${qrcode}", Base64.encodeURI(code_content));
+            // this.handleH5ToMP(app_id, sitePath, '');
+            let query = encodeURIComponent(`path=${sitePath}`);
+            let wxLink = `weixin://dl/business/?appid=${app_id}&path=pages/loading/loading&query=${query}&env_version=release`;
+            console.log(wxLink)
+            window.location.href = wxLink;
           })
         }
         return;

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -159,12 +159,19 @@
             data: {
               exchange_code: exchange_code,
               version: '1.5.1',
+              is_return_is_used: "Y",
               ...otherData
             }
           }).then(res => {
             this.$xdHideLoading();
-            this.step = 2;
-            this.vipInfo = res;
+            if(res.is_used === 'Y'){
+              this.$xdUniHelper.navigateTo({
+                url: "/main/zhrk/zhrk"
+              })
+            }else{
+              this.step = 2;
+              this.vipInfo = res;
+            }
             resolve(res);
           }).catch(e=>{
             this.$xdHideLoading();

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -294,16 +294,22 @@
             data: {
               exchange_code: exchange_code,
               version: '1.5.1',
+              is_return_is_used: "Y",
               ...otherData
             }
           }).then(res => {
             this.$xdHideLoading();
-            // this.step = 2;
-            this.vipInfo = res;
-            let codeType = otherData.code_type ? `&code_type=${otherData.code_type}` : '';
-            this.$xdUniHelper.navigateTo({
-              url: this.exchangeCodePath + `?ecode=${exchange_code}${codeType}`
-            })
+            if(res.is_used === 'Y'){
+              this.$xdUniHelper.navigateTo({
+                url: "/main/zhrk/zhrk"
+              })
+            }else{
+              this.vipInfo = res;
+              let codeType = otherData.code_type ? `&code_type=${otherData.code_type}` : '';
+              this.$xdUniHelper.navigateTo({
+                url: this.exchangeCodePath + `?ecode=${exchange_code}${codeType}`
+              })
+            }
             resolve(res);
           }).catch(e=>{
             this.$xdHideLoading();