jufubao-base 1.0.169-beta9 → 1.0.170

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -4,17 +4,7 @@ import { getContainerPropsValue } from "@/utils/xd.base";
 export default {
   data(){
     return {
-      isShowExchange:'N',
-
-      contMargin:{},
-      contRradius:'10',
-      contShadow:'',
-      contBorder:'',
-      contBgColor:'',
-      contBorderWidth: 0,
-
-      imgRradius:'10',
-
+      listItemStyle:null,
       productConfig:null,
     }
   },
@@ -24,7 +14,6 @@ export default {
   methods:{
 
     cusInit(container){
-      this.isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
 
       //商品相关
       let is_show_brand = getContainerPropsValue(container, 'content.is_show_brand', 'N');
@@ -34,41 +23,60 @@ export default {
       let isAddCart = getContainerPropsValue(container, 'content.isAddCart', "Y");
       let differ = getContainerPropsValue(container, 'content.differ', 1);
       let showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
-      this.productConfig = {is_show_brand,isPrice,isShowTag,isShowDiscount,isAddCart,differ,showActivityPrice}
+      let isShowExchange = getContainerPropsValue(container, 'content.isShowExchange', 'N');
+      this.productConfig = {is_show_brand, isPrice, isShowTag, isShowDiscount, isAddCart, differ, showActivityPrice, isShowExchange};
 
       //内容
-      this.contMargin =  getContainerPropsValue(container, 'content.contMargin', {});
-      this.contRradius =  getContainerPropsValue(container, 'content.contRradius', '10');
-      this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
-      this.contBorder = this.getXdBorder({width:2,color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contBorder', {}));
-      this.contBgColor = getContainerPropsValue(container, 'content.contBgColor', '#fff');
-      this.contObjBorder = getContainerPropsValue(container, 'content.contBorder', {});
-      if(this.contObjBorder && this.contObjBorder.type === 'Y') {
-        if(this.contObjBorder.value && this.contObjBorder.value.width) {
-          this.contBorderWidth = Number(this.contObjBorder.value.width);
+      let brandColor = getContainerPropsValue(container, 'content.brandColor', '#aaa');
+      let imgRradius = getContainerPropsValue(container, 'content.imgRradius', '10');
+      let contMargin =  getContainerPropsValue(container, 'content.contMargin', {});
+      let contRradius =  getContainerPropsValue(container, 'content.contRradius', '10');
+      let contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
+      let contBorder = this.getXdBorder({width:2,color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contBorder', {}));
+      let contBgColor =  getContainerPropsValue(container, 'content.contBgColor', '#fff');
+      let contObjBorder = getContainerPropsValue(container, 'content.contBorder', {});
+      let contBorderWidth = 0
+      if(contObjBorder && contObjBorder.type === 'Y') {
+        if(contObjBorder.value && contObjBorder.value.width) {
+          contBorderWidth = Number(contObjBorder.value.width);
         }
-        else this.contBorderWidth = 2;
+        else contBorderWidth = 2;
       }
+      this.listItemStyle = {
+        outSpacing: this.outSpacing,
+        mainColor: this.mainColor,
+        subMainColor: this.subMainColor,
+        successColor: this.successColor,
+        brandColor,imgRradius,contMargin,contRradius,contShadow,contBorder,contBgColor,contObjBorder,contBorderWidth}
+    },
 
-      //图片
-      this.imgRradius = getContainerPropsValue(container, 'content.imgRradius', '10');
-
+    filtersResData(res){
+      let list = res.list.filter(item=>{
+        return item.items.length > 0
+      });
+      if(res.list.length  === list.length) return res;
+      let tabs = list.map(item=>{
+        return {
+          label: item.name,
+          value: item.tab
+        }
+      });
+      return {...res, list, tabs}
     },
 
 
     //通信相关================
     handleParentVm(cb){
-      cb(this)
+      cb(this.emitParent.options.getParent)
     },
 
     onJfbReachBottom(options) {
-      console.log('event.onJfbReachBottom', options)
-      this.$refs['customList']['onCusReachBottom'](options)
-
+      if(this.tabId !== "all") {
+        this.$refs['customList']['onCusReachBottom'](options)
+      }
     },
 
     onCusReload() {
-      console.log('event.onCusReload', this.options)
       this.$refs['customList']['onCusReloadList'](this.options)
     },
     //通信相关================
@@ -76,52 +84,40 @@ export default {
     //cinema/film/shop/product
 
     //影片列表事件
-    handleFilmDetail(film_id,film){
-      // console.warn(`toFilmInfo(影片详情).${film_id}`)
-      // if(!this.fimeDetailPath) {
-      //   console.error('未配置链接');
-      //   return;
-      // }
-      // if( this.isPreview) return;
-      // this.$xdUniHelper.navigateTo({
-      //   url: this.fimeDetailPath + `?film_id=${film_id}`
-      // })
+    handleFilmDetail(item,film){
+      console.warn(`handleFilmDetail(影片详情).${item.film_id}`)
+      this.checkUrlError(item, film,(url)=>{
+        url = url + `?film_id=${item.film_id}`;
+        console.warn(`handleFilmDetail.url:${url}`)
+        this.toLink(url)
+      },'detail1_redirect_data');
     },
-    handleBuy(film_id,film){
-      // console.warn(`toBuyChooseCinema(选择影院).${film_id}`)
-      // if(!this.buyPath) {
-      //   console.error('未配置链接');
-      //   return;
-      // }
-      // if( this.isPreview) return;
-      // this.$xdUniHelper.navigateTo({
-      //   url: this.buyPath + `?film_id=${film_id}`
-      // })
+    handleBuy(item,film){
+      console.warn(`handleBuy(购买详情).${item.film_id}`)
+      this.checkUrlError(item, film,(url)=>{
+        url = url + `?film_id=${item.film_id}`;
+        console.warn(`handleBuy.url:${url}`)
+        this.toLink(url)
+      });
     },
     //影片列表事件
 
     //影院列表事件
     handleSchedule(item, cinema){
-      // console.warn(`handleSchedule(选择排期).${item.cinema_id}`)
-      // if(!this.onlinePath) {
-      //   console.error('未配置链接');
-      //   return;
-      // }
-      // if( this.isPreview) return;
-      // this.$xdUniHelper.navigateTo({
-      //   url: this.onlinePath + `?cinema_id=${item.cinema_id}`,
-      // });
+      console.warn(`handleSchedule(去排期页面).${item.cinema_id}`);
+      this.checkUrlError(item, cinema,(url)=>{
+        url = url + `?cinema_id=${item.cinema_id}`;
+        console.warn(`handleSchedule.url:${url}`)
+        this.toLink(url)
+      });
     },
     handleCodeDetail(item, cinema){
-      // console.warn(`handleCodeDetail(选择电子码列表).${item.cinema_id}`)
-      // if(!this.codePath) {
-      //   console.error('未配置链接');
-      //   return;
-      // }
-      // if( this.isPreview) return;
-      // this.$xdUniHelper.navigateTo({
-      //   url: this.codePath + `?cinema_id=${item.cinema_id}`,
-      // });
+      console.warn(`handleCodeDetail(电子列表).${item.cinema_id}`);
+      this.checkUrlError(item, cinema,(url)=>{
+        url = url + `?cinema_id=${item.cinema_id}`;
+        console.warn(`handleSchedule.url:${url}`)
+        this.toLink(url)
+      },'detail1_redirect_data');
     },
     handleCashierDetail(item, cinema){
       //todo
@@ -130,22 +126,62 @@ export default {
 
     //门店列表事件
     handleShopJhd(item, shop){
-       debugger
+      console.warn(`handleShopJhd(去核销).${item.resource_shop_name}`)
+      this.checkUrlError(item, shop,(url)=>{
+        let params = {
+          'x-params':Base64.encodeURI(`shop_id:${item.shop_id}`),
+          'x-jfb-os':'jhd',
+        }
+        params = this.$xdUniHelper.jsonToParams(params);
+        url = url + `?${params}`;
+        console.warn(`handleShopJhd.url:${url}`)
+        this.toLink(url)
+      },'detail1_redirect_data');
     },
     handleShopDetail(item, shop){
-      debugger
+      console.warn(`handleShopDetail(店铺详情).${item.resource_shop_name}`)
+      this.checkUrlError(item, shop,(url)=>{
+        url = url + `?resource_shop_id=${item.resource_shop_id}`;
+        if(item['exts_params']) {
+          url = url + `&exts_params=${item['exts_params']}`
+        }
+        console.warn(`handleShopDetail.url:${url}`)
+        this.toLink(url)
+      });
     },
     //门店列表事件
 
     //商品链接事件
     handleProductDetail(item, product){
-      let url = this.checkUrlIsValid(product.detail_redirect_data)
-      if(product.detail_redirect_data) {
+      console.warn(`handleProductDetail(商品详情).${item.product_id}`)
+      this.checkUrlError(item, product,(url)=>{
+        url = url + `?product_id=${item.product_id}`;
+        console.warn(`handleProductDetail.url:${url}`)
+        this.toLink(url)
+      });
+    },
+    //商品链接事件
 
+    //检查错误跳转
+    checkUrlError(item, config, cb , key='detail_redirect_data'){
+      if(!config[key]) {
+        console.error('未配置链接');
+        return false;
       }
-      debugger
+      if( this.isPreview) return false;
+      let url = this.checkUrlIsValid(config[key]);
+      if(url === null) {
+        console.error('配置链接格式错误');
+        console.warn(`配置链接：${config[key]}`);
+        return false;
+      }
+      cb(url)
+    },
+
+    //跳转页面
+    toLink(url) {
+      this.$xdUniHelper.navigateTo({url});
     }
-    //商品链接事件
   },
 }
 

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -170,10 +170,11 @@
         if (this.jfbAuthorize !== null) {
           this.$xdShowLoading({});
           store.dispatch('logout').then(res=>{
+            let url = this.$configProject.entry || `/${this.projectAttr.deploy_dir}/`;
             this.$xdHideLoading();
             this.jfbAuthorize.removeAllCardToken();
             this.jfbAuthorize.removeAllToken()
-            this.jfbAuthorize.jumpToUserLogin(this, false);
+            this.jfbAuthorize.jumpToUserLogin(this, false, url);
           }).catch(err=>{
             console.error(err);
           })

package/src/mixins/componentsMixins.js

@@ -560,7 +560,7 @@ export default {
       //#endif
     },
 
-    getUrlHasSpStr(pathDir){
+    getUrlHasSpStrDIR(pathDir){
       if(pathDir.indexOf('@site_domain@/') === 0) {
         return pathDir.replace('@site_domain@/','').split('/')[0]
       }
@@ -569,18 +569,48 @@ export default {
 
     /**
      * @description 过滤不可以用
-     * 当前项目未H5时,过滤所有小程序应用
-     * 当前项目未小程序时,过滤所有非当前小程序应用
+     * 当前项目为H5时,过滤所有小程序应用
+     * 当前项目为小程序时,过滤所有非当前小程序应用
      * 站外地址直接返回
      * 站内地址未选值直接返回
      * 预览模式全过
      * @param url {object}
      */
     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;
       try {
+        let redirect_data = JSON.parse(url);
+        if(!redirect_data['appType']) redirect_data['appType']= 'h5';
+
+        //#ifdef H5
+        if(redirect_data['appType'] === 'wxmp') return null;
+        else {
+          if(redirect_data.dir === projectAttr.deploy_dir) {
+            return redirect_data.path
+          }
+          else {
+            return `//${projectAttr.host}/${redirect_data.frontPath}`
+          }
+
+        }
+        //#endif
 
+        //#ifdef MP-WEIXIN
+
+        let dir = this.getUrlHasSpStrDIR(redirect_data.path);
+        if(redirect_data['appType'] === 'wxmp'){
+          if(projectAttr.deploy_dir === dir) return redirect_data.path;
+          else return null;
+        }
+        else if(redirect_data['appType'] === 'h5'){
+
+        }
+        else return null;
+        //#endif
       }catch (e){
+        console.error(e);
         return null;
       }
       // let content = list.filter(item=>{

package/src/mixins/posterMixins.js

@@ -0,0 +1,122 @@
+'use strict';
+
+export default {
+  methods:{
+    /**
+     * @description 过滤不可以用
+     * 当前项目未H5时,过滤所有小程序应用
+     * 当前项目未小程序时,过滤所有非当前小程序应用
+     * 站外地址直接返回
+     * 站内地址未选值直接返回
+     * 预览模式全过
+     */
+    posterFilterNoUseData(list = []){
+      let content = this.$xdUniHelper.cloneDeep(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.getPosterPathDir(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;
+
+    },
+
+    getPosterPathDir(pathDir){
+      if(pathDir.indexOf('@site_domain@/') === 0) {
+        return pathDir.replace('@site_domain@/','').split('/')[0]
+      }
+      return ''
+    },
+
+    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(`无跳转地址`);
+      }
+    },
+  },
+}
+