jufubao-base 1.0.220-beta4 → 1.0.221-beta101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.220-beta4",
+  "version": "1.0.221-beta101",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -51,7 +51,7 @@
     "dingtalk-jsapi": "^3.0.31",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.17-beta2",
+    "gxd-uni-library-editx": "1.0.17-beta99",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -97,7 +97,7 @@
                   :key="Sitem.key"
                   v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']"
                 >
-                  <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
+                  <image :src="setImageCdnUrl(Sitem.product_thumb)" style="background: #ffffff" mode="aspectFit"></image>
                   <view class="jfb-base-order-list__body-order-item-content-info">
                     <view class="jfb-base-order-list__body-order-item-content-info-name">{{ Sitem.product_name }}</view>
                     <view class="brand-name" v-if="Sitem.brand_name" :style="{color:brandTextColor}">{{ Sitem.brand_name }}</view>
@@ -178,7 +178,7 @@
                 marginBottom: padding + 'rpx',
               }"
             >
-              <xd-tfk-order-item 
+              <xd-tfk-order-item
                 :mainColor="mainColor"
                 :isShowOrderNo="isShowOrderNo"
                 :brandTextColor="brandTextColor"
@@ -307,6 +307,9 @@ export default {
     this.init(this.container);
   },
   methods: {
+    setImageCdnUrl(url){
+      return getServiceUrl(url,'size4')
+    },
     getKey(id, index){
       return  id + index;
     },

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -121,6 +121,7 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePosterMixin from "./JfbBasePosterMixin";
   import componentsMixins from "@/mixins/componentsMixins";
+  import posterMixins from "@/mixins/posterMixins";
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import getServiceUrl from '@/common/getServiceUrl'
@@ -138,7 +139,7 @@
       MoreScreen,
       XdSwiperDot
     },
-    mixins: [componentsMixins,extsMixins,JfbBasePosterMixin],
+    mixins: [componentsMixins,extsMixins,JfbBasePosterMixin,posterMixins],
     data() {
       return {
         selfMask: false,
@@ -380,56 +381,6 @@
     },
 
     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.$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]
@@ -481,74 +432,36 @@
         }
       },
 
-      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}`)
-            }
-          } catch (e) {
-            console.error(`应用链接配置错误: ${item.redirect_data}`)
-          }
-        }
-
-        //外部链接
-        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);
-            } else {
-              console.error(`广告跳转外站配置错误: ${url.url}`)
-            }
-          } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-          }
-          //#endif
-          //#ifdef H5
-          try {
-            let url = JSON.parse(item.redirect_data);
-            console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.redirectTo(url, false)
-          } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-          }
-          //#endif
-
-        }
-
-        //无跳转地址
-        if(item.redirect_type === 'EMP') {
-          console.warn(`无跳转地址`);
-        }
+      /**
+       * @description 过滤不可以用
+       * 当前项目未H5时,过滤所有小程序应用
+       * 当前项目未小程序时,过滤所有非当前小程序应用
+       * 站外地址直接返回
+       * 站内地址未选值直接返回
+       * 预览模式全过
+       */
+      filterItem(list){
+        return this.filterPosterItem(list);
       },
 
+      handleClick(item) {
+        if(this.isPreview) return;
+        this.handlePosterClick(item)
+      },
 
       handleImage(list){
         list = this.filterItem(list);
+        let size = 'size8';
+        if(Number(this.posterType) === 2) size = 'size5';
+        if(Number(this.posterType) === 3) size = 'size3';
+        if(Number(this.posterType) === 4) size = 'size2';
+        console.log(this.posterType,size)
 
       	return list.map((item,index) => {
           return {
             ...item,
             image_background_url: item.image_background_url?getServiceUrl(item.image_background_url):'',
-            image_url: item.image_url?getServiceUrl(item.image_url):''
+            image_url: item.image_url?getServiceUrl(item.image_url,size):''
           }
         })
 			},

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -117,6 +117,7 @@
 <script>
   import XdSwiperDot from "./XdSwiperDot";
   import XdSwiper from "@/components/XdSwiper/XdSwiper";
+  import posterMixins from "@/mixins/posterMixins";
 
   export default {
     components:{
@@ -124,6 +125,7 @@
       XdSwiper
 		},
     name: "MoreScreen",
+    mixins:[posterMixins],
     props: {
       config: {
         type: Object,
@@ -178,62 +180,6 @@
         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);
@@ -243,7 +189,7 @@
           this.padding = Number(this.config.padding);
 
           //过滤不可以用
-          const content = this.filterItem();
+          const content = this.filterPosterItem(this.$xdUniHelper.cloneDeep(this.content));
 
           //静态图显示
           if(this.config.isCarousel === 1) {
@@ -263,62 +209,65 @@
       },
 
       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}`)
-            }
-          } catch (e) {
-            console.error(`应用链接配置错误: ${item.redirect_data}`)
-          }
-        }
-
-        //外部链接
-        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);
-            } else {
-              console.error(`广告跳转外站配置错误: ${url.url}`)
-            }
-          } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-          }
-          //#endif
-          //#ifdef H5
-          try {
-            let url = JSON.parse(item.redirect_data);
-            console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.redirectTo(url, false)
-          } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-          }
-          //#endif
-
-        }
-
-        //无跳转地址
-        if(item.redirect_type === 'EMP') {
-          console.warn(`无跳转地址`);
-        }
+        if(this.config.isPreview) return;
+
+        this.handlePosterClick(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}`)
+        //     }
+        //   } catch (e) {
+        //     console.error(`应用链接配置错误: ${item.redirect_data}`)
+        //   }
+        // }
+        //
+        // //外部链接
+        // 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);
+        //     } else {
+        //       console.error(`广告跳转外站配置错误: ${url.url}`)
+        //     }
+        //   } catch (e) {
+        //     console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        //   }
+        //   //#endif
+        //   //#ifdef H5
+        //   try {
+        //     let url = JSON.parse(item.redirect_data);
+        //     console.warn(`广告跳转外站: ${url.url}`);
+        //     this.$xdUniHelper.redirectTo(url, false)
+        //   } catch (e) {
+        //     console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        //   }
+        //   //#endif
+        //
+        // }
+        //
+        // //无跳转地址
+        // if(item.redirect_type === 'EMP') {
+        //   console.warn(`无跳转地址`);
+        // }
       },
     }
   }

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -282,6 +282,7 @@ import JfbBasePosterBigSmallMixin from "./JfbBasePosterBigSmallMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
+import posterMixins from "@/mixins/posterMixins";
 import XdSwiper from "@/components/XdSwiper/XdSwiper";
 import XdSwiperDot from "./XdSwiperDot";
 import getServiceUrl from "@/common/getServiceUrl";
@@ -293,7 +294,7 @@ export default {
     XdSwiper,
     XdSwiperDot,
   },
-  mixins: [componentsMixins, extsMixins, JfbBasePosterBigSmallMixin],
+  mixins: [componentsMixins, extsMixins, JfbBasePosterBigSmallMixin, posterMixins],
   data() {
     return {
       params:{},
@@ -529,6 +530,7 @@ export default {
     },
   },
   created() {
+    debugger
     this.init(this.container);
     this.isPreview = this.$configProject.isPreview;
   },
@@ -553,7 +555,7 @@ export default {
           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) : "";
+              item.image_url = item.image_url ? getServiceUrl(item.image_url,'size5') : "";
               return item;
             });
           }
@@ -579,7 +581,7 @@ export default {
           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) : "";
+              item.image_url = item.image_url ? getServiceUrl(item.image_url, 'size5') : "";
               return item;
             })
           }
@@ -605,7 +607,7 @@ export default {
           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) : "";
+              item.image_url = item.image_url ? getServiceUrl(item.image_url, 'size5') : "";
               return item;
             });
           }
@@ -633,111 +635,13 @@ export default {
      * 预览模式全过
      */
     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;
-
+      return this.filterPosterItem(this.$xdUniHelper.cloneDeep(list))
     },
 
-    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') {
-        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_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);
-          } else {
-            console.error(`广告跳转外站配置错误: ${url.url}`)
-          }
-        } catch (e) {
-          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-        }
-        //#endif
-        //#ifdef H5
-        try {
-          let url = JSON.parse(item.redirect_data);
-          console.warn(`广告跳转外站: ${url.url}`);
-          this.$xdUniHelper.redirectTo(url, false)
-        } catch (e) {
-          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
-        }
-        //#endif
-
-      }
-
-      //无跳转地址
-      if(item.redirect_type === 'EMP') {
-        console.warn(`无跳转地址`);
-      }
+      if(this.isPreview) return;
+      this.handlePosterClick(item);
     },