jufubao-base 1.0.331-beta3 → 1.0.332-beta1

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -790,6 +790,7 @@ export default {
 
 
     handleClick(entry, item){
+      //如果是小程序，则跳到兑换码开通plus会员页
       if(entry.redirect_type === "WMP"){
         let redirectData = entry.redirect_data;
         let site_path = redirectData.site_path;
@@ -805,7 +806,8 @@ export default {
             let code_content = this.getParams(res.card_qrcode, "code_content")
             let sitePath = site_path.replace("${qrcode}", Base64.encodeURI(code_content));
             // this.handleH5ToMP(app_id, sitePath, '');
-            let query = encodeURIComponent(`path=${sitePath}`);
+            //is_return_is_used=Y 表示兑换码页面会用到is_return_is_used参数来判断兑换码已使用跳首页的逻辑。
+            let query = encodeURIComponent(`path=${sitePath}&is_return_is_used=Y`);
             let wxLink = `weixin://dl/business/?appid=${app_id}&path=pages/loading/loading&query=${query}&env_version=release`;
             console.log(wxLink)
             window.location.href = wxLink;

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -92,6 +92,7 @@
         description: "",
         vipSuccessPath: "",
         payPath: "",
+        is_return_is_used: "",
       }
     },
     computed: {
@@ -123,6 +124,7 @@
       onJfbLoad(options) {
         if(options['ecode']) {
           this.exchange_code = options['ecode'];
+          this.is_return_is_used = options['is_return_is_used'] || "N";
           let data = {};
           if(options.code_type) data['code_type'] = options['code_type']
           this.searchCode(data);
@@ -159,7 +161,7 @@
             data: {
               exchange_code: exchange_code,
               version: '1.5.1',
-              is_return_is_used: "Y",
+              is_return_is_used: this.is_return_is_used,
               ...otherData
             }
           }).then(res => {

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -294,22 +294,16 @@
             data: {
               exchange_code: exchange_code,
               version: '1.5.1',
-              is_return_is_used: "Y",
               ...otherData
             }
           }).then(res => {
             this.$xdHideLoading();
-            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}`
-              })
-            }
+            // 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}`
+            })
             resolve(res);
           }).catch(e=>{
             this.$xdHideLoading();