jufubao-base 1.0.159-beta8 → 1.0.159

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -33,45 +33,8 @@
 				field="content_name"
 				:mode="config.mode"
 				:dots-styles="config.dotStyleData"
-				:style="{height:(getHeight + 46 * $rpxNum) + 'px', width:'100%'}"
+				:style="{height:(getHeight + 46 * $rpxNum) + '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">
-            <view
-              class="sreen__box-list"
-              :class="{s3:config.cell === 3,s4:config.cell === 4}"
-              :style="{  height: getHeight + 'px' }"
-            >
-              <view
-                v-for="(it, indext) in item"
-                :key="it['content_id']"
-                @click="handleClick(it)"
-                :style="{
-                  borderRadius: config.radius  + 'rpx',
-                  width: config.width + 'px',
-                  height: config.height + 'px',
-                  marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
-                  marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
-                }"
-              >
-                <image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
-              </view>
-            </view>
-          </swiper-item>
-        </swiper>
-        <!--#endif-->
-        <!--#ifdef H5-->
 				<xd-swiper
 					:indicator-dots="false"
 					:interval="config.carouselTime"
@@ -82,32 +45,31 @@
 					@onClickItem="handleClick"
 					@animationfinish="handleAnimationfinish"
 				>
-          <template slot-scope="{ item, index}">
-            <view
-              class="sreen__box-list"
+					<template slot-scope="{ item, index}">
+						<view
+							class="sreen__box-list"
               :class="{s3:config.cell === 3,s4:config.cell === 4}"
-              :style="{
-                height: getHeight + 'px'
-              }"
-            >
-              <view
-                v-for="(it, indext) in item"
-                :key="it['content_id']"
-                :style="{
-                  borderRadius: config.radius  + 'rpx',
-                  width: config.width + 'px',
-                  height: config.height + 'px',
-                  marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
-                  marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
-                }"
-                @click="handleClick(it)"
-              >
-                <image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
-              </view>
-            </view>
-          </template>
+							:style="{
+								height: getHeight + 'px'
+							}"
+						>
+							<view
+								v-for="(it, indext) in item"
+								:key="it['content_id']"
+								:style="{
+								borderRadius: config.radius  + 'rpx',
+								width: config.width + 'px',
+					      height: config.height + 'px',
+								marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
+								marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
+							}"
+								@click="handleClick(it)"
+							>
+								<image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
+							</view>
+						</view>
+					</template>
 				</xd-swiper>
-        <!--#endif-->
 			</xd-swiper-dot>
 		</view>
 		<view v-if="isPreview" class="carousel-mask"></view>
@@ -171,64 +133,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(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
-        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(() => {
@@ -236,9 +140,6 @@
           this.height = Number(this.config.height);
           this.padding = Number(this.config.padding);
 
-          //过滤不可以用
-          const content = this.filterItem();
-
           //静态图显示
           if(this.config.isCarousel === 1) {
             this.list = this.content
@@ -255,64 +156,50 @@
 					}
         }, 100)
       },
-
       handleClick(item) {
-        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(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)
           }
         }
 
         //外部链接
         if (item.redirect_type === 'URL') {
           let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
-          let spReg = /(-apiuri\/v)/;
           //#ifdef MP-WEIXIN
           try {
             let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url) || spReg.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(`无跳转地址`);
-        }
       },
     }
   }
@@ -322,7 +209,6 @@
 	.sreen {
 		width: calc(100% + 4px); /**防止宽度不够问**/
 		position: relative;
-    height: 100%;
 
 		& .carousel-mask {
 			position: absolute;
@@ -340,7 +226,6 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 			width: calc(100% + 20px); /**防止宽度不够问**/
-      height: 100%;
 
 			& > view {
 				display: flex;
@@ -353,8 +238,6 @@
 		}
 
 		&__box.carousel {
-      width: 100%;
-      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -364,7 +247,6 @@
 
 		& .sreen__box-list {
 			width: calc(100% + 20px); /**防止宽度不够问**/
-      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;

package/src/components/JfbBasePosterBigSmall/Attr.js

@@ -50,6 +50,7 @@ export default {
         value: params.height || 500,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
+        disabled:xiugai,
         notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">500</span>像素',
         inline: false,
       },
@@ -59,6 +60,7 @@ export default {
         groupKey:'style',
         valueKey: 'margin',
         value: params.margin || null,
+        disabled: xiugai,
         setting: { type: 'margin'},
         placeholder: '请设置广告位边距设置',
         notice: '广告位选取内容后，将无法修改，单位：像素',
@@ -70,9 +72,10 @@ export default {
         type: 'number',
         valueKey: 'msMargin',
         groupKey:'style',
-        value: params.msMargin,
+        value: params.msMargin || 10,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
+        disabled: xiugai,
         notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">10</span>像素',
         inline: false,
       },