jufubao-base 1.0.155 → 1.0.157-beta1

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -434,6 +434,17 @@ export default {
           }
         },
       },
+      {
+        label: "是否展示绑定卡区域",
+        ele: "xd-radio",
+        valueKey: "bindCard",
+        groupKey:'content',
+        value: data.bindCard || "1",
+        list: [
+          {label: "是", value: "1"},
+          {label: "否", value: "2"},
+        ]
+      },
     ].filter(i => i)
   },
 };

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -16,8 +16,8 @@
       <view class="jfb-base-card__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card__body">
-      <view class="jfb-base-card__body-cut">
+    <view :style="{paddingTop: bindCard!=='1'?'35rpx':'55rpx'}" class="jfb-base-card__body">
+      <view v-if="bindCard==='1'" class="jfb-base-card__body-cut">
         <template v-if="isQrCode">
           <view
             class="jfb-base-card__body-cut-item"
@@ -69,7 +69,7 @@
       </view>
       <!--notice-->
       <view class="jfb-base-card__body-line" v-if="!notice"></view>
-      <view class="jfb-base-card__body-notice" v-if="notice">
+      <view :style="{marginTop: bindCard!=='1'?'0rpx':'30rpx'}" class="jfb-base-card__body-notice" v-if="notice">
         <view
           class="jfb-base-card__body-notice-in"
           :style="{ background: noticeBackgroundColor }"
@@ -321,6 +321,7 @@ export default {
       allEntryPath: "", //综合福利入口页
       disabledUrl: "",
       cardLayout: "1",  //票券布局
+      bindCard: '1',
 
       //样式
       login_text_size: "",
@@ -367,6 +368,7 @@ export default {
     init(container){
       //设置
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
+      this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
       this.changeUrl = getContainerPropsValue(container,"content.change_url",{value: ""}).value;
       this.disabledUrl = getContainerPropsValue(container,"content.disabled_url",{value: ""}).value;
       this.bindUrl = getContainerPropsValue(container,"content.bind_url",{value: ""}).value;

package/src/components/JfbBaseCardEntry/Attr.js

@@ -241,6 +241,17 @@ export default {
         {label: "否", value: "N"},
       ]
     },
+    {
+      label: "是否展示绑定卡区域",
+      ele: "xd-radio",
+      valueKey: "bindCard",
+      groupKey:'content',
+      value: "1",
+      list: [
+        {label: "是", value: "1"},
+        {label: "否", value: "2"},
+      ]
+    },
     {
       label: '失效卡列表地址:',
       ele: 'xd-select-pages-path',

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -16,8 +16,8 @@
       <view class="jfb-base-card-entry__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-entry__body">
-      <view class="jfb-base-card-entry__body-cut">
+    <view :style="{paddingTop: bindCard!=='1'?'35rpx':'55rpx'}" class="jfb-base-card-entry__body">
+      <view v-if="bindCard==='1'" class="jfb-base-card-entry__body-cut">
         <template v-if="isQrCode">
           <view
             class="jfb-base-card-entry__body-cut-item"
@@ -70,7 +70,7 @@
         </template>
       </view>
       <view class="jfb-base-card-entry__body-line" v-if="!notice"></view>
-      <view class="jfb-base-card-entry__body-notice" v-if="notice">
+      <view :style="{marginTop: bindCard!=='1'?'0rpx':'30rpx'}" class="jfb-base-card-entry__body-notice" v-if="notice">
         <view
           class="jfb-base-card-entry__body-notice-in"
           :style="{ background: noticeBackgroundColor }"
@@ -439,6 +439,7 @@ export default {
       isBack: null, //是否使用返回键
       inCallback: null, //内部跳转地址
       isShowCode: 'Y',
+      bindCard: '1',
 
 
       //页面跳转地址
@@ -494,6 +495,7 @@ export default {
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       this.isShowCode = getContainerPropsValue(container, "content.isShowCode", "Y");
+      this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
     },
 
     handleToLink(path) {

package/src/components/JfbBaseEntry/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryType',
+        value: data['entryType'],
+        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-radio',

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -49,7 +49,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
-  import {base64} from 'js-base64';
+  import {mapState} from "vuex";
   export default {
     name: "JfbBaseEntry",
     components: {
@@ -66,9 +66,11 @@
         paddingInput: 20,
         loadingList: true,
         margin: {},
+        entryType: '',
       }
     },
     computed: {
+      ...mapState(['brandInfo']),
       bodyStyle(){
         return {
           backgroundColor: this.bgcolor,
@@ -111,17 +113,67 @@
         this.rowNum = getContainerPropsValue(container, 'content.rowNum', 1);
         this.paddingInput = getContainerPropsValue(container, 'content.paddingInput', 20);
         this.margin = getContainerPropsValue(container, 'content.margin', {});
+        this.entryType = getContainerPropsValue(container, 'content.entryType', 'default');
+      },
+
+      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',
+          };
+        }
+        else return null;
+        //#endif
       },
       getEntrySetting(){
         this.$xdShowLoading({});
         jfbRootExec("getEntrySetting", {
           vm: this,
-          data: {}
+          data: {
+            group_id:this.entryType || 'default'
+          }
         }).then(res => {
           this.loadingList = false;
           this.$xdHideLoading();
-          this.entryList = res.list.map(item => {
-            const {dir, path, host} = item['redirect_data'];
+          let isH5FilterEntryList = [];
+          let isMpFilterEntryList = [];
+          this.entryList = res.list.filter(item=>{
+            //#ifdef H5
+            //在H5平台应用中不可跳转到微信小程序应用
+            if(item.redirect_data.appType === 'wxmp'){
+              isH5FilterEntryList.push(item)
+            }
+            return item.redirect_data.appType !== 'wxmp';
+            //#endif
+
+            //#ifdef MP-WEIXIN
+            const dir = item['redirect_data'].dir;
+            const actDir = this.projectAttr['deploy_dir'];
+            if(item.redirect_data.appType === 'wxmp') {
+              if(dir !== actDir) isMpFilterEntryList.push(item)
+              return dir === actDir;
+            }
+            return true
+            //#endif
+          }).map(item => {
+            const {dir, path, host,appType} = item['redirect_data'];
+            if(appType === undefined) item.redirect_data.appType = 'h5';
             item['image_url'] = getServiceUrl(item.image_url);
             item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
             item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
@@ -139,24 +191,36 @@
             let jumpUrl = path;
 
             //域名相同并且应用路径不相同时候处理
-            if(host === this.projectAttr.host
-              && this.projectAttr['deploy_dir'] !== dir
-            ){
+            if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
               jumpUrl = `//${host}/${dir}${path}`;
               //#ifdef MP-WEIXIN
               jumpUrl = `https:${jumpUrl}`;
               //#endif
             }
 
-            if(item['redirect_data']['fixed_business_code'] === '') {
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-            }
-            else{
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+            //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+            let cardPathStr = '';
+            //#ifdef MP-WEIXIN
+            if(item.redirect_data.appType === 'h5') {
+              const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['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
+            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
             return item;
           });
-          console.log( this.entryList)
+          //#ifdef MP-WEIXIN
+          console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+          //#endif
+          //#ifdef H5
+          console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+          //#endif
+          console.warn(`福利入口链接列表:${JSON.stringify(this.entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
           if(res.list.length === 1) this.toLink(this.entryList[0]);
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})

package/src/components/JfbBaseNotice/Attr.js

@@ -261,8 +261,6 @@ export default {
           {"label": "滚动显示", "value": '2'},
           {"label": "弹窗显示", "value": '3'},
         ],
-        inline:false,
-        notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
       },
       {
         label: '是否隐藏弹框(仅预览模式生效):',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -235,7 +235,13 @@
           this.speedKey = Date.now()
         }, 400)
 
-      }
+      },
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
     },
     computed:{
       marginUi() {
@@ -281,13 +287,6 @@
         return this.num > 1
       },
 
-      is_hide_dailog(value){
-        if(value === 'N') {
-          storage.remove(this.containerId);
-          this.onJfbLoad();
-        }
-      },
-
     },
     created() {
       this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -147,6 +147,50 @@
       handleAnimationfinish(e) {
         this.current = e.detail.current;
       },
+
+      /**
+       * @description 过滤不可以用
+       * 当前项目未H5时,过滤所有小程序应用
+       * 当前项目未小程序时,过滤所有非当前小程序应用
+       * 站外地址直接返回
+       * 站内地址未选值直接返回
+       * 预览模式全过
+       */
+      filterItem(){
+        let content = this.content.filter(item=>{
+          //预览模式
+          if( this.$configProject.isPreview) return true;
+
+          //非内部应用
+          if(item.redirect_type !== 'INN') {
+            return true
+          }
+
+          //内部应用
+          else {
+            let redirect_data;
+            try {
+              redirect_data = JSON.parse(item.redirect_data);
+              if(!redirect_data.appType) redirect_data.appType = 'h5'
+              //#ifdef H5
+              return redirect_data.appType !== 'wxmp';
+              //#endif
+
+              //#ifdef MP-WEIXIN
+              console.log(redirect_data,item,this.$parent.projectAttr)
+              debugger
+              //#endif
+            } catch (e) {
+              console.error(e)
+              return true
+            }
+          }
+        });
+        console.log(content)
+        return content;
+
+      },
+
       init() {
         if (this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
@@ -154,19 +198,22 @@
           this.height = this.config.height;
           this.padding = 0;
 
+          //过滤不可以用
+          const content = this.filterItem();
+
           //静态图显示
           if(this.config.isCarousel === false) {
-            this.list = this.content.filter((item,index)=>{
+            this.list = content.filter((item,index)=>{
               return index < (this.config.cells * this.config.jdRows);
 						})
 					}
           //轮播图显示
           else {
             let num = this.config.cells * this.config.jdRows;
-            let maxPage = Math.ceil(this.content.length / num);
+            let maxPage = Math.ceil(content.length / num);
             let arr = [];
             for(let i =1 ; i <= maxPage; i++) {
-              arr.push(this.$xdUniHelper.getLocalPaginationData(this.content, i, num))
+              arr.push(this.$xdUniHelper.getLocalPaginationData(content, i, num))
 						}
             this.list = arr;
 					}
@@ -175,7 +222,6 @@
         }, 100)
       },
       handleClick(item) {
-        debugger
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
           try {

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -131,41 +131,6 @@
       handleAnimationfinish(e) {
         this.current = e.detail.current;
       },
-      handleClick(item, index){
-        this.current = index;
-        const handle = (data) => {
-          try {
-            return JSON.parse(data);
-          } catch (e) {
-            return {}
-          }
-        };
-        if(this.$configProject.isPreview) {
-          console.log(item)
-				}
-        else {
-          if (item['redirect_type'] === 'EMP') return;
-          let url = '';
-
-          if (item['redirect_type'] === 'URL') {
-            url = handle(item['redirect_data']).url || ''
-          }
-
-          if (item['redirect_type'] === 'INN') {
-            url = handle(item['redirect_data']).page || ''
-          }
-          if (item['redirect_type'] === 'APP') {
-            return;
-          }
-          if (url === '') {
-            return;
-          }
-
-          if(url.indexOf('?') === -1) url = `${url}?vs=${new Date().getTime()}`;
-          else url = `${url}&vs=${new Date().getTime()}`;
-          this.$xdUniHelper.navigateTo({url})
-				}
-			},
       handleImage(list){
       	return list.map(item => {
           return {

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -32,7 +32,6 @@
           :key="videoKey"
           :poster="videoSetting"
           :video="video"
-          :pack-this="$vm"
         ></xd-video>
         <view class="not-video" v-if="video === ''">
           <image :src="getVideoSrc"></image>
@@ -73,7 +72,6 @@
         width:750,
         bgColor:'',
         radius:0,
-        $vm: {},
         videoKey : Date.now()
       }
     },
@@ -126,7 +124,6 @@
       }
     },
     created() {
-      this.$vm = this;
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
     },

package/src/components/JfbBaseVideo/XdVideo.vue

@@ -50,10 +50,6 @@
         type: String|Number,
         default: 0
       },
-      packThis:{
-        type:Object,
-        required: true
-      },
       video:{
         type:Object,
         required: true