jufubao-base 1.0.195 → 1.0.196-beta101

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -18,10 +18,9 @@
       <view
         class="jfb-base-user-info__body-header"
         :style="{
-          margin: outMargin,
-          background:backgroundColor,
-          color: color,
-          padding: outPadding,
+          margin: marginComp,
+          background : backgroundColor,
+          padding: paddingComp,
           boxShadow: shadow,
           borderRadius: radius + 'rpx',
           border: borderBox
@@ -34,26 +33,26 @@
         >
           <template v-if="logined">
             <image v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
-            <view class="no-image" :style="{borderColor: color}" v-else>
-              <xd-font-icon :color="color" icon="iconwode_mian" size="100"></xd-font-icon>
+            <view class="no-image" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else>
+              <xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>
           </template>
-          <view v-else class="no-image" :style="{borderColor: color}">
-            <xd-font-icon :color="color" icon="iconwode_mian" size="90"></xd-font-icon>
+          <view v-else class="no-image" :style="{borderColor: imageColor, borderRadius:imageRadius}">
+            <xd-font-icon :color="imageColor" icon="iconwode_mian" size="90"></xd-font-icon>
           </view>
-          <view v-if="logined && textType ==='N'" :style="{color:color}">{{userInfo|getName}}</view>
-          <view class="vertical-user" v-if="logined && textType ==='Y'" :style="{color:color}">
-            <view>{{userInfo|getName}}</view>
+          <view v-if="logined && textType ==='N'" :style="[nickNameStyle]">{{userInfo|getName}}</view>
+          <view class="vertical-user" v-if="logined && textType ==='Y'">
+            <view :style="[nickNameStyle]">{{userInfo|getName}}</view>
             <view class="logout" @click="handleLogout()">
-              <view :style="{color:color}">[退出登录]</view>
+              <view :style="[logoutStyleComp]">{{logoutName}}</view>
             </view>
-            <view @click="handleToLink()" v-if="0">
-              <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
+            <view @click="handleToLink()" v-if="isSetting === 'Y'">
+              <xd-font-icon size="26" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
         <view @click="handleLogout()" v-if="logined && textType ==='N'" class="logout">
-          <view :style="{color:color}">[退出登录]</view>
+          <view :style="[logoutStyleComp]">{{logoutName}}</view>
         </view>
       </view>
     </view>
@@ -79,14 +78,14 @@
     computed: {
       ...mapState(['jfbAuthorize']),
 
-      outMargin() {
+      marginComp() {
         let str = `${this.checkValue(this.margin.top, 20)}rpx`;
         str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
         str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
         str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
         return str
       },
-      outPadding() {
+      paddingComp() {
         let str = `${this.checkValue(this.padding.top, 20)}rpx`;
         str = `${str} ${this.checkValue(this.padding.right, 20)}rpx`;
         str = `${str} ${this.checkValue(this.padding.bottom, 20)}rpx`;
@@ -98,8 +97,22 @@
         else return '0 0 0 rgba(0,0,0,0)';
       },
       borderBox(){
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        if (this.is_border === 'Y') return `${this.is_border_w}rpx ${this.is_border_s} ${this.is_border_c}`;
         else return '0';
+      },
+      nickNameStyle(){
+        return {
+          fontSize: this.nickStyle.fontSize || '32rpx',
+          color: `${this.nickStyle.color || '#333'}`,
+          fontWeight: `${this.nickStyle.fontWeight || 'normal'}`,
+        }
+      },
+      logoutStyleComp(){
+        return {
+          fontSize: this.logoutStyle.fontSize || '20rpx',
+          color: `${this.logoutStyle.color || '#333'}`,
+          fontWeight: `${this.logoutStyle.fontWeight || 'normal'}`,
+        }
       }
     },
     filters:{
@@ -111,39 +124,32 @@
       return {
         logined: false,
         userInfo: null,
-        address_url: '',
+        isSetting:'N',
+        logoutName:'[退出登录]',
+        imageRadius:'50%',
 
         //基础
-        color: '#333',
+        imageColor: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         textType: 'N', //默认水平
         radius: 0,
 
         //投影
-        is_shadow: 'Y',
+        is_shadow: 'N',
         is_shadow_bg: 0,
         is_shadow_w: 0,
 
-
         //边框
-        is_border: 'Y',
+        is_border: 'N',
         is_border_w: 0,
         is_border_c: '',
+        is_border_s:'solid',
 
         //其他
-        margin: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0
-        },
-        padding: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0
-        },
-
+        margin: {},
+        padding: {},
+        nickStyle:{},
+        logoutStyle:{},
       }
     },
     watch: {
@@ -216,21 +222,44 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.margin = getContainerPropsValue(container, 'content.margin', {top: 20, left: 20, right: 20, bottom: 20});
-        this.padding = getContainerPropsValue(container, 'content.padding', {top: 20, left: 20, right: 20, bottom: 20});
-        this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
-        this.color = getContainerPropsValue(container, 'content.textColor', '#333');
+        this.margin = getContainerPropsValue(container, 'content.margin', {});
+        this.padding = getContainerPropsValue(container, 'content.padding', {});
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
         this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
+        this.radius = getContainerPropsValue(container, 'content.radius', '10');
+        this.isSetting = getContainerPropsValue(container, 'content.isSetting', 'N');
+        this.logoutName = getContainerPropsValue(container, 'content.logoutName', '[退出登录]');
+        this.imageRadius = getContainerPropsValue(container, 'content.imageRadius', '50%');
+        this.imageColor = getContainerPropsValue(container, 'content.imageColor', '#333');
 
+        //Shadow
+        this.contShadow = getContainerPropsValue(container, 'content.contShadow', {})
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
         this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
+        if(this.contShadow.type === 'Y') {
+          this.is_shadow = 'Y';
+          if(this.contShadow.value && this.contShadow.value.width) this.is_shadow_w = this.contShadow.value.width;
+          if(this.contShadow.value && this.contShadow.value.color) this.is_shadow_bg = this.contShadow.value.color;
+        }
 
+        //边框
+        this.contBorder = getContainerPropsValue(container, 'content.contBorder', {});
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 0);
-        this.radius = getContainerPropsValue(container, 'content.radius', '10');
+        this.is_border_s = 'solid';
+        if(this.contBorder.type === 'Y') {
+          this.is_border = 'Y';
+          if(this.contBorder.value && this.contBorder.value.width) this.is_border_w = this.contBorder.value.width;
+          if(this.contBorder.value && this.contBorder.value.color) this.is_border_c = this.contBorder.value.color;
+          if(this.contBorder.value && this.contBorder.value.style) this.is_border_s = this.contBorder.value.style;
+
+        }
+
+        this.nickStyle = getContainerPropsValue(container, 'content.nickStyle', {});
+        this.logoutStyle = getContainerPropsValue(container, 'content.logoutStyle', {});
+
       },
     }
   }
@@ -245,7 +274,15 @@
     justify-content: center;
     align-items: center;
     & > view:nth-child(2) {
-      margin-left: unit(10, rpx);
+      margin-left: unit(15, rpx);
+    }
+    & > view:nth-child(3) {
+      width: 26rpx;
+      height: 26rpx;
+      margin-left: unit(15, rpx);
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
   }
 
@@ -281,8 +318,7 @@
           & > image, .no-image {
             width: unit(140, rpx);
             height: unit(140, rpx);
-            margin-right: unit(30, rpx);
-            border-radius: 50%;
+            margin-right: unit(30, rpx);;
             display: flex;
             justify-content: center;
             align-items: center;

package/src/components/JfbBaseUserOrder/Attr.js

@@ -1,4 +1,5 @@
 'use strict';
+import ICONS from '@/ICONS'
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -13,6 +14,69 @@ export default {
         slot: 'is_reference_title',
         groupKey:'advanced',
       },
+      {
+        label: '我的订单自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'myOrderName',
+        groupKey:'content',
+        value: data['myOrderName'] || '',
+        placeholder: '请输入我的订单自定义名称',
+        className: 'input80',
+        rules: [
+          {
+            required: false,
+            validator: (rule, value, callback) => {
+              value = value.trim();
+              if(value.length === 0) return callback()
+              if (value.length < 1 || value.length > 4) callback('我的订单自定义名称长度为：1-4字符');
+              else callback()
+            },
+            trigger: 'blur'
+          }
+        ],
+        notice: '我的订单自定义名称设置，默认值：<span style="color:red">我的订单</span>，长度为：1-4字符',
+        inline: false,
+      },
+      {
+        label: '是否售后订单:',
+        ele: 'xd-radio',
+        valueKey: 'isShowBtn',
+        value: data['isShowBtn'] || 'Y',
+        placeholder: '请选择是否售后订单',
+        groupKey:'content',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
+      data['isShowBtn'] === 'Y' && {
+        label: '售后订单自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'afterBuyName',
+        groupKey:'content',
+        value: data['afterBuyName'] || '',
+        placeholder: '请输入售后订单自定义名称',
+        className: 'input80',
+        rules: [
+          {
+            required: false,
+            validator: (rule, value, callback) => {
+              value = value.trim();
+              if(value.length === 0) return callback()
+              if (value.length < 1 || value.length > 4) callback('售后订单自定义名称长度为：1-4字符');
+              else callback()
+            },
+            trigger: 'blur'
+          }
+        ],
+        notice: '售后订单自定义名称设置，默认值：<span style="color:red">售后订单</span>，长度为：1-4字符',
+        inline: false,
+      },
       {
         label: '设置订单状态:',
         ele: 'xd-order-setting',
@@ -21,6 +85,7 @@ export default {
         value: data['orderTypeList'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
+          icons:ICONS,
         },
         handleCustom({action, data}) {
           if (action === 'number') {
@@ -39,10 +104,30 @@ export default {
           {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
         ],
       },
+      {
+        label: '标题与内容行间距:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'spacing',
+        groupKey:'style',
+        value: data.spacing || '',
+        placeholder: '请输入标题与内容行间距',
+        className: 'input60',
+        inline: false,
+        notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+
+      {
+        ele: 'title',
+        label: '基础设置',
+        size: 'small',
+        groupKey:'style',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         groupKey:'style',
+        labelInline:true,
         valueKey: 'bodyBackgroundColor',
         value: data['bodyBackgroundColor'] || null,
         placeholder: '请选择背景颜色',
@@ -51,6 +136,7 @@ export default {
       {
         label: '圆角设置:',
         groupKey:'style',
+        labelInline:true,
         ele: 'xd-site-select-list',
         valueKey: 'bodyRadius',
         value: data['bodyRadius'],
@@ -67,18 +153,6 @@ export default {
             });
         },
       },
-      {
-        label: '间距:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'spacing',
-        groupKey:'style',
-        value: data.spacing || '',
-        placeholder: '请输入间距',
-        className: 'input60',
-        inline: false,
-        notice: '设置间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
       {
         label: '外边距:',
         ele: 'xd-margin-padding',
@@ -93,7 +167,7 @@ export default {
         notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: '填充:',
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'bodyPadding',
         groupKey:'style',
@@ -103,7 +177,51 @@ export default {
         },
         placeholder: '请设置外填充',
         inline: false,
-        notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '标题边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'titleMargin',
+        groupKey:'style',
+        value: data['titleMargin'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置标题边距',
+        inline: false,
+        notice: '设置标题边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+
+      {
+        ele: 'title',
+        label: '我的订单设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: "样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'titleStyle',
+        value: data['titleStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
       },
       {
         label: '标题样式颜色:',
@@ -113,32 +231,135 @@ export default {
         value: data['cardNameColor'] || null,
         placeholder: '请选择标题样式颜色',
         classNmae: 'input60',
+        hidden:true,
       },
 
       {
         ele: 'title',
-        label: '内容样式设置',
+        label: `售后订单设置`,
         size: 'small',
         groupKey:'style',
       },
       {
-        label: '文字颜色:',
-        ele: 'xd-color',
+        label: '是否展示ICON:',
+        ele: 'xd-radio',
+        valueKey: 'isShowICONBtn',
+        value: data['isShowICONBtn'] || 'N',
         groupKey:'style',
-        valueKey: 'textColor',
-        value: data['textColor'] || '',
-        placeholder: '请选择文字颜色',
-        classNmae: 'input80',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
       },
       {
-        label: 'ICON颜色:',
+        label: "文字样式设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'addBtnStyle',
+        value: data['addBtnStyle'] || null,
+        setting: {
+          fontSize: true,
+          color: true,
+          bgColor: false,
+          weight: true,
+          selected:false
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'addBtnRadius',
+        groupKey:'style',
+        value: data['addBtnRadius'] || '40',
+        labelInline:true,
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'iconColor',
+        valueKey: 'addBtnBgColor',
         groupKey:'style',
-        value: data['iconColor'] || '',
-        placeholder: '请选择ICON颜色',
+        value: data['addBtnBgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline:true,
         classNmae: 'input80',
       },
+      {
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'addBtnShadow',
+        value: data['addBtnShadow'] || '',
+        labelInline:true,
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
+        groupKey:'style',
+        valueKey: 'addBtnBorder',
+        value: data['addBtnBorder'] || {},
+        labelInline:true,
+        setting: {
+          selected:'N'
+        },
+      },
+
+      {
+        ele: 'title',
+        label: '内容设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'contPadding',
+        groupKey:'style',
+        value: data['contPadding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置填充',
+        inline: false,
+        notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">40px 34px 20px 20px</span>像素',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
@@ -147,6 +368,7 @@ export default {
         value: data['backgroundColor'] || '',
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
+        labelInline:true,
       },
       {
         label: '圆角设置:',
@@ -157,6 +379,7 @@ export default {
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input60',
+        labelInline:true,
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
@@ -168,11 +391,79 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '内容边框设置',
-        size: 'small',
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'style',
+        valueKey: 'contShadow',
+        value: data['contShadow'] || '',
+        labelInline:true,
+        setting: {
+          selected: 'N'
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: '边框设置:',
+        ele: 'xd-border',
         groupKey:'style',
+        valueKey: 'contBorder',
+        value: data['contBorder'] || {},
+        labelInline:true,
+        setting: {
+          selected:'N'
+        },
       },
+      {
+        label: '标题颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'textColor',
+        value: data['textColor'] || '',
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+        labelInline:true,
+      },
+      {
+        label: 'ICON颜色:',
+        ele: 'xd-color',
+        valueKey: 'iconColor',
+        groupKey:'style',
+        value: data['iconColor'] || '',
+        placeholder: '请选择ICON颜色',
+        classNmae: 'input80',
+        labelInline:true,
+      },
+      {
+        label: '数字气泡颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'popColor',
+        value: data['popColor'] || '',
+        placeholder: '请选择数字颜色',
+        labelInline:true,
+        classNmae: 'input80',
+      },
+      {
+        label: '数字气泡背景色:',
+        ele: 'xd-color',
+        valueKey: 'popBgColor',
+        groupKey:'style',
+        value: data['popBgColor'] || '',
+        placeholder: '请选择气泡背景',
+        classNmae: 'input80',
+        labelInline:true,
+      },
+
+
       {
         label: '是否有边框:',
         ele: 'xd-radio',
@@ -181,6 +472,7 @@ export default {
         placeholder: '请选择是否有边框',
         groupKey:'style',
         multiple: false,
+        hidden: true,
         className: 'input80',
         list: [
           {label: '是', value: 'Y'},
@@ -191,6 +483,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         groupKey:'style',
+        hidden: true,
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -201,6 +494,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         groupKey:'style',
+        hidden: true,
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框大小',