jufubao-base 1.0.157-beta1 → 1.0.157-beta3

package/package.json

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

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -53,7 +53,7 @@
         <view>
           <view
             class="jfb-base-card-info__body-info"
-            v-for="(item, index) in valueKey"
+            v-for="(item, index) in showValueKey"
             :key="index"
           >
             <view class="jfb-base-card-info__body-info-label">{{item.label}}</view>
@@ -175,6 +175,12 @@ export default {
         return this.is_show_balance === "Y";
       }
       return true;
+    },
+    showValueKey(){
+      if(this.info.is_expired === "Y"){
+        return this.valueKey.filter(item => item.key !== "end_time");
+      }
+      return this.valueKey;
     }
   },
   created() {},

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -20,7 +20,7 @@
         <view>
           <view
             class="jfb-base-card-sweep-info__body-info"
-            v-for="(item, index) in valueKey"
+            v-for="(item, index) in showValueKey"
             :key="index"
           >
             <view class="jfb-base-card-sweep-info__body-info-label">{{item.label}}</view>
@@ -129,6 +129,12 @@ export default {
         return this.is_show_balance === "Y";
       }
       return true;
+    },
+    showValueKey(){
+      if(this.info.is_expired === "Y"){
+        return this.valueKey.filter(item => item.key !== "end_time");
+      }
+      return this.valueKey;
     }
   },
   created() {

package/src/components/JfbBaseEntry/Attr.js

@@ -7,28 +7,6 @@ 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 {mapState} from "vuex";
+  import {base64} from 'js-base64';
   export default {
     name: "JfbBaseEntry",
     components: {
@@ -66,11 +66,9 @@
         paddingInput: 20,
         loadingList: true,
         margin: {},
-        entryType: '',
       }
     },
     computed: {
-      ...mapState(['brandInfo']),
       bodyStyle(){
         return {
           backgroundColor: this.bgcolor,
@@ -113,67 +111,17 @@
         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: {
-            group_id:this.entryType || 'default'
-          }
+          data: {}
         }).then(res => {
           this.loadingList = false;
           this.$xdHideLoading();
-          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';
+          this.entryList = res.list.map(item => {
+            const {dir, path, host} = item['redirect_data'];
             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) : "";
@@ -191,36 +139,24 @@
             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
             }
 
-            //获取自定义卡券登录地址(微信小程序跳转到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}`
-              }
-
+            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()}`
             }
-            //#endif
-            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
             return item;
           });
-          //#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)}`);
+          console.log( this.entryList)
           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,6 +261,8 @@ export default {
           {"label": "滚动显示", "value": '2'},
           {"label": "弹窗显示", "value": '3'},
         ],
+        inline:false,
+        notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
       },
       {
         label: '是否隐藏弹框(仅预览模式生效):',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -235,13 +235,7 @@
           this.speedKey = Date.now()
         }, 400)
 
-      },
-      is_hide_dailog(value){
-        if(value === 'N') {
-          storage.remove(this.containerId);
-          this.onJfbLoad();
-        }
-      },
+      }
     },
     computed:{
       marginUi() {
@@ -287,6 +281,13 @@
         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,50 +147,6 @@
       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(() => {
@@ -198,22 +154,19 @@
           this.height = this.config.height;
           this.padding = 0;
 
-          //过滤不可以用
-          const content = this.filterItem();
-
           //静态图显示
           if(this.config.isCarousel === false) {
-            this.list = content.filter((item,index)=>{
+            this.list = this.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(content.length / num);
+            let maxPage = Math.ceil(this.content.length / num);
             let arr = [];
             for(let i =1 ; i <= maxPage; i++) {
-              arr.push(this.$xdUniHelper.getLocalPaginationData(content, i, num))
+              arr.push(this.$xdUniHelper.getLocalPaginationData(this.content, i, num))
 						}
             this.list = arr;
 					}
@@ -222,6 +175,7 @@
         }, 100)
       },
       handleClick(item) {
+        debugger
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
           try {

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

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

package/src/components/JfbBaseVideo/XdVideo.vue

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