jufubao-base 1.0.237-beta18 → 1.0.237-beta3

package/src/components/JfbBaseUserOrder/Attr.js

@@ -21,21 +21,6 @@ export default {
         groupKey:'advanced',
       },
       {
-        label: '是否展示我的订单:',
-        ele: 'xd-radio',
-        valueKey: 'isShowMyOrder',
-        value: data['isShowMyOrder'] || 'Y',
-        placeholder: '请选择是否展示我的订单',
-        groupKey:'content',
-        multiple: false,
-        labelInline:true,
-        className: 'input80',
-        list: [
-          {label: '展示', value: 'Y'},
-          {label: '隐藏', value: 'N'},
-        ]
-      },
-      data['isShowMyOrder']==='Y'&&{
         label: '我的订单自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -116,7 +101,6 @@ export default {
               {"label": "待收货", "value": 'unreceived'},
               {"label": "已取消", "value": 'cancel'},
               {"label": "已完成", "value": 'com'},
-              {"label": "售后", "value": 'afterSale'},
             ])
           }
         },

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -16,9 +16,8 @@
     <view class="jfb-base-user-order__body">
       <view class="x-line"></view>
       <view :style="[bodyStyleComp]" v-if="list.length > 0">
-        <view v-if="isShowMyOrder==='Y'||isShowBtn === 'Y'" class="my-order__add" :style="[titleMarginComp]">
-          <view v-if="isShowMyOrder==='Y'" :style="[titleStyleComp]">{{myOrderName}}</view>
-          <view v-else></view>
+        <view class="my-order__add" :style="[titleMarginComp]">
+          <view :style="[titleStyleComp]">{{myOrderName}}</view>
           <view
             v-if="isShowBtn === 'Y'"
             @click="handleToLink(afterUrl)"
@@ -180,7 +179,6 @@
         cardNameColor: '#333',
         titleStyle: {},
         titleMargin:{},
-        isShowMyOrder: '',
 
         //售后订单
         isShowBtn:'Y',
@@ -276,7 +274,6 @@
 
 
         //标题
-        this.isShowMyOrder = getContainerPropsValue(container, 'content.isShowMyOrder', 'Y');
         this.myOrderName = getContainerPropsValue(container, 'content.myOrderName', '我的订单')
         this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
         this.titleMargin = getContainerPropsValue(container,'content.titleMargin', {})
@@ -336,12 +333,6 @@
 
       handleToLink(path, type) {
         if (this.$configProject['isPreview']) return;
-        if(type==='afterSale'){
-          this.$xdUniHelper.navigateTo({
-            url: this.afterUrl
-          })
-          return
-        }
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -95,7 +95,6 @@
         policyContent: "",
         policyTitle: "",
         policyList: [],
-        share_code: "",
 
         //面板
         bgImage: '', //背景图片
@@ -180,7 +179,6 @@
             raw_data,
             auth_code: this.auth_code,
             provider_id: this.provider_id,
-            share_code: this.share_code,
           }
         }).then(res=>{
           if(this.jfbAuthorize !== null) {
@@ -227,7 +225,6 @@
                 raw_data,
                 third_auth_code: loginRes.code,
                 provider_id: this.provider_id,
-                share_code: this.share_code,
               }
             }).then(res => {
               this.$xdUniHelper.redirectTo({
@@ -256,13 +253,6 @@
           this.auth_code = options.auth_code;
           this.provider_id = options.provider_id;
           if(options.url) this.nextUrl = Base64.decode(options.url);
-          if(options['x-common']){
-            let decodeParams = Base64.decode(options['x-common']);
-            try{
-              let commonParams = JSON.parse(decodeParams);
-              this.share_code = commonParams.share_code;
-            }catch(e){}
-          }
         }
         jfbRootExec("getContentInfo", {
           vm: this,

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,
-  },
-];