jufubao-base 1.0.220-beta4 → 1.0.221-beta1

package/src/components/JfbBasePosterEntry/JfbBasePosterEntry.vue

@@ -49,17 +49,17 @@
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePosterEntryMixin from "./JfbBasePosterEntryMixin";
+  import posterMixins from "@/mixins/posterMixins";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import getServiceUrl from '@/common/getServiceUrl';
-  import {Base64} from "js-base64";
   export default {
     name: "JfbBasePosterEntry",
     components: {
       XdFontIcon
     },
-    mixins: [componentsMixins,extsMixins,JfbBasePosterEntryMixin],
+    mixins: [componentsMixins,extsMixins,JfbBasePosterEntryMixin,posterMixins],
     data() {
       return {
         noData: false,
@@ -122,121 +122,12 @@
       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;
-
+        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(`无跳转地址`);
-        }
+        this.handlePosterClick(item);
       },
 
       getTestData() {
@@ -283,7 +174,10 @@
               }
             }
 
-            this.list = this.filterItem(list);
+            this.list = this.filterItem(list).map(item=>{
+              if(item.image_url) item.image_url = getServiceUrl(item.image_url, 'size8')
+              return item;
+            });
             this.noData = this.list.length === 0;
           })
           .catch(error => {

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -133,6 +133,7 @@
 <script>
   import XdSwiperDot from "./XdSwiperDot";
   import XdSwiper from "@/components/XdSwiper/XdSwiper";
+  import posterMixins from "@/mixins/posterMixins";
 
   export default {
     components:{
@@ -140,6 +141,7 @@
       XdSwiper
 		},
     name: "FourScreen",
+    mixins:[posterMixins],
     props: {
       config: {
         type: Object,
@@ -208,64 +210,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(`PostTypeLists:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
-        this.filterContentList = this.$xdUniHelper.cloneDeep(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(() => {
@@ -274,7 +218,7 @@
           this.padding = 0;
 
           //过滤不可以用
-          const content = this.filterItem();
+          const content = this.filterPosterItem(this.$xdUniHelper.cloneDeep(this.content));
 
           //静态图显示
           if(this.config.isCarousel === false) {
@@ -299,63 +243,7 @@
 
       handleClick(item) {
         if(this.config.isPreview) return;
-
-        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(`无跳转地址`);
-        }
+        this.handlePosterClick(item);
       },
     }
   }

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -216,7 +216,7 @@
       	return list.map(item => {
           return {
             ...item,
-            image_url: getServiceUrl(item.image_url)
+            image_url: getServiceUrl(item.image_url, 'size2')
           }
         })
 			},

package/src/mixins/componentsMixins.js

@@ -213,6 +213,9 @@ export default {
     if(this['hideMask'] === true) zIndex = -1;
     if(this['closeMask'] === true)  zIndex = -1;
     if(this['closeMask'] === false) zIndex = 4;
+    //#ifdef H5
+    document.querySelector(':root').style.setProperty('--preview-z-index', 4);
+    //#endif
 
     //生产元素
     if(this.$configProject.isPreview) {
@@ -292,7 +295,7 @@ export default {
   },
 
   methods:{
-    ...mapActions(['setXNamespace','setStyleCommon']),
+    ...mapActions(['setXNamespace','setStyleCommon','wxCodeForGetAppId']),
     ...mapMutations(['setCurrentStyle']),
 
     /**
@@ -312,6 +315,8 @@ export default {
       }
     },
 
+
+
     /**
      * @description 检查是否同域名
      * @param url
@@ -470,13 +475,17 @@ export default {
           if (typeof AttrObj[type] === "function") {
             let params = getContainerFnPropsValue(this.container, `${type}`);
             let Attr = this.$xdUniHelper.customClone(this.Attr);
-            AttrObj[type] = Attr[type](params);
             AttrObj[`${type}.isFn`] = true;
             AttrObj[`${type}.Fn`] = Attr[type];
+            AttrObj[type] = Attr[type](params);
           } else {
             AttrObj[type].map(item => {
-              if (item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
-              if (item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+              if (item.value !== undefined) {
+                item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+                if(item.defaultValue !== undefined) {
+                  item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+                }
+              }
             });
             AttrObj[`${type}.isFn`] = false;
           }
@@ -497,6 +506,12 @@ export default {
       //#endif
     },
 
+    /**
+     * @description 判断是否有值并返回默认值
+     * @param value {Number} 判断的值
+     * @param dValue {Number} 默认值
+     * @return {number}
+     */
     checkValue(value, dValue = 0){
       if(value === undefined || value === '' || value === null) return dValue;
       return Number(value || 0);
@@ -504,7 +519,7 @@ export default {
 
     /**
      * @description 获取图片链接
-     * @param image
+     * @param image {Object} 图片对象
      * @return {string}
      */
     getBgImage(image = {}){
@@ -517,17 +532,30 @@ export default {
       return bg
     },
 
-    //阴影样式生成
+    /**
+     * @description 阴影样式生成
+     * @param defaultObj {Object} 默认值
+     * @param newObj {Object} 新组件对象
+     * @return {string} 例如：`0,0,10rpx,rgba(0,0,0,0)`
+     */
     getXdShadow(defaultObj, newObj){
       if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0 0 0 rgba(0,0,0,0)`;
       return this.getXdBorder(defaultObj,newObj,'shadow')
     },
 
-    //边框样式生成
+    /**
+     * @description 边框样式生成
+     * @param defaultObj {Object} 默认值
+     * @param newObj {Object} 新组件对象
+     * @param type {string} border/shadow
+     * @return {string} 例如：`2rpx solid rgba(0,0,0,0)`
+     */
     getXdBorder(defaultObj, newObj, type='border'){
-      //使用默认值
-      if(newObj.type ==='D'){
-        if(type === 'border') return `${defaultObj.width}rpx ${defaultObj.style} ${defaultObj.color}`;
+      //使用默认值()
+      if((this.$xdUniHelper.isEmpty(newObj) && defaultObj.type === 'D')
+        || newObj.type ==='D'
+      ){
+        if(type === 'border') return `${defaultObj.width * this.$rpxNum}px ${defaultObj.style||'solid'} ${defaultObj.color}`;
         return `0 0 ${defaultObj.width}rpx ${defaultObj.color}`;
       }
       if(newObj.type === 'N' || this.$xdUniHelper.isEmpty(newObj)) return `0`;
@@ -538,10 +566,20 @@ export default {
       if(value.width) width = value.width;
       if(value.color) color = value.color;
       if(value.style) style = value.style;
-      if(type === 'border') return `${width}rpx ${style} ${color}`
+      if(type === 'border') return `${width* this.$rpxNum}px ${style} ${color}`
       return `0 0 ${width}rpx ${color}`;
     },
 
+    /**
+     * @description 兼容新老border与shadow组件数据
+     * @param newObj {Object} 新对象border与shadow
+     * @param oldObj {Object} 新对象border与shadow
+     * @param oldObj.width {Number}老border与shadow的宽度字段
+     * @param oldObj.color {String} 老border与shadow的颜色字段
+     * @param oldObj.style {String|undefined} 老border样式默认值：solid
+     * @param type {String}
+     * @return {string} 例如：`2rpx solid rgba(0,0,0,0)`
+     */
     getBorderCompatibleOldStyle(newObj={}, oldObj={}, type='border'){
       let contWidth = 0;
       let contColor = 'rgba(0.0.0.0)';
@@ -560,11 +598,19 @@ export default {
 
       if(type === 'border'){
         if(oldObj.type === 'N' && newObj.type === 'N') return 0;
-        return `${contWidth}rpx ${contrStyle} ${contColor}`
+        return `${contWidth* this.$rpxNum}px ${contrStyle} ${contColor}`
       }
       return `0 0  ${contWidth}rpx ${contColor}` ;
     },
 
+    /**
+     * @description 兼容新老border与shadow组件数据
+     * @param newShadow {Object} 新对象border与shadow
+     * @param oldShadow {Object} 新对象border与shadow
+     * @param oldShadow.width {Number}老border与shadow的宽度字段
+     * @param oldShadow.color {String} 老border与shadow的颜色字段
+     * @return {string} 例如：`0,0,10rpx,rgba(0,0,0,1)`
+     */
     getShadowCompatibleOldStyle(newShadow={},oldShadow={}){
       return this.getBorderCompatibleOldStyle(newShadow,oldShadow, 'shadow')
     },
@@ -625,9 +671,10 @@ export default {
     },
 
     /**
-     * @description 数据
+     * @description 获取margin或者padding的值
      * @param marAndPadding {Object}
-     * @param defVale {Object|number}
+     * @param defVale {Object|number} 格式：10 或者 {top:10, left:10, right: 10, bottom:10}
+     * @return {string} 例如：`10rpx 10rpx 10rpx 10rpx`
      */
     getMarginAndPadding(marAndPadding, defVale){
       let top = 0, left=0,bottom=0,right=0;
@@ -651,11 +698,11 @@ export default {
     },
 
     /**
-     * @description 获取边距与填充上下或者左右的值
-     * @param obj
-     * @param type
-     * @param defValue
-     * @return {*}
+     * @description 获取margin和padding的上下或者左右值的和
+     * @param obj {Object} margin或者padding的值
+     * @param type {string} RL|TB
+     * @param defValue {Object|number} 格式：10 或者 {top:10, left:10, right: 10, bottom:10}
+     * @return {number}
      */
     getPMValue(obj = {},type='RL', defValue) {
       if(this.$xdUniHelper.checkVarType(obj) !== 'object') obj = {};
@@ -743,6 +790,14 @@ export default {
     },
     //#endif
 
+    /**
+     * @description 启动导航功能
+     * @param latitude {string|number}
+     * @param longitude {string|number}
+     * @param name {string} 地点名称
+     * @param address  {string} 地点详细地址
+     * @param cb {Function} 成功回调方法
+     */
     handleOpenLocation({latitude,longitude, name, address}, cb){
       //latitude = latitude||39.961521814959795;
       //longitude = longitude || 116.84499635227222
@@ -786,52 +841,96 @@ export default {
     },
 
     /**
-     * @description 过滤不可以用
+     * @description 判断站内设置的地址是否可以进行跳转
      * 当前项目为H5时,过滤所有小程序应用
      * 当前项目为小程序时,过滤所有非当前小程序应用
      * 站外地址直接返回
      * 站内地址未选值直接返回
      * 预览模式全过
-     * @param url {object}
+     * @param url {string} json数据
+     * @return {null|string}
      */
     checkUrlIsValid(url){
       let projectAttr = this.$root.projectAttr;
       //url = '{"dir":"wtxsaas","host":"sandbox-website-05.jufubao.cn","path":"\/main\/order\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\/\/sandbox-website-05.jufubao.cn\/wtxsaas\/main\/order\/detail","frontPath":"\/wtxsaas\/main\/order\/detail","fixed_business_code":""}'
-      if(!url) return null;
+      //数据为空
+      if(url === '' || url === null || url === undefined) return null;
       try {
         let redirect_data = JSON.parse(url);
+        //兼容数据
+        if(redirect_data.app) redirect_data = redirect_data.app;
+        //兼容老数据
         if(!redirect_data['appType']) redirect_data['appType']= 'h5';
-
         //#ifdef H5
-        if(redirect_data['appType'] === 'wxmp') return null;
+
+        //H5 -> MP
+        if(redirect_data['appType'] === 'wxmp'){
+          //todo 待支持H5跳转到小程序
+          return null;
+        }
         else {
+          //相同H5应用
           if(redirect_data.dir === projectAttr.deploy_dir) {
             return redirect_data.path
           }
+          //不相同H5应用
           else {
             return `//${projectAttr.host}${redirect_data.frontPath}`
           }
-
         }
         //#endif
 
         //#ifdef MP-WEIXIN
         let dir = redirect_data.dir;
         if(redirect_data['appType'] === 'wxmp'){
+          //相同小程序应用
           if(projectAttr.deploy_dir === dir) return redirect_data.path;
-          else return null;
+
+          //MP -> MP
+          else{
+            //todo 待支持微信小程序跳转微信小程序
+            return null;
+          }
         }
         else if(redirect_data['appType'] === 'h5'){
           return `https://${projectAttr.host}${redirect_data.frontPath}`
         }
-        else return null;
+        //其他情况
+        else {
+          return null;
+        }
         //#endif
-      }catch (e){
+      }
+      catch (e){
         console.error(e);
         return null;
       }
+    },
 
+    handleH5ToMP(app_id,url,params){
+      debugger
     },
+
+    handleMpToMP(app_id,url,params){
+
+    },
+    /**
+     * @description 处理站点应用内部跳转微信小程序处理
+     * @param code {string} 站点内部微信小程序aopen_app_code
+     * @param type {string} h5|wxmp
+     * @param url {string} 内部链接地址
+     * @param params {string} 自定义参数 例如：id=1&cid=1234
+     */
+    codeForGetAppId(code, type, url,params){
+     this.wxCodeForGetAppId({app_code: code})
+       .then(app_id=>{
+         if(type === 'h5') this.handleH5ToMP(app_id,url, params || '');
+         if(type === 'wxmp') this.handleMpToMP( app_id, url, params || '')
+       })
+       .catch(err=>{
+         console.error(err)
+       })
+    }
   }
 }