jufubao-base 1.0.128 → 1.0.130-beta2

package/src/components/JfbBaseUserInfo/Attr.js

@@ -7,15 +7,17 @@ export default {
   content: (data)=>{
     return [
       {
-        label: '', //label
-        ele: 'slot', //package 名称
+        label: '',
+        ele: 'slot',
         slot: 'is_reference_title',
+        groupKey:'advanced',
       },
       {
         label: '内容排版:',
         ele: 'xd-radio',
         valueKey: 'text_type',
         value: data['text_type'] || 'N',
+        groupKey:'content',
         placeholder: '请选择内容排版',
         multiple: false,
         className: 'input80',
@@ -28,18 +30,29 @@ export default {
         label: '内容文字颜色:',
         ele: 'xd-color',
         valueKey: 'textColor',
+        groupKey:'style',
         value: data.textColor || '',
         placeholder: '请选择内容文字颜色',
         classNmae: 'input80',
       },
+      {
+        label: '内容背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'backgroundColor',
+        groupKey:'style',
+        value: data.backgroundColor || '',
+        placeholder: '请选择内容背景颜色',
+        classNmae: 'input80',
+      },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: data['radius'] || '0',
+        value: data['radius'] || '',
+        groupKey:'style',
         placeholder: '请选择内容圆角设置',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({
             setting_id: 'edtix_style_radius',
@@ -54,22 +67,42 @@ export default {
         },
       },
       {
-        label: '内容背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'backgroundColor',
-        value: data.backgroundColor || '',
-        placeholder: '请选择内容背景颜色',
-        classNmae: 'input80',
+        label: '内容设置外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        groupKey:'style',
+        value: data['margin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '内容设置内边距:',
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'padding',
+        value: data['padding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
         label: '投影设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
         valueKey: 'is_shadow',
+        groupKey:'style',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
@@ -83,12 +116,14 @@ export default {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
+        groupKey:'style',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
+        groupKey:'style',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
         value: data['is_shadow_w'] || '10',
@@ -111,12 +146,14 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
+        groupKey:'style',
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
         multiple: false,
@@ -129,6 +166,7 @@ export default {
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -138,46 +176,17 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
       {
-        ele: 'title',
-        label: '其他设置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '内容设置外边距:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: data['margin'] || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
-      },
-      {
-        label: '内容设置内边距:',
-        ele: 'xd-margin-padding',
-        valueKey: 'padding',
-        value: data['padding'] || null,
-        disabled: false,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置边距',
-        inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：0像素',
-      },
-      {
-        label: '', //label
-        ele: 'slot', //package 名称
+        label: '',
+        ele: 'slot',
         slot: 'is_reference',
+        groupKey:'advanced',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -14,6 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-user-info__body">
+      <view class="x-line"></view>
       <view
         class="jfb-base-user-info__body-header"
         :style="{
@@ -40,18 +41,19 @@
           <view v-else class="no-image" :style="{borderColor: color}">
             <xd-font-icon :color="color" 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 class="logout" @click="handleLogout()">
+              <view :style="{color:color}">[退出登录]</view>
+            </view>
             <view @click="handleToLink()" v-if="0">
               <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
-
-        <view @click="handleLogout()" v-if="logined" class="logout">
-          <view v-if="textType ==='N'">[退出登录]</view>
+        <view @click="handleLogout()" v-if="logined && textType ==='N'" class="logout">
+          <view :style="{color:color}">[退出登录]</view>
         </view>
       </view>
     </view>
@@ -78,18 +80,18 @@
       ...mapState(['jfbAuthorize']),
 
       outMargin() {
-        let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
-        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
-        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom : 20}rpx`;
-        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 20}rpx`;
-        return margin;
+        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() {
-        let padding = `${this.padding.top !== null ? this.padding.top : 20}rpx`;
-        padding = `${padding} ${this.padding.right !== null ? this.padding.right : 20}rpx`;
-        padding = `${padding} ${this.padding.bottom !== null ? this.padding.bottom : 20}rpx`;
-        padding = `${padding} ${this.padding.left !== null ? this.padding.left : 20}rpx`;
-        return padding;
+        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`;
+        str = `${str} ${this.checkValue(this.padding.left, 20)}rpx`;
+        return str
       },
       shadow(){
         if(this.is_shadow === 'Y') return  `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
@@ -160,7 +162,6 @@
       },
 
       async handleLogout(){
-        debugger
         // #ifdef H5
         if (this.$configProject.isPreview) return;
         // #endif
@@ -216,7 +217,7 @@
         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.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
+        this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
         this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
 
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
@@ -225,9 +226,8 @@
 
         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', '10');
-
-        this.radius = getContainerPropsValue(container, 'content.radius', '0');
+        this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 0);
+        this.radius = getContainerPropsValue(container, 'content.radius', '10');
       },
     }
   }
@@ -304,9 +304,9 @@
     }
 
     .logout {
-      font-size: unit(26, rpx);
+      font-size: unit(24, rpx);
       & > view {
-        color: #333;
+        cursor: pointer;
       }
     }
   }

package/src/components/JfbBaseUserInfo/JfbBaseUserInfoLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-user-info {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-user-info {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseUserOrder/Attr.js

@@ -11,86 +11,153 @@ export default {
         label: '',
         ele: 'slot',
         slot: 'is_reference_title',
+        groupKey:'advanced',
       },
       {
-        label: '文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'textColor',
-        value: data['textColor'] || '',
-        placeholder: '请选择文字颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: 'ICON颜色:',
-        ele: 'xd-color',
-        valueKey: 'iconColor',
-        value: data['iconColor'] || '',
-        placeholder: '请选择ICON颜色',
-        classNmae: 'input80',
+        label: '设置订单状态:',
+        ele: 'xd-order-setting',
+        valueKey: 'orderTypeList',
+        groupKey:'content',
+        value: data['orderTypeList'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        handleCustom({action, data}) {
+          if (action === 'number') {
+            data.cb([
+              {"label": "全部", "value": 'all'},
+              {"label": "待付款", "value": 'unpaid'},
+              {"label": "待收货", "value": 'unreceived'},
+              {"label": "已取消", "value": 'cancel'},
+              {"label": "已完成", "value": 'com'},
+            ])
+          }
+        },
+        inline: false,
+        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
+        rules: [
+          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
+        ],
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'backgroundColor',
-        value: data['backgroundColor'] || '',
+        groupKey:'style',
+        valueKey: 'bodyBackgroundColor',
+        value: data['bodyBackgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
       {
-        label: '文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'cardNameColor',
-        value: data['cardNameColor'] || null,
-        placeholder: '请选择卡券文字颜色',
-        classNmae: 'input80',
+        label: '圆角设置:',
+        groupKey:'style',
+        ele: 'xd-site-select-list',
+        valueKey: 'bodyRadius',
+        value: data['bodyRadius'],
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
       },
       {
-        ele: 'title',
-        label: '整体风格',
-        size: 'small', //default/mini/small
+        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',
         valueKey: 'bodyMargin',
+        groupKey:'style',
         value: data['bodyMargin'] || null,
-        disabled: false,
         setting: {
           type: 'margin',
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '填充:',
         ele: 'xd-margin-padding',
         valueKey: 'bodyPadding',
+        groupKey:'style',
         value: data['bodyPadding'] || null,
-        disabled: false,
         setting: {
           type: 'padding',
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '标题样式颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'cardNameColor',
+        value: data['cardNameColor'] || null,
+        placeholder: '请选择卡券文字颜色',
+        classNmae: 'input60',
+      },
+
+
+      {
+        ele: 'title',
+        label: '内容样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '文字颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'textColor',
+        value: data['textColor'] || '',
+        placeholder: '请选择文字颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: 'ICON颜色:',
+        ele: 'xd-color',
+        valueKey: 'iconColor',
+        groupKey:'style',
+        value: data['iconColor'] || '',
+        placeholder: '请选择ICON颜色',
+        classNmae: 'input80',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
-        valueKey: 'bodyBackgroundColor',
-        value: data['bodyBackgroundColor'] || null,
+        groupKey:'style',
+        valueKey: 'backgroundColor',
+        value: data['backgroundColor'] || '',
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
       {
         label: '圆角设置:',
         ele: 'xd-site-select-list',
-        valueKey: 'bodyRadius',
-        value: data['bodyRadius'],
-        placeholder: '请选择圆角设置',
+        valueKey: 'radius',
+        value: data['radius'] || '10',
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
@@ -103,8 +170,9 @@ export default {
       },
       {
         ele: 'title',
-        label: '边框设置',
-        size: 'small', //default/mini/small
+        label: '内容边框设置',
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
@@ -112,6 +180,7 @@ export default {
         valueKey: 'is_border',
         value: data['is_border'] || 'N',
         placeholder: '请选择是否有边框',
+        groupKey:'style',
         multiple: false,
         className: 'input80',
         list: [
@@ -122,6 +191,7 @@ export default {
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -131,38 +201,18 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
+
       {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '10',
-        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);
-            });
-        },
-      },
-      {
-        ele: 'title',
-        label: '其他设置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '设置售后订单列表地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'after_url', //form[valueKey]
+        label: '设置售后订单列表地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'after_url',
+        groupKey:'advanced',
         placeholder: '请选择设置售后订单列表地址',
         value: data['after_url'] || null,
         setting: {
@@ -174,9 +224,10 @@ export default {
         inline: false,
       },
       {
-        label: '设置订单列表路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'order_url', //form[valueKey]
+        label: '设置订单列表路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'order_url',
+        groupKey:'advanced',
         placeholder: '请选择设置订单列表路径',
         value: data['order_url'] || null,
         setting: {
@@ -187,36 +238,11 @@ export default {
         ],
         inline: false,
       },
-      {
-        label: '设置订单状态:', //label
-        ele: 'xd-order-setting', //package 名称
-        valueKey: 'orderTypeList', //form[valueKey]
-        value: data['orderTypeList'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        handleCustom({action, data}) {
-          if (action === 'number') {
-            data.cb([
-              {"label": "全部", "value": 'all'},
-              {"label": "待付款", "value": 'unpaid'},
-              {"label": "待收货", "value": 'unreceived'},
-              {"label": "已取消", "value": 'cancel'},
-              {"label": "已完成", "value": 'com'},
-            ])
-          }
-        },
-        inline: false,
-        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
-        rules: [
-          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
-        ],
-      },
-
       {
         label: '',
         ele: 'slot',
         slot: 'is_reference',
+        groupKey:'advanced',
       },
     ].filter(i=>i)
   },