jufubao-base 1.0.131 → 1.0.132-beta2

package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue

@@ -13,11 +13,13 @@
       <view class="jfb-base-user-center__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-user-center__body" :style="{padding: outMargin}">
-      <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
+    <view class="jfb-base-user-center__body">
+      <view class="x-line"></view>
+      <view class="user-center-box" :style="{padding: outMargin}">
+        <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
         <view class="my-card-add__btn">
           <view :style="{color: cardNameColor}">我的{{cardName}}</view>
-          <view :style="{borderColor:mainColor,color:mainColor}" @click="handleToLink(add_url)">添加{{cardName}}</view>
+          <view :style="{borderColor:btnBoxColor || mainColor,color:btnBoxColor || mainColor}" @click="handleToLink(add_url)">添加{{cardName}}</view>
         </view>
         <view
           class="my-card-add__link"
@@ -48,6 +50,7 @@
           </view>
         </view>
       </view>
+      </view>
     </view>
   </view>
 </template>
@@ -60,7 +63,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   const color = require('color');
-  
+
   export default {
     name: "JfbBaseUserCenter",
     components: {
@@ -69,10 +72,18 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserCenterMixin],
     computed: {
       outPadding() {
-        return `${this.bodyPadding.top || 20}rpx ${this.bodyPadding.right || 20}rpx ${this.bodyPadding.bottom || 20}rpx ${this.bodyPadding.left || 20}rpx`
+        let str = `${this.checkValue(this.bodyPadding.top, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyPadding.right, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyPadding.bottom, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyPadding.left, 0)}rpx`;
+        return str
       },
       outMargin() {
-        return `${this.bodyMargin.top || 0}rpx ${this.bodyMargin.right || 0}rpx ${this.bodyMargin.bottom || 0}rpx ${this.bodyMargin.left || 0}rpx`
+        let str = `${this.checkValue(this.bodyMargin.top, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyMargin.right, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyMargin.bottom, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.bodyMargin.left, 20)}rpx`;
+        return str
       },
       borderBox() {
         if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -85,7 +96,7 @@
         pwd_url: '',
         card_url:'',
         cardName: '',
-  
+
         //基础
         color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
@@ -94,18 +105,19 @@
         btnBgColor: '',
         btnTextColor: '',
         btnFontSize: 24,
-  
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
-  
+
         //整体
-        bodyPadding: { top: 20, left: 20, right: 20, bottom: 20 },
+        bodyPadding: {},
         bodyRadius: 0,
         bodyBackgroundColor: 'rgba(0,0,0,0)',
-        bodyMargin: {top: 0, left: 0, right: 0, bottom: 0},
+        bodyMargin:{},
         cardNameColor: '#333',
+        btnBoxColor:'',
       }
     },
     watch: {
@@ -125,38 +137,39 @@
           url: type ? `${path}?type=${type}` : path
         })
       },
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        
+
         //整体
-        this.bodyMargin = getContainerPropsValue(container, 'content.bodyMargin', {top: 0, left: 0, right: 0, bottom: 0});
+        this.bodyMargin = getContainerPropsValue(container, 'content.bodyMargin', {});
         this.bodyRadius = getContainerPropsValue(container, 'content.bodyRadius', 0);
         this.bodyBackgroundColor = getContainerPropsValue(container, 'content.bodyBackgroundColor', 'rgba(0,0,0,0)');
-        this.bodyPadding = getContainerPropsValue(container, 'content.bodyPadding', {top: 20, left: 20, right: 20, bottom: 20});
-        
+        this.bodyPadding = getContainerPropsValue(container, 'content.bodyPadding', {});
+
         //基础
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
         this.padding = getContainerPropsValue(container, 'content.padding', 20);
         this.btnBgColor = getContainerPropsValue(container, 'content.btnBgColor', this.mainGradient);
-        this.btnTextColor = getContainerPropsValue(container, 'content.btnTextColor', '#333');
+        this.btnTextColor = getContainerPropsValue(container, 'content.btnTextColor', '#fff');
         this.btnFontSize = getContainerPropsValue(container, 'content.btnFontSize',26);
         this.cardNameColor = getContainerPropsValue(container, 'content.cardNameColor','#333');
+        this.btnBoxColor = getContainerPropsValue(container, 'content.cardNameColor','');
         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', 2);
-        
+
         //其他
         this.add_url = getContainerPropsValue(container, 'content.add_url', {value: ''}).value;
         this.pwd_url = getContainerPropsValue(container, 'content.pwd_url', {value: ''}).value;
         this.card_url = getContainerPropsValue(container, 'content.card_url', {value: ''}).value;
         this.cardName = getContainerPropsValue(container, 'content.cardName', '卡券');
-        
+
       },
     }
   }
@@ -171,14 +184,14 @@
 
     }
   }
-  
+
   .my-card-add {
     &__btn {
       display: flex;
       justify-content: space-between;
       align-items: center;
       font-size: unit(28, rpx);
-    
+
       & > view:nth-child(2) {
         width: unit(200, rpx);
         height: unit(60, rpx);
@@ -189,33 +202,33 @@
         text-align: center;
       }
     }
-  
+
     &__link {
       border-radius: unit(20, rpx);
       border: 1px solid #EEEEEE;
       padding: unit(40, rpx);
-      
+
       & > view:first-child {
         margin-top: 0!important;
       }
-    
+
       &-num {
         display: flex;
         align-items: center;
         justify-content: space-between;
         font-size: unit(28, rpx);
-      
+
         & > view:nth-child(1) {
           color: #808080;
         }
-      
+
         & > view:last-child {
           color: #808080;
           display: flex;
           align-items: center;
         }
       }
-    
+
       &-btn {
         width: 100%;
         height: unit(80, rpx);

package/src/components/JfbBaseUserCenter/JfbBaseUserCenterLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-user-center {
-  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-center {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

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**/