jufubao-base 1.0.159-beta9 → 1.0.159

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -1,4 +1,3 @@
-<script src="JfbBasePosterBigSmallMixin.js"></script>
 <template>
   <view
     class="jfb-base-poster-big-small"
@@ -11,7 +10,9 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-poster-big-small__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-poster-big-small__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
     <view class="jfb-base-poster-big-small__body">
@@ -21,7 +22,6 @@
           margin: margin,
           flexDirection: position === 1 ? 'row' : 'row-reverse',
         }"
-        v-if="isShowAd"
       >
         <view
           v-if="isCarousel === 1"
@@ -60,26 +60,6 @@
             :mode="dot_type"
             :dots-styles="dotStyleData"
           >
-            <!--#ifdef MP-WEIXIN-->
-            <swiper
-              :style="{width: bigWidth + 'rpx', height: bigHeight + 'rpx'}"
-              :indicator-dots="false"
-              :autoplay="carouselTime>0"
-              :interval="carouselTime"
-              :duration="500"
-              :current="current"
-              circular
-              @animationfinish="handleBigAnimationfinish"
-            >
-              <swiper-item v-for="(item,index) in bigList" :key="index" @click.stop="handleClick(item)">
-                <image
-                  :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: bigHeight + 'rpx',}"
-                  :src="item['image_url']"
-                  mode="aspectFill"></image>
-              </swiper-item>
-            </swiper>
-            <!--#endif-->
-            <!--#ifdef H5-->
             <xd-swiper
               :indicator-dots="false"
               :list="bigList"
@@ -91,10 +71,15 @@
               @animationfinish="handleBigAnimationfinish"
             >
               <template slot-scope="{ item, index }">
-                <image :style="{borderRadius: radius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
+                <image
+                  :style="{
+                    borderRadius: radius + 'rpx',
+                  }"
+                  :src="item['image_url']"
+                  mode="aspectFill"
+                ></image>
               </template>
             </xd-swiper>
-            <!--#endif-->
           </xd-swiper-dot>
           <view v-if="isPreview" class="carousel-mask"></view>
         </view>
@@ -127,7 +112,7 @@
                   }"
                   :src="topList[0].image_url"
                   mode="aspectFill"
-                ></image></view
+                ></image> </view
             ></view>
             <view
               v-else
@@ -144,26 +129,6 @@
                 :mode="top_dot_type"
                 :dots-styles="topDotStyleData"
               >
-                <!--#ifdef MP-WEIXIN-->
-                <swiper
-                  :style="{width: bigWidth + 'rpx', height: smallHeight + 'rpx'}"
-                  :indicator-dots="false"
-                  :autoplay="topCarouselTime>0"
-                  :interval="topCarouselTime"
-                  :duration="500"
-                  :current="current"
-                  circular
-                  @animationfinish="handleBigAnimationfinish"
-                >
-                  <swiper-item v-for="(item,index) in topList" :key="index" @click.stop="handleClick(item)">
-                    <image
-                      :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
-                      :src="item['image_url']"
-                      mode="aspectFill"></image>
-                  </swiper-item>
-                </swiper>
-                <!--#endif-->
-                <!--#ifdef H5-->
                 <xd-swiper
                   :indicator-dots="false"
                   :list="topList"
@@ -175,11 +140,17 @@
                   @animationfinish="handleTopAnimationfinish"
                 >
                   <template slot-scope="{ item, index }">
-                    <image :style="{borderRadius: topRadius + 'rpx',}" :src="item['image_url']" mode="aspectFill"></image>
+                    <image
+                      :style="{
+                        borderRadius: topRadius + 'rpx',
+                      }"
+                      :src="item['image_url']"
+                      mode="aspectFill"
+                    ></image>
                   </template>
                 </xd-swiper>
-                <!--#endif-->
               </xd-swiper-dot>
+
               <view v-if="isPreview" class="carousel-mask"></view>
             </view>
           </view>
@@ -222,26 +193,6 @@
                 :mode="bottom_dot_type"
                 :dots-styles="bottomDotStyleData"
               >
-                <!--#ifdef MP-WEIXIN-->
-                <swiper
-                  :style="{width: bigWidth + 'rpx', height: smallHeight + 'rpx'}"
-                  :indicator-dots="false"
-                  :autoplay="bottomCarouselTime>0"
-                  :interval="bottomCarouselTime"
-                  :duration="500"
-                  :current="current"
-                  circular
-                  @animationfinish="handleBigAnimationfinish"
-                >
-                  <swiper-item v-for="(item,index) in bottomList" :key="index" @click.stop="handleClick(item)">
-                    <image
-                      :style="{borderRadius: radius + 'rpx',width: bigWidth + 'rpx',height: smallHeight + 'rpx',}"
-                      :src="item['image_url']"
-                      mode="aspectFill"></image>
-                  </swiper-item>
-                </swiper>
-                <!--#endif-->
-                <!--#ifdef H5-->
                 <xd-swiper
                   :indicator-dots="false"
                   :list="bottomList"
@@ -262,8 +213,8 @@
                     ></image>
                   </template>
                 </xd-swiper>
-                <!--#endif-->
               </xd-swiper-dot>
+
               <view v-if="isPreview" class="carousel-mask"></view>
             </view>
           </view>
@@ -295,7 +246,6 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBasePosterBigSmallMixin],
   data() {
     return {
-      params:{},
       height: 0, //组件高度
       mS: {
         top: 0,
@@ -330,7 +280,6 @@ export default {
       //大图
       current: 0,
       carouselTime: 5, //轮播图轮播周期
-
       bigList: [],
       number: null,
       dot_type: "dot",
@@ -346,7 +295,6 @@ export default {
       bottomRadius: 0, //小图上圆角
       bottomCurrent: 0, //小图上
       bottomIsCarousel: 1,
-      bottomCarouselTime:0,
 
       //小图上
       topList: [],
@@ -356,7 +304,6 @@ export default {
       topCurrent: 0, //小图上
       topIsCarousel: 1,
       smallHeight: 0,
-      topCarouselTime:0,
 
       timer: null,
 
@@ -520,9 +467,6 @@ export default {
       };
       return style[this.bottom_dot_type];
     },
-    isShowAd(){
-      return !(this.bigList.length === 0 && this.topList.length === 0 && this.bottomList.length === 0);
-    },
   },
   watch: {
     container(value,oloValue) {
@@ -555,19 +499,20 @@ export default {
           if (res.list.length === 0 && this.isPreview) {
             res.list = this.getTestData("big");
           }
-
-          res.list = this.filterItem(res.list);
-          if(res.list &&  res.list.length > 0 ) {
-            this.bigList = res.list.map((item) => {
-              item.image_url = item.image_url ? getServiceUrl(item.image_url) : "";
+          //将res.list中的image_url替换为服务地址
+          this.bigList =
+            res.list &&
+            res.list.length > 0 &&
+            res.list.map((item) => {
+              item.image_url = item.image_url
+                ? getServiceUrl(item.image_url)
+                : "";
               return item;
             });
-          }
         })
         .catch((error) => {
           console.error(error);
         });
-
       //获取小图上列表
       jfbRootExec("getListPosterContent", {
         vm: this,
@@ -582,18 +527,20 @@ export default {
           if (res.list.length === 0 && this.isPreview) {
             res.list = this.getTestData("top");
           }
-          res.list = this.filterItem(res.list);
-          if(res.list && res.list.length > 0 ){
-            this.topList = res.list.map((item) => {
-              item.image_url = item.image_url ? getServiceUrl(item.image_url) : "";
+          //将res.list中的image_url替换为服务地址
+          this.topList =
+            res.list &&
+            res.list.length > 0 &&
+            res.list.map((item) => {
+              item.image_url = item.image_url
+                ? getServiceUrl(item.image_url)
+                : "";
               return item;
-            })
-          }
+            });
         })
         .catch((error) => {
           console.error(error);
         });
-
       //获取小图下列表
       jfbRootExec("getListPosterContent", {
         vm: this,
@@ -608,13 +555,16 @@ export default {
           if (res.list.length === 0 && this.isPreview) {
             res.list = this.getTestData("bottom");
           }
-          res.list = this.filterItem(res.list);
-          if(res.list &&  res.list.length > 0){
-            this.bottomList = res.list.map((item) => {
-              item.image_url = item.image_url ? getServiceUrl(item.image_url) : "";
+          //将res.list中的image_url替换为服务地址
+          this.bottomList =
+            res.list &&
+            res.list.length > 0 &&
+            res.list.map((item) => {
+              item.image_url = item.image_url
+                ? getServiceUrl(item.image_url)
+                : "";
               return item;
             });
-          }
         })
         .catch((error) => {
           console.error(error);
@@ -629,137 +579,65 @@ export default {
     handleBottomAnimationfinish(e) {
       this.bottomCurrent = e.detail.current;
     },
-
-    /**
-     * @description 过滤不可以用
-     * 当前项目未H5时,过滤所有小程序应用
-     * 当前项目未小程序时,过滤所有非当前小程序应用
-     * 站外地址直接返回
-     * 站内地址未选值直接返回
-     * 预览模式全过
-     */
-    filterItem(list = []){
-      let content = list.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 ''
-    },
-
     handleClick(item) {
-      if(!item.redirect_data) {
-        console.warn(`未配置链接地址: ${item.redirect_data}`);
-        console.error(`未配置链接地址: ${item.redirect_data}`);
-        return
-      }
-
       //内部链接跳转地址
-      if (item.redirect_type === 'INN') {
+      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}`)
-          }
+          let params = "";
+          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') {
+      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)) {
-            console.warn(`广告跳转外站: ${url.url}`)
-            this.$xdUniHelper.navigateTo(url);
+          if (reg.test(url.url) && this.$configProject.extras.webview) {
+            console.warn(`广告跳转外站: ${url.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(`无跳转地址`);
       }
     },
-
-
     getTestData(type) {
       let width;
       let height;
       // 根据type参数，设置width和height
-      if (type === "big") {
+      if (type == "big") {
         width = this.bigWidth;
         height = this.bigHeight;
       }
-      if (type === "top") {
+      if (type == "top") {
         width = this.bigWidth;
         height = this.smallHeight;
       }
-      if (type === "bottom") {
+      if (type == "bottom") {
         width = this.bigWidth;
         height = this.smallHeight;
       }
@@ -780,7 +658,6 @@ export default {
       // 返回临时数组
       return temp;
     },
-
     /**
      * @description 监听事件变化
      * @param container {object} 业务组件对象自己
@@ -867,7 +744,6 @@ export default {
           getContainerPropsValue(container, "content.bottomCarouselTime", 5)
         ) * 1000;
     },
-
     onJfbUpdate(data) {
       this.onJfbLoad(this.params);
      }

package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue

@@ -122,121 +122,50 @@
       this.init(this.container);
     },
     methods: {
-      /**
-       * @description 过滤不可以用
-       * 当前项目未H5时,过滤所有小程序应用
-       * 当前项目未小程序时,过滤所有非当前小程序应用
-       * 站外地址直接返回
-       * 站内地址未选值直接返回
-       * 预览模式全过
-       */
-      filterItem(list){
-        let content = list.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.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(`PostTypeList:${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 ''
-      },
-
-
-      handleClick(item) {
-        if(!item.redirect_data) {
-          console.warn(`未配置链接地址: ${item.redirect_data}`);
-          console.error(`未配置链接地址: ${item.redirect_data}`);
-          return
-        }
-
+      handleClick(item){
         //内部链接跳转地址
-        if (item.redirect_type === 'INN') {
-          try {
+        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}`)
-            }
-          } catch (e) {
-            console.error(`应用链接配置错误: ${item.redirect_data}`)
+            if(item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({
+              url: url.page + params
+            })
+          }catch (e) {
+            console.error(e)
           }
         }
 
         //外部链接
-        if (item.redirect_type === 'URL') {
+        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(`无跳转地址`);
-        }
       },
 
       getTestData() {
@@ -283,7 +212,8 @@
               }
             }
 
-            this.list = this.filterItem(list);
+
+            this.list = list;
             this.noData = this.list.length === 0;
           })
           .catch(error => {