jufubao-base 1.0.290-beta3 → 1.0.290

package/src/mixins/posterMixins.js

@@ -1,10 +1,10 @@
 'use strict';
-import {mapActions} from "vuex";
 
 export default {
-  methods:{
-    ...mapActions(['wxCodeForGetAppId']),
+  data(){
 
+  },
+  methods:{
     /**
      * @description 过滤不可以用
      * 当前项目未H5时,过滤所有小程序应用
@@ -14,225 +14,53 @@ export default {
      * 预览模式全过
      */
     posterFilterNoUseData(list = []){
-      return this.filterPosterItem(list);
-    },
-
-    //====== h5 to wxmp(外部链接) 或者 wxmp to wxmp(外部链接) =========
-    filterPosterItem(list){
-      let content = list.filter(item=>{
+      let content = this.$xdUniHelper.cloneDeep(list).filter(item=>{
         //预览模式
         if( this.$configProject.isPreview) return true;
 
-        //非内部应用(URL|EMP|WMP)
+        //非内部应用
         if(item.redirect_type !== 'INN') return true
 
         //没有配置链接
         if(!item.redirect_data) return true;
 
         //内部应用
-        return true;
-      });
-      console.warn(`filterPosterItem.posterMixins:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
-      return content;
-    },
-
-    getSchemeUrl(app_id, url, params){
-      let env_version = 'release';
-      let query = '';
-      if(params) query = `&query=${encodeURIComponent(params)}`;
-      return `weixin://dl/business/?appid=${app_id}&path=${url}${query}&env_version=${env_version}`;;
-    },
-
-    //#ifdef H5
-    handleH5ToMP(app_id , url, params){
-      let newUrl = '/' + url.split('/').splice(-3).join('/');
-      let entry = '/pages/loading/loading';
-      let query = `callback_local=${newUrl}`;
-      if(params) query = `${query}&${params}`;
-      window.location.href = this.getSchemeUrl(app_id, entry, query);
-    },
-    //#endif
-
-    //#ifdef MP-WEIXIN
-    handleToMp(app_id,entry){
-      let envVersion = 'release';
-      wx.navigateToMiniProgram({
-        appId: app_id,
-        path: entry,
-        envVersion,
-        success(res) {
-          console.log(res);
-        },
-        fail:(err)=>{
-          console.error(err);
-        }
-      });
-    },
-
-    handleMpToMP(app_id , url, params){
-      let newUrl = '/' + url.split('/').splice(-3).join('/');
-      let entry = '/pages/loading/loading';
-      let query = `callback_local=${newUrl}`;
-      if(params) query = `${query}&${params}`;
-      entry = `${entry}?${query}`;
-      this.handleToMp(app_id,entry)
-    },
-    //#endif
-
-    /**
-     * @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=>{
-          //#ifdef H5
-          if(type === 'h5') this.handleH5ToMP(app_id,url, params || '');
-          //#endif
-
-          //#ifdef MP-WEIXIN
-          let obj = parsePath(url);
-          //跳转路径所在应用为微信小程序并且不属于当前应用
-          if(!obj.isSameApp && type === 'wxmp'){
-            this.handleMpToMP( app_id, url, params || '')
-          }
-          //#endif
-        })
-        .catch(err=>{
-          console.error(err)
-        })
-    },
-
-    /**
-     * @description 跳转到第三方维修小程序
-     * @param item
-     */
-    toOtherWxMp(item){
-      try {
-        let url = JSON.parse(item.redirect_data);
-
-        //url = {data: `/pages/loading/loading?callback=${encodeURIComponent('/pages/loading/loading')}&version=1.0.0`, app_id: '11212121212'}
-        //url = {data: `weixin://dl/business/?appid=11212121212&path=/pages/loading/loading&query=callback%3D%252Fpages%252Floading%252Floading%26version%3D1.0.0&env_version=release`, app_id: '11212121212'}
-
-        //#ifdef H5
-        let businessUrl = '';
-        if(url.data.indexOf('weixin://dl/business/?appid=') === 0) businessUrl = url.data;
         else {
-          let arr =  url.data.split('?');
-          if(url.app_id) {
-            businessUrl = this.getSchemeUrl(url.app_id, arr[0], arr[1]||'');
-          }
-          else console.error(`未设置APP_ID: ${url.app_id}`);
-        }
-        if(businessUrl) window.location.href = businessUrl;
-        //#endif
-
-        //#ifdef MP-WEIXIN
-        this.handleToMp(url.app_id, url.data)
-        //#endif
-      }catch (e) {
-        console.error(`应用链接配置错误: ${item.redirect_data}`)
-      }
-
-    },
-
-    handlePosterClick(item){
-      console.warn(`handlePosterClick.posterMixins`);
-
-      //预览模式
-      if( this.$configProject.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) {
+          let redirect_data;
+          try {
+            redirect_data = JSON.parse(item.redirect_data);
+            if(!item['app_type']) item['app_type']= 'h5';
 
             //#ifdef H5
-            //h5 to wxmp （外部链接）
-            if(item.app_type === 'wxmp') {
-              if(url.app_code) this.codeForGetAppId(url.app_code, 'h5', url.page,item['redirect_params']);
-              else console.error(`应用外部链接为设置Code: ${url.app_code}`)
-              return;
-            }
+            return item['app_type'] !== 'wxmp';
             //#endif
 
             //#ifdef MP-WEIXIN
-            //wxmp to wxmp（外部链接）
-            if(item.app_type === 'wxmp') {
-              if(url.app_code) this.codeForGetAppId(url.app_code, 'wxmp', url.page, item['redirect_params']);
-              else console.error(`应用外部链接为设置Code: ${url.app_code}`)
-              return;
+            let actDir = this.$parent['projectAttr']['deploy_dir'];
+            let dir = this.getPosterPathDir(redirect_data.page);
+            if(item['app_type'] === 'wxmp'){
+              return actDir === dir;
             }
+            else if(item['app_type'] === 'h5') return true;
+            else return true
             //#endif
-
-            //属于站点应用内部链接：h5 to h5 或者 wxmp to wxmp
-            //属于站点应用外部链接：h5 to h5（外部链接）
-            if (item['redirect_params']) params = `?${item['redirect_params']}`;
-            debugger
-            this.$xdUniHelper.navigateTo({url: url.page + params})
           }
-          else {
-            console.error(`应用链接配置错误: ${url.page}`)
+          catch (e) {
+            return true
           }
-        } catch (e) {
-          console.error(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
-
-      }
+      });
+      console.warn(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
+      return content;
 
-      //跳转到微信小程序
-      if(item.redirect_type === 'WMP') {
-        this.toOtherWxMp(item);
-      }
+    },
 
-      //无跳转地址
-      if(item.redirect_type === 'EMP') {
-        console.warn(`无跳转地址`);
+    getPosterPathDir(pathDir){
+      if(pathDir.indexOf('@site_domain@/') === 0) {
+        return pathDir.replace('@site_domain@/','').split('/')[0]
       }
-    }
-    //====== h5 to wxmp(外部链接) 或者 wxmp to wxmp(外部链接) =========
+      return ''
+    },
   },
 }
 

package/src/mixins/productCompMixins.js

@@ -0,0 +1,252 @@
+'use strict';
+import { jfbRootExec } from "@/utils/xd.event";
+import getServiceUrl from "@/common/getServiceUrl"
+
+export default {
+  data(){
+    return {
+
+      //品牌样式
+      brandColor:'#999',
+      brandBgColor:'',
+      brandBorColor:'',
+
+      //广告
+      poster:{}, //广告位置信息
+      posterList:null,
+      posterNum:1, //使用张数
+      mode:'round',//直接写死
+      carouselTime: 0,//轮播图轮播周期
+      posterKey:'posterKey',
+      posterIndex:'',
+      isPoster:'N',
+
+    }
+  },
+
+  computed:{
+    isOpenPoster(){
+      //三列与一列垂直不显示广告
+      return !(this.column_num === 3 || this.columnOneLayout === 'V');
+    },
+    //广告位置样式设置
+    posterSizeComp(){
+      return {
+        width: this.posterSize.width + 'rpx',
+        height: this.posterSize.height + 'rpx',
+      }
+    },
+
+    //广告位置尺寸设置
+    posterSize(){
+      let pw = 0 , ph= 0;
+      if(this.column_num ===1) {
+        if(this.columnOneLayout === 'H') ph = 300
+        else  ph = 900
+      }
+      if(this.column_num === 2) ph = 540
+      if(this.column_num === 3) ph = 200;
+
+      if(this.poster && this.poster.size) {
+        let {width, height} = this.poster.size;
+        if(width !== undefined) pw = Number(width);
+        if(height !== undefined) ph = Number(height);
+      }
+
+      let itemWidth = parseInt(this.posterProductStyles.width);
+      let itemHeight = ph * itemWidth / pw;
+      return {
+        width: itemWidth,
+        height:  itemHeight,
+      }
+    },
+
+    //骨架宽度设置
+    skeletonImageHeight(){
+      return parseInt(this.skeletonStyle.width);
+    },
+
+    //骨架样式设置
+    skeletonStyle(){
+      return this.getContentStyle('ske')
+    },
+
+    //商品宽度设置
+    contProductImageHeight(){
+      return parseInt(this.contProductStyles.width);
+    },
+
+    //商品样式设置
+    contProductStyles(){
+      // let boxShadow = this.getShadowCompatibleOldStyle(this.contShadow,{
+      //   type: this.is_shadow,
+      //   width: this.is_shadow_w,
+      //   color: this.is_shadow_bg
+      // }, ['none',this.gStyleValue.shadow]);
+      // debugger
+      return {
+        ...this.getContentStyle(),
+        boxShadow: this.contShadow,
+        border: this.contBorder,
+        backgroundColor: this.itemBgcColor,
+      }
+    },
+
+
+    //商品样式设置
+    posterProductStyles(){
+      // let boxShadow = this.getShadowCompatibleOldStyle(this.contShadow,{
+      //   type: this.is_shadow,
+      //   width: this.is_shadow_w,
+      //   color: this.is_shadow_bg
+      // }, ['none',this.gStyleValue.shadow]);
+      return {
+        ...this.getContentStyle('poster'),
+        boxShadow: this.contShadow,
+        border: this.contBorder,
+        backgroundColor: this.itemBgcColor,
+        overflow:'hidden'
+      }
+    },
+
+    //品牌样式
+    brandStyleComp(){
+      return {
+        color: this.brandColor,
+        bgColor: this.brandBgColor,
+        borderColor: this.brandBorColor,
+      }
+    },
+  },
+
+  watch:{
+    isPoster(n, o){
+      if(this.$configProject.isPreview) {
+        if(this.isOnloaded === false) return;
+        this.prodList = null;
+        this.page_token = '1';
+        this.getList();
+      }
+    },
+    posterIndex(){
+      if(this.$configProject.isPreview) {
+        if(this.isOnloaded === false) return;
+        this.prodList = null;
+        this.page_token = '1';
+        this.getList();
+      }
+    },
+    carouselTime(){
+      if(this.isPreview) {
+        this.posterKey = Date.now()
+      }
+
+    },
+    mode(){
+      if(this.isPreview) {
+        this.posterKey = Date.now()
+      }
+    },
+    posterNum(){
+      this.onJfbUpdate()
+    },
+  },
+  methods:{
+    //重新加载广告位置
+    reHandlePoster(){
+      if(this.$configProject.isPreview) {
+        if(this.isOnloaded === false) return;
+        if(this.isOpenPoster){
+          uni.showModal({
+            title: '温馨提示',
+            content: '已设置显示广告内容并切换商品显示列数时，别忘记切换对应的广告位置哦！',
+            showCancel:false,
+            confirmText:'我知道了',
+            success: function (res) {
+
+            }
+          });
+        }
+        this.prodList = null;
+        this.page_token = '1';
+        this.posterList = null;
+        this.getList();
+        this.getPosterList()
+      }
+    },
+
+    //获取广告位置设置
+    getPosterList(){
+      jfbRootExec('getMallHomeProductPoster', {
+        vm: this,
+        data: {
+          page_id: this.pageAttr['page_id'], //页面ID
+          container_id: this.containerId, //组件ID
+          page_size: this.posterNum //可以不传
+        },
+      })
+        .then(res => {
+          let posterList = res.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):''
+            }
+          });
+          this.posterList = this.posterFilterNoUseData(posterList);
+        })
+        .catch(err=>{
+          console.error(err);
+        })
+    },
+
+    /**
+     * @description 获取内容区域样式
+     * @param type {string} ske=>骨架样式 cont=>内容框样式 poster => 广告位置样式
+     * @return {Object}
+     */
+    getContentStyle(type='cont'){
+      //总宽度
+      let outWidth = uni.getSystemInfoSync().safeArea.width * this.$pxNum;
+
+      //外边距
+      let outMarginRL = this.getPMValue(this.bodyPadding, 'RL',0)
+
+      //列表填充
+      let outPaddingRL = this.getPMValue(this.listPadding,'RL', 20);
+
+      //间距设置
+      if(this.$xdUniHelper.checkVarType(this.columnSpacing) === 'string') this.columnSpacing = Number(this.columnSpacing);
+      let columnSpacing = this.columnSpacing * (this.column_num-1); //公式:列数量 * 边距 + 边距
+
+      //item内容填充
+      let paddingRL = this.getPMValue(this.itemPadding,'RL', 20)* this.column_num;
+      if(type === 'poster')   paddingRL = 0; //广告模式
+
+      //预览模式有两个像素边距
+      let isPreview = 0;
+
+      //边框
+      let borderRL = this.contStyleBorder * 2;
+
+      if(type === 'ske') borderRL = 0;
+      borderRL = borderRL * this.column_num;
+
+      //商品内边距设置
+      let str = this.getMarginAndPadding(this.itemPadding,20);
+      if(type === 'poster')   str = 0;//广告模式
+
+      let otherWidth = (outMarginRL + outPaddingRL + columnSpacing + isPreview + borderRL + paddingRL);
+
+      return {
+        marginBottom: this.rowSpacing + 'rpx',
+        width: (outWidth - otherWidth)/this.column_num + 'rpx',
+        borderRadius: this.radius + 'rpx',
+        boxShadow: '0 0 10rpx rgba(0,0,0,.08)',
+        padding: str,
+        backgroundColor: 'rgba(255,255,255,.8)'
+      };
+    },
+  }
+
+}