jufubao-base 1.0.237-beta2 → 1.0.237-beta3

package/src/mixins/componentsMixins.js

@@ -5,6 +5,7 @@ import {mapActions,mapState, mapMutations} from "vuex";
 import helper from "@/utils/helper";
 import store from "@/store/index";
 import getServiceUrl from "@/common/getServiceUrl"
+import {parsePath} from "@/utils/linkUrl";
 
 
 export default {
@@ -136,7 +137,11 @@ export default {
         "op_user_id": "",
         "created_time": 0,
         "updated_time": 0
-      }
+      },
+
+      //全局样式
+      gStyleValue:{},
+      gOrgStyleValue:{},
     }
   },
 
@@ -164,6 +169,12 @@ export default {
     if (this.$vnode && this.$vnode.tag) tag = this.$vnode.tag;
     this.$xdLog.setProject('App.components.start', `App.components.vnode.name.${tag}`);
 
+    //全局样式处理
+    if(this.pageAttr['configs']['default_style']) {
+      this.gOrgStyleValue = this.$xdUniHelper.cloneDeep(this.pageAttr['configs']['default_style']);
+      this.setGStyleValue(this.pageAttr['configs']['default_style']);
+    }
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -285,7 +296,8 @@ export default {
   computed:{
     ...mapState({
       pageNamespace: state=> state.pageBusinessCode,
-    })
+      jfbAuthorize: state=> state.jfbAuthorize,
+    }),
   },
 
   watch:{
@@ -298,6 +310,48 @@ export default {
     ...mapActions(['setXNamespace','setStyleCommon','wxCodeForGetAppId']),
     ...mapMutations(['setCurrentStyle']),
 
+    /**
+     * @description 设置全局样式
+     * @param data
+     */
+    setGStyleValue(data){
+
+      function objFn(mpObj){
+        if(mpObj['type'] === 'D') return {top: 0, left: 20, right: 20, bottom:20};
+        else {
+          Object.keys(mpObj['custom']).map(key=>{
+            if(mpObj['custom'][key] === -999999) mpObj['custom'][key] = 0;
+          })
+        }
+        return  mpObj['custom'];
+      }
+      let temp = {};
+      Object.keys(data).map(key=>{
+        if(key === 'padding' || key === 'margin') {
+          temp[key] = objFn(data[key]);
+        }
+        else if(key === 'shadow') {
+          if(data['type'] === 'D') temp['shadow'] = 'none';
+          else {
+            if(data[key]['custom'] && data[key]['custom']['color']) {
+              temp['shadow'] = `0 0 ${data[key]['custom']['width']}rpx ${data[key]['custom']['color']}`
+            }
+            else  temp['shadow'] = 'none';
+          }
+        }
+        else if(key === 'background') {
+          if(data['type'] === 'D') temp['background'] = 'none';
+          else {
+            if(data[key]['custom']) {
+              temp['background'] = data[key]['custom']
+            }
+            else  temp['background'] = 'none';
+          }
+        }
+      });
+      this.gStyleValue = this.$xdUniHelper.cloneDeep(temp);
+    },
+
     /**
      * @description 自动生成调试模式
      */
@@ -315,8 +369,6 @@ export default {
       }
     },
 
-
-
     /**
      * @description 检查是否同域名
      * @param url
@@ -459,12 +511,14 @@ export default {
      * @description 点击选择插件显示边框
      */
     handleEditxSelect() {
+
       //加载本地业务插件库
       if (this.noBorder) return;
 
       //#ifdef H5
       if (this.active) return;
       this.active = true;
+
       let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
         this.$xdUniHelper.customClone(this.Attr) : {style: [], advanced: [], content: []};
 
@@ -474,10 +528,16 @@ export default {
         if (type === 'style' || type === 'advanced' || type === 'content') {
           if (typeof AttrObj[type] === "function") {
             let params = getContainerFnPropsValue(this.container, `${type}`);
+            //默认样式设置
+            let defaultGValue = this.$xdUniHelper.cloneDeep(this.gStyleValue);
+            //是否为添加组件操作
+            defaultGValue['isAdd'] = this.container.isAdd === true;
+            //面板首次加载
+            defaultGValue['isFirst'] = true;
             let Attr = this.$xdUniHelper.customClone(this.Attr);
             AttrObj[`${type}.isFn`] = true;
             AttrObj[`${type}.Fn`] = Attr[type];
-            AttrObj[type] = Attr[type](params);
+            AttrObj[type] = Attr[type](params, defaultGValue);
           } else {
             AttrObj[type].map(item => {
               if (item.value !== undefined) {
@@ -493,10 +553,12 @@ export default {
       });
 
       //发送点击组件事件
+      let sendContainer = this.$xdUniHelper.cloneDeep(this.container);
+      sendContainer.defaultData = this.$xdUniHelper.cloneDeep(this.gStyleValue||{});//设置全局默认值
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: this.$xdUniHelper.customClone(AttrObj),
-        container: this.$xdUniHelper.cloneDeep(this.container)
+        container: sendContainer
       });
 
       //绑定选中插件事件
@@ -735,6 +797,7 @@ export default {
       let showActivityPrice = getContainerPropsValue(container, "content.showActivityPrice", "N");
       let isShowTag = getContainerPropsValue(container, "content.isShowTag", "Y");
       let isAddCart = getContainerPropsValue(container, "content.isAddCart", "N");
+      let showFreeShipping = getContainerPropsValue(container, "content.showFreeShipping", "N");
       return {
         isShowDiscount: isShowDiscount,
         isPrice: isPrice,
@@ -743,6 +806,7 @@ export default {
         showActivityPrice:showActivityPrice,
         isShowTag : isShowTag,
         differ: differ,
+        showFreeShipping: showFreeShipping
       }
     },
 
@@ -907,30 +971,55 @@ export default {
       }
     },
 
-    handleH5ToMP(app_id,url,params){
-      debugger
+    getProductTagsParams(conf=null,data={}){
+      var temp = [];
+      let defaultValue = {
+        isShowTag:"market",
+        showActivityPrice:"flashsale",
+        showTag: "market",
+      }
+      try{
+        if(conf) {
+          conf = JSON.parse(conf).value;
+          conf={
+            ...defaultValue,
+            ...conf,
+          }
+          Object.keys(data).map(key=>{
+            if(data[key] === 'Y') {
+              temp.push(conf[key]);
+            }
+          })
+        }
+        else {
+          temp = [];
+        }
+      }catch(e){
+        temp = []
+      }
+      return temp
     },
-
-    handleMpToMP(app_id,url,params){
-
+    getProductTagsKeys(conf=null,container,type='productList'){
+      let defaultValue
+      if(type==='productList' ){
+        defaultValue = ["isShowTag","showActivityPrice"]
+      } else {
+        defaultValue = ["showTag","showActivityPrice"]
+      }
+      try{
+        if(conf) conf = JSON.parse(conf).keys;
+        else conf = []
+      }catch(e){
+        conf = []
+      }
+      conf = conf.concat(defaultValue)
+      let tagList = {}
+      conf.map(item=>{
+        tagList[item] = getContainerPropsValue(container, `content.${item}`, "N");
+      })
+      return tagList
     },
-    /**
-     * @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)
-       })
-    }
+
   }
 }
 

package/src/components/JfbBaseBalance/Api.js

@@ -1,46 +0,0 @@
-'use strict';
-/**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Points
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: 'getListBaseNewsContent', //自定义方法名字（必选）
-    title: '获取内容',
-    path: '/cms/v1/news-content',
-    isRule: false,
-    params: {
-      scene: ['使用场景', 'String', '选填'],
-      container_id: ['插件ID', 'String', '必填'],
-      page_id: ['页面ID', 'String', '必填'],
-      page_size: ['记录条数', 'Number', '必填', 1],
-      code: ['业务线id', 'String', '选填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'getBalanceDetail',
-    title: '用户资产 - 获取钱包(或积分)余额详情',
-    path: '/pay/v1/property/wallet-detail',
-    isRule: false,
-    params: {
-      method: ['wallet 余额; score 积分;', 'Number', '非必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'getBalanceWalletTradeList',
-    title: '用户资产 - 获取钱包(或积分)交易记录列表',
-    path: '/pay/v1/property/wallet-trade/list',
-    isRule: false,
-    params: {
-      wallet_type: ['钱包类型', 'Number', '必选'],
-      page_size: ['每页条数', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];

package/src/components/JfbBaseBalance/Attr.js

@@ -1,316 +0,0 @@
-'use strict';
-
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
-export default {
-  style: [],
-  content: (data) => {
-    return [
-      {
-        label: '外边距:',
-        ele: 'xd-margin-padding',
-        valueKey: 'bodyMargin',
-        groupKey: 'style',
-        value: data['bodyMargin'] || null,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
-      },
-      {
-        label: '外填充:',
-        ele: 'xd-margin-padding',
-        valueKey: 'bodyPadding',
-        groupKey: 'style',
-        value: data['bodyPadding'] || null,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置外填充',
-        inline: false,
-        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
-      {
-        label: '圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '20',
-        labelInline: true,
-        groupKey: 'style',
-        placeholder: '请选择圆角设置',
-        multiple: false,
-        className: 'input60',
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius',
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: "边框设置:",
-        ele: "xd-border",
-        valueKey: "bodyBorder",
-        value: data['bodyBorder'] || { type: 'Y', value: { color: '#eee', style: "solid", width: '1' } },
-        className: 'input80',
-        groupKey: 'style',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        groupKey: 'style',
-        value: data['bgColor'] || null,
-        placeholder: '请选择背景颜色',
-        labelInline: true,
-        classNmae: 'input80',
-      },
-      {
-        label: '公告内容:',
-        ele: 'xd-site-news',
-        valueKey: 'notice',
-        groupKey: 'content',
-        value: data.notice || null,
-        className: 'input70',
-        setting: {
-          config: {
-            sort: true,
-            maxlen: 100,
-            action: 'aliyun',
-            size: 5,
-            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-            uploadType: 'aliyun',
-            type: ['jpg', 'png', 'jpeg']
-          },
-        },
-        handleCustom({ action, data }) {
-          if (data && data.params) {
-            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-          }
-
-          //获取返回参数(场景类型名称为必填)
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close() { } }
-
-          //获取显示内容
-          if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
-              .then(res => {
-                loading.close();
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-              });
-
-          }
-
-          //获取返回参数(广告位高度必选项)
-          if (action === 'getNewsInfo') {
-            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-              .then(res => {
-                loading.close()
-                data.cb({ list: res.list, selectId: res.selected })
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //获取产品业务线列表
-          if (action === 'namespace') {
-            XdBus.getParentApi('getOptionsNamespaces')({})
-              .then(res => {
-                loading.close()
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //使用内容分类
-          if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-              .then(res => {
-                console.log('cmsPublishEditxContent', res)
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置列表
-          if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置编辑
-          if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置删除
-          if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告位内容列表
-          if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容编辑
-          if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容删除
-          if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //内容发布
-          if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
-            console.log('publish', data.params)
-            XdBus.getParentApi('cmsPublishContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //通知页面进行刷新
-          if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
-      },
-      {
-        label: '提现入口路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'withDrawRoutePath',
-        groupKey:'advanced',
-        placeholder: '请选择提现入口路径',
-        value: data['withDrawRoutePath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-    ].filter(i => i)
-  },
-  advanced: [],
-};