jufubao-base 1.0.157-beta4 → 1.0.157-beta5

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -37,54 +37,8 @@
 				field="content_name"
 				:mode="config.mode"
 				:dots-styles="config.dotStyleData"
-				:style="{height: (getHeight) + 'px', width:'100%'}"
+				:style="{height: (getHeight) + 'px'}"
 			>
-        <!--#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"
@@ -127,7 +81,6 @@
 						</view>
 					</template>
 				</xd-swiper>
-        <!--#endif-->
 			</xd-swiper-dot>
 		</view>
 	</view>
@@ -162,22 +115,12 @@
         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(){
@@ -204,65 +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
-
-          //没有配置链接
-          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(() => {
@@ -270,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;
 					}
@@ -293,28 +174,19 @@
 
         }, 100)
       },
-
       handleClick(item) {
-        if(!item.redirect_data) {
-          console.warn(`未配置链接地址: ${item.redirect_data}`);
-          console.error(`未配置链接地址: ${item.redirect_data}`);
-          return
-        }
-
+        debugger
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
           try {
             let url = JSON.parse(item.redirect_data);
             let params = '';
-            if(url.page) {
-              if (item['redirect_params']) params = `?${item['redirect_params']}`;
-              this.$xdUniHelper.navigateTo({url: url.page + params})
-            }
-            else {
-              console.error(`应用链接配置错误: ${url.page}`)
-            }
+            if (item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({
+              url: url.page + params
+            })
           } catch (e) {
-            console.error(`应用链接配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
         }
 
@@ -324,32 +196,29 @@
           //#ifdef MP-WEIXIN
           try {
             let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url)) {
+            if (reg.test(url.url) && this.$configProject.extras.webview) {
               console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo(url);
+              this.$xdUniHelper.navigateTo({
+                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
+              });
             } else {
-              console.error(`广告跳转外站配置错误: ${url.url}`)
+              throw Error('地址错误')
             }
           } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
           //#endif
           //#ifdef H5
           try {
             let url = JSON.parse(item.redirect_data);
             console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.redirectTo(url, false)
+            this.$xdUniHelper.navigateTo(url)
           } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
           //#endif
 
         }
-
-        //无跳转地址
-        if(item.redirect_type === 'EMP') {
-          console.warn(`无跳转地址`);
-        }
       },
     }
   }
@@ -358,7 +227,6 @@
 <style scoped lang="less">
 	.sreen {
 		width: calc(100% + 2px); /**防止宽度不够问**/
-    height: 100%;
 		position: relative;
 
 		& .carousel-mask {
@@ -373,7 +241,6 @@
 
 		&__box.notCarousel {
 			width: 100%;
-      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -466,8 +333,6 @@
 		}
 
 		&__box.carousel {
-      width: 100%;
-      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -476,8 +341,6 @@
 		}
 
 		& .sreen__box-list {
-      width: 100%;
-      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;

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

@@ -16,7 +16,6 @@
     <view class="jfb-base-video__body">
       <view class="x-line"></view>
       <view
-        v-if="isShow"
         class="x-video"
         :style="{
           backgroundColor:bgColor,
@@ -27,13 +26,15 @@
           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="isPreview && video === ''">
+        <view class="not-video" v-if="video === ''">
           <image :src="getVideoSrc"></image>
         </view>
       </view>
@@ -59,7 +60,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseVideoMixin],
     data() {
       return {
-        isPreview: false,
+        selfMask: true,
         page_size: 1,
         options:{},
 
@@ -72,14 +73,11 @@
         width:750,
         bgColor:'',
         radius:0,
-        videoKey : Date.now(),
+        $vm: {},
+        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';
@@ -128,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