jufubao-base 1.0.159-beta1 → 1.0.159-beta3

package/package.json

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

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -193,8 +193,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     showAddress(val) {
       if (val === false) this.defaultValue = null;

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue

@@ -178,8 +178,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -162,8 +162,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {

package/src/components/JfbBaseBack/JfbBaseBack.vue

@@ -55,8 +55,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseBackground/JfbBaseBackground.vue

@@ -41,8 +41,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   destroyed() {

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -43,8 +43,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -255,7 +255,7 @@ export default {
       if(this.login_text_color) style['color'] = this.login_text_color;
       if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
       if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
-      return style;
+      return  this.styleObjectToString(style);
     },
     lookStyle(){
       let style = { backgroundColor: this.cardLayout === '2'? '' : this.mainColor};
@@ -263,7 +263,7 @@ export default {
       if(this.look_text_color) style['color'] = this.look_text_color;
       if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
       if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx';
-      return style;
+      return this.styleObjectToString(style);
     }
   },
   watch: {
@@ -282,9 +282,10 @@ export default {
       })
 
     },
-    container(value) {
-      this.init(value)
-    }
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
+    },
   },
   data() {
     return {

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -103,8 +103,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -302,7 +302,6 @@ export default {
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             this.timeStr = ""

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -4,6 +4,28 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: '选择综合入口类型:',
+      ele: 'xd-site-select-list',
+      valueKey: 'entryGroupId',
+      value: 'default',
+      placeholder: '请选择综合入口类型',
+      multiple: false,
+      groupKey:'content',
+      className: 'input50',
+      rules: [
+        {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+      ],
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
     {
       label: '票券解绑成功回跳地址:',
       ele: 'xd-select-pages-path',

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -74,7 +74,7 @@
         <view v-if="info.is_exchange==='Y'">
           <xd-button
             width="100%"
-            @click="handleToShift"
+            @click="handleToShift()"
             size="small"
             type="primary"
           >券转换</xd-button>
@@ -82,7 +82,7 @@
         <view v-if="isShowUnbind">
           <xd-button
             width="100%"
-            @click="handleUnBindCard"
+            @click="handleUnBindCard()"
             size="small"
             type="primary">解除绑定</xd-button>
         </view>
@@ -106,6 +106,7 @@ import XdPwPay from "./XdPwPay";
 import XdEditPwd from "./XdEditPwd";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from '@/components/XdButton/XdButton'
+import {parsePath} from "@/utils/linkUrl";
 export default {
   name: "JfbBaseCardDetailEntry",
   components: {
@@ -121,6 +122,7 @@ export default {
   data() {
     return {
       userInfo: null, //用户信息（暂时不可用）
+      entryGroupId: '',//加载入口数据组别
 
       info: null,
       timeStr: "",
@@ -202,6 +204,8 @@ export default {
     init(container) {
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
+      //'wechat_mini_program|default'
+      this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
     /**
      * @description 获取卡详情
@@ -212,6 +216,7 @@ export default {
         data: {
           card_number: this.card_number,
           is_show_entry_settings: "Y",
+          group_id: this.entryGroupId
         },
       })
         .then((res) => {
@@ -227,6 +232,9 @@ export default {
               100
             );
           }
+
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
             res.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
@@ -314,59 +322,70 @@ export default {
           //#ifdef MP-WEIXIN
           if (this.jfbAuthorize !== null) {
             this.jfbAuthorize.setCardToken(res);
-            this.handleToApp(entry);
+            this.handleClick(entry);
+            return
           }
           //#endif
+
           if (this.$configProject.isPreview) {
             console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
           }
-
           else {
-            this.handleToApp(entry);
+            this.handleClick(entry);
           }
         })
         .catch((res) => {
           this.$xdHideLoading();
         });
     },
-    toApp(url){
-      this.$xdUniHelper.redirectTo({
-        url
-      })
-    },
-    handleToApp(entry){
-      let item, redirectUrl;
-      try{
-        item = JSON.parse(entry['redirect_data']);
-      }catch (e) {
-        return;
-      }
-      const {dir, path, host} = item;
+
+
+    handleClick(entry){
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(appType === undefined) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
-      if (entry.redirect_type === 'URL') {
-        if (item['path'].indexOf('?') === -1) {
-          redirectUrl = `${item['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
-        } else redirectUrl = `${item['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-        this.toApp(redirectUrl);
-        return;
+      if(entry.redirect_type === 'URL') {
+        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          this.$xdUniHelper.redirectTo({
+            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+          }, false)
+        }
+        else {
+          console.error(`配置错误：${entry.redirect_data['path']}`);
+          throw new Error(`配置错误：${entry.redirect_data['path']}`)
+        }
+        return
       }
 
-      //站内转换
-      let jumpUrl = item.path;
-      //#ifdef H5
-      jumpUrl = `//${host}/${dir}${path}`;
-      //#endif
+      //站内应用处理
+      let jumpUrl = '';
+      let jumpUrlObj = parsePath(path);
+      let cardPathStr = '';
+      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
+      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
 
-      if (item['fixed_business_code'] === '') {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      else {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+      //#ifdef MP-WEIXIN
+      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      if(entry.redirect_data.appType === 'h5') {
+        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+        const cardPathObject = this.getCardPath(custom_redirect_data);
+        if(cardPathObject !== null) {
+          const {cardPath, cardSelf} =cardPathObject
+          if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+        }
       }
-      this.toApp(redirectUrl);
+      //#endif
+
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
+
     handleOnClose() {
       this.editShow = false;
     },
@@ -391,7 +410,6 @@ export default {
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             this.timeStr = ""

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -115,8 +115,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -166,7 +167,6 @@ export default {
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             jfbRootExec("disabledCardUnbind", {

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -182,8 +182,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -231,7 +232,6 @@ export default {
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             let cardIds = this.cardOrgList.map(item=>{
@@ -264,7 +264,6 @@ export default {
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             jfbRootExec("disabledCardUnbindEntry", {

package/src/components/JfbBaseCardEntry/Attr.js

@@ -4,6 +4,28 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: '选择综合入口类型:',
+      ele: 'xd-site-select-list',
+      valueKey: 'entryGroupId',
+      value: 'default',
+      placeholder: '请选择综合入口类型',
+      multiple: false,
+      groupKey:'content',
+      className: 'input50',
+      rules: [
+        {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+      ],
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
     {
       label: '提示内容:',
       ele: 'xd-site-news',
@@ -312,6 +334,5 @@ export default {
       },
       inline: false,
     },
-
   ],
 };

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -387,6 +387,8 @@ import { mapState, mapActions } from "vuex";
 import { getContainerPropsValue, isWechat,isQrCode } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
+import getServiceUrl from "@/common/getServiceUrl";
+import {parsePath} from "@/utils/linkUrl";
 const Color = require("color");
 
 export default {
@@ -414,8 +416,9 @@ export default {
     }
   },
   watch: {
-    container(value) {
-      this.init(value)
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     tabIndex(){
       this.clearDefault();
@@ -434,6 +437,7 @@ export default {
       isPreview: false,
       noticeStatus: false,
       loadingCardList: true,
+      entryGroupId: '',//加载入口数据组别
 
       cutIndex: 1,
       tabIndex: 1,
@@ -487,7 +491,6 @@ export default {
   methods: {
 
     init(container){
-      //设置
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
       this.changeUrl = getContainerPropsValue(container,"content.change_url",{value: ""}).value;
       this.disabledUrl = getContainerPropsValue(container,"content.disabled_url",{value: ""}).value;
@@ -497,6 +500,8 @@ export default {
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       this.isShowCode = getContainerPropsValue(container, "content.isShowCode", "Y");
       this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
+      //'wechat_mini_program|default'
+      this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
 
     handleToLink(path) {
@@ -578,6 +583,7 @@ export default {
     /**
      * @description 已绑定卡登录
      * @param item
+     * @param entry
      */
     handleBindLogin(item , entry) {
       //卡券登录
@@ -593,10 +599,12 @@ export default {
         })
           .then((res) => {
             this.$xdHideLoading();
+
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
-              this.handleToApp(entry);
+              this.handleClick(entry);
+              return
             }
             //#endif
             if (this.$configProject.isPreview) {
@@ -604,7 +612,7 @@ export default {
             }
 
             else {
-              this.handleToApp(entry);
+              this.handleClick(entry);
             }
           })
           .catch((res) => {
@@ -619,43 +627,78 @@ export default {
         }, false);
       }
     },
-    toApp(url){
-      this.$xdUniHelper.redirectTo({
-        url
-      })
-    },
-    handleToApp(entry){
-      let item, redirectUrl;
-      try{
-        item = JSON.parse(entry['redirect_data']);
-      }catch (e) {
-        return;
+
+
+    getCardPath(custom_redirect_data = {}){
+      //#ifdef H5
+      return null;
+      //#endif
+      //#ifdef MP-WEIXIN
+      const dir = custom_redirect_data.dir;
+      const actDir = this.projectAttr['deploy_dir'];
+      if(custom_redirect_data.appType === 'wxmp') {
+        if(dir === actDir) {
+          return {
+            cardPath:  custom_redirect_data.path,
+            cardSelf: 'wxmp',
+          };
+        }
+        else return null;
+      }
+      else if(custom_redirect_data.appType === 'h5'){
+        return {
+          cardPath: custom_redirect_data.site_url,
+          cardSelf: 'h5',
+        };
       }
-      const {dir, path, host} = item;
+      else return null;
+      //#endif
+    },
+
+    handleClick(entry){
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(appType === undefined) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
-      if (entry.redirect_type === 'URL') {
-        if (item['path'].indexOf('?') === -1) {
-          redirectUrl = `${item['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
-        } else redirectUrl = `${item['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-        this.toApp(redirectUrl);
-        return;
+      if(entry.redirect_type === 'URL') {
+        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          this.$xdUniHelper.redirectTo({
+            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+          }, false)
+        }
+        else {
+          console.error(`配置错误：${entry.redirect_data['path']}`);
+          throw new Error(`配置错误：${entry.redirect_data['path']}`)
+        }
+        return
       }
 
-      //站内转换
-      let jumpUrl = item.path;
-      //#ifdef H5
-      jumpUrl = `//${host}/${dir}${path}`;
+      //站内应用处理
+      let jumpUrl = '';
+      let jumpUrlObj = parsePath(path);
+      let cardPathStr = '';
+      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
+      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
+
+      //#ifdef MP-WEIXIN
+      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      if(entry.redirect_data.appType === 'h5') {
+        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+        const cardPathObject = this.getCardPath(custom_redirect_data);
+        if(cardPathObject !== null) {
+          const {cardPath, cardSelf} =cardPathObject
+          if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+        }
+      }
       //#endif
 
-      if (item['fixed_business_code'] === '') {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      else {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      this.toApp(redirectUrl);
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
 
     toDetail(item, out=true) {
@@ -693,6 +736,7 @@ export default {
       if(options['jfb_business_code']) {
         params['card_business_code'] = options['jfb_business_code'];
       }
+      if(this.entryGroupId) params['group_id'] = this.entryGroupId;
       this.$xdShowLoading({});
       jfbRootExec("getListEntryCardBind", {
         vm: this,
@@ -714,6 +758,10 @@ export default {
               ),
             };
           });
+
+          //过滤入口配置
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           this.ajaxCardList =  res;
           this.hasChangeStatus = this.getCardGroupItem(this.ajaxCardList.list.filter((item) => {
             return item["is_exchange"] === "Y";

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -36,10 +36,20 @@
               v-model="card_password"
               :placeholder="card_pwd_placeholder"
             />
+            <!--#ifdef H5-->
             <xd-font-icon
               @click="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
+            <!--#endif-->
+            <!--#ifdef MP-WEIXIN-->
+            <xd-font-icon
+              :width="72"
+              :height="72"
+              @click="handleIcon()"
+              :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
+            ></xd-font-icon>
+            <!--#endif-->
           </view>
         </view>
         <view class="jfb-base-card-info__body-footer" :style="prod_bottom">
@@ -403,6 +413,16 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
+
+
+      }
+
+      & .mp {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 72rpx;
+        height: 72rpx
       }
 
       input {