jufubao-base 1.0.157-beta3 → 1.0.157-beta4

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -37,8 +37,54 @@
 				field="content_name"
 				:mode="config.mode"
 				:dots-styles="config.dotStyleData"
-				:style="{height: (getHeight) + 'px'}"
+				:style="{height: (getHeight) + 'px', width:'100%'}"
 			>
+        <!--#ifdef MP-WEIXIN-->
+        <swiper
+          class="swiper xd-swiper-content"
+          :style="{width: '100%', height: getHeight + 'px'}"
+          :indicator-dots="false"
+          :autoplay="config.carouselTime > 0"
+          :interval="config.carouselTime"
+          :duration="500"
+          :current="current"
+          circular
+          @animationfinish="handleAnimationfinish"
+        >
+          <swiper-item
+            v-for="(item,index) in list"
+            :key="index"
+            :style="{width: '100%', height: getHeight + 'px'}"
+          >
+            <view
+              class="sreen__box-list"
+              :class="{
+								cell4: config.cells === 4,
+								cell5: config.cells === 5,
+							}"
+              :style="{ height: getHeight + 'px'}"
+            >
+              <view
+                v-for="it in item"
+                :key="it['content_id']"
+                :style="{height: boxHeight + 'px'}"
+                @click="handleClick(it)"
+              >
+                <view :style="{ height: height + 'px'}">
+                  <view :style="{
+										borderRadius: config.radius  + 'rpx',
+										boxShadow: config.shadow === 1? `0 0 10rpx rgba(0, 0, 0, .5)` : '',
+									}">
+                    <image :src="it.image_url"></image>
+                  </view>
+                </view>
+                <view v-if="it['content_name']" :style="{color: config.textColor}">{{it['content_name']}}</view>
+              </view>
+            </view>
+          </swiper-item>
+        </swiper>
+        <!--#endif-->
+        <!--#ifdef H5-->
 				<xd-swiper
 					:indicator-dots="false"
 					:interval="config.carouselTime"
@@ -81,6 +127,7 @@
 						</view>
 					</template>
 				</xd-swiper>
+        <!--#endif-->
 			</xd-swiper-dot>
 		</view>
 	</view>
@@ -115,12 +162,22 @@
         padding: 0,
         status: false,
 				list: [],
+        filterContentList:[],
         isPreview: false,
         current: 0,
       }
     },
 		computed:{
       getHeight() {
+        let len = this.filterContentList.length
+        //不足一行数量，设置高度
+        if(len > 0 && len <= this.config.cells * 1){
+          return this.height + this.rpxText
+        }
+        //不足二行数量，设置高度
+        if(len > this.config.cells && len <= this.config.cells * 2 && this.config.jdRows >=2){
+          return this.height * 2 + this.rpxText * 2
+        }
         return this.height * this.config.jdRows + this.rpxText * this.config.jdRows;
       },
 			rpxText(){
@@ -147,6 +204,65 @@
       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
+
+          //没有配置链接
+          if(!item.redirect_data) return true;
+
+          //内部应用
+          else {
+            let redirect_data;
+            try {
+              redirect_data = JSON.parse(item.redirect_data);
+              if(!item['app_type']) item['app_type']= 'h5';
+
+              //#ifdef H5
+              return item['app_type'] !== 'wxmp';
+              //#endif
+
+              //#ifdef MP-WEIXIN
+              let actDir = this.$parent.projectAttr.deploy_dir;
+              let dir = this.getPathDir(redirect_data.page);
+              if(item['app_type'] === 'wxmp'){
+                return actDir === dir;
+              }
+              else if(item['app_type'] === 'h5') return true;
+              else return true
+              //#endif
+            }
+            catch (e) {
+              return true
+            }
+          }
+        });
+        console.warn(`PostTypeLists:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
+        this.filterContentList = this.$xdUniHelper.checkVarType(content);
+        return content;
+
+      },
+
+      getPathDir(pathDir){
+        if(pathDir.indexOf('@site_domain@/') === 0) {
+          return pathDir.replace('@site_domain@/','').split('/')[0]
+        }
+        return ''
+      },
+
       init() {
         if (this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
@@ -154,19 +270,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;
 					}
@@ -174,19 +293,28 @@
 
         }, 100)
       },
+
       handleClick(item) {
-        debugger
+        if(!item.redirect_data) {
+          console.warn(`未配置链接地址: ${item.redirect_data}`);
+          console.error(`未配置链接地址: ${item.redirect_data}`);
+          return
+        }
+
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
           try {
             let url = JSON.parse(item.redirect_data);
             let params = '';
-            if (item['redirect_params']) params = `?${item['redirect_params']}`;
-            this.$xdUniHelper.navigateTo({
-              url: url.page + params
-            })
+            if(url.page) {
+              if (item['redirect_params']) params = `?${item['redirect_params']}`;
+              this.$xdUniHelper.navigateTo({url: url.page + params})
+            }
+            else {
+              console.error(`应用链接配置错误: ${url.page}`)
+            }
           } catch (e) {
-            console.error(e)
+            console.error(`应用链接配置错误: ${item.redirect_data}`)
           }
         }
 
@@ -196,29 +324,32 @@
           //#ifdef MP-WEIXIN
           try {
             let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url) && this.$configProject.extras.webview) {
+            if (reg.test(url.url)) {
               console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo({
-                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
-              });
+              this.$xdUniHelper.navigateTo(url);
             } else {
-              throw Error('地址错误')
+              console.error(`广告跳转外站配置错误: ${url.url}`)
             }
           } catch (e) {
-            console.error(e)
+            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
           }
           //#endif
           //#ifdef H5
           try {
             let url = JSON.parse(item.redirect_data);
             console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.navigateTo(url)
+            this.$xdUniHelper.redirectTo(url, false)
           } catch (e) {
-            console.error(e)
+            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
           }
           //#endif
 
         }
+
+        //无跳转地址
+        if(item.redirect_type === 'EMP') {
+          console.warn(`无跳转地址`);
+        }
       },
     }
   }
@@ -227,6 +358,7 @@
 <style scoped lang="less">
 	.sreen {
 		width: calc(100% + 2px); /**防止宽度不够问**/
+    height: 100%;
 		position: relative;
 
 		& .carousel-mask {
@@ -241,6 +373,7 @@
 
 		&__box.notCarousel {
 			width: 100%;
+      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -333,6 +466,8 @@
 		}
 
 		&__box.carousel {
+      width: 100%;
+      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -341,6 +476,8 @@
 		}
 
 		& .sreen__box-list {
+      width: 100%;
+      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;

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

@@ -16,6 +16,7 @@
     <view class="jfb-base-video__body">
       <view class="x-line"></view>
       <view
+        v-if="isShow"
         class="x-video"
         :style="{
           backgroundColor:bgColor,
@@ -26,15 +27,13 @@
           height:contentHeight + 'rpx'
         }"
       >
-
         <xd-video
           v-if="video !== null && video !== ''"
           :key="videoKey"
           :poster="videoSetting"
           :video="video"
-          :pack-this="$vm"
         ></xd-video>
-        <view class="not-video" v-if="video === ''">
+        <view class="not-video" v-if="isPreview && video === ''">
           <image :src="getVideoSrc"></image>
         </view>
       </view>
@@ -60,7 +59,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseVideoMixin],
     data() {
       return {
-        selfMask: true,
+        isPreview: false,
         page_size: 1,
         options:{},
 
@@ -73,11 +72,14 @@
         width:750,
         bgColor:'',
         radius:0,
-        $vm: {},
-        videoKey : Date.now()
+        videoKey : Date.now(),
       }
     },
 		computed: {
+      isShow(){
+        if(this.isPreview) return true;
+        else return this.video
+      },
       iconFont(){
         if(this.autoplay === 'N') return 'iconplayright'
         if(this.autoplay === 'E') return 'iconshibai';
@@ -126,7 +128,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