jufubao-base 1.0.184-beta2 → 1.0.184

package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue

@@ -18,8 +18,8 @@
       <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="[titleStyleComp]">我的{{cardName}}</view>
-          <view :style="[addBtnStyleComp]" @click="handleToLink(add_url)">添加{{cardName}}</view>
+          <view :style="{color: cardNameColor}">我的{{cardName}}</view>
+          <view :style="{borderColor:btnBoxColor || mainColor,color:btnBoxColor || mainColor}" @click="handleToLink(add_url)">添加{{cardName}}</view>
         </view>
         <view
           class="my-card-add__link"
@@ -27,9 +27,7 @@
             borderRadius: radius + 'rpx',
             background: backgroundColor,
             border: borderBox,
-            marginTop: rowSpacing + 'rpx',
-            padding:contentPaddingComp,
-            boxShadow: contShadow
+            marginTop: padding + 'rpx'
           }"
         >
           <view class="my-card-add__link-num" v-if="0">
@@ -44,8 +42,7 @@
             :style="{
               color:btnTextColor,
               background:btnBgColor,
-              fontSize: btnFontSize + 'rpx',
-              borderRadius:btnRadius + 'rpx',
+              fontSize: btnFontSize + 'rpx'
             }"
             @click="handleToLink(card_url)"
           >
@@ -89,91 +86,38 @@
         return str
       },
       borderBox() {
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx ${this.is_border_s} ${this.is_border_c}`;
+        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
         else return '0';
       },
-      titleStyleComp(){
-        return {
-          fontSize: this.titleStyle.fontSize || '28rpx',
-          color: `${this.titleStyle.color || '#333'}`,
-          fontWeight: `${this.titleStyle.fontWeight || 'normal'}`,
-        }
-      },
-      addBtnStyleComp(){
-        let border = {};
-        if(this.addBtnBorder && this.addBtnBorder.type === 'Y') {
-          let value = this.addBtnBorder.value ||{};
-          if(value.width) border['borderWidth'] = value.width + 'rpx';
-          if(value.color) border['borderColor'] = value.color;
-          if(value.style) border['borderStyle'] = value.style;
-        }
-        let addBtnShadow = {};
-        if(this.addBtnShadow && this.addBtnShadow.type === 'Y') {
-          let value = this.addBtnShadow.value || {};
-          if(value.color && value.width) {
-            addBtnShadow['boxShadow'] = `0 0 ${value.width}rpx ${value.color}`
-          }
-        }
-        return {
-          color: this.addBtnStyle.color || this.mainColor,
-          fontSize: this.addBtnStyle.fontSize || '26rpx',
-          fontWeight: this.addBtnStyle.fontWeight || 'normal',
-          borderColor: this.mainColor,
-          borderWidth: '2rpx',
-          borderStyle:'solid',
-          backgroundColor: this.addBtnBgColor || 'rgba(0,0,0,0)',
-          borderRadius:this.addBtnRadius + 'rpx',
-          ...border,
-          ...addBtnShadow
-        }
-      },
-      contentPaddingComp(){
-        let str = `${this.checkValue(this.contentPadding.top, 40)}rpx`;
-        str = `${str} ${this.checkValue(this.contentPadding.right, 40)}rpx`;
-        str = `${str} ${this.checkValue(this.contentPadding.bottom, 40)}rpx`;
-        str = `${str} ${this.checkValue(this.contentPadding.left, 40)}rpx`;
-        return str
-      }
     },
     data() {
       return {
         add_url: '',
         pwd_url: '',
         card_url:'',
-        cardName: '卡券',
-        bodyPadding: {},
-        bodyRadius: 0,
-        bodyBackgroundColor: 'rgba(0,0,0,0)',
-        bodyMargin:{},
-        rowSpacing: 20,
-
-        //title
-        titleStyle:{},
-
-        //添加按钮
-        addBtnBgColor:'rgba(0,0,0,0)',
-        addBtnStyle:{},
-        addBtnBorder:{},
-        addBtnShadow:{},
-        addBtnRadius: '40',
+        cardName: '',
 
-        //进入
-        contentPadding:{},
+        //基础
+        color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         radius: 0,
-        contShadow:'0 0 0 rgba(0,0,0,0)',
-
-        //进入按钮样式
+        padding: 20,
         btnBgColor: '',
         btnTextColor: '',
         btnFontSize: 24,
-        btnRadius:'40',
 
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
 
+        //整体
+        bodyPadding: {},
+        bodyRadius: 0,
+        bodyBackgroundColor: 'rgba(0,0,0,0)',
+        bodyMargin:{},
+        cardNameColor: '#333',
+        btnBoxColor:'',
       }
     },
     watch: {
@@ -187,7 +131,6 @@
     },
     methods: {
       handleToLink(path, type) {
-        if (this.$configProject['isPreview']) return;
         if(!path) {
           console.warn(`跳转地址不存在`)
         }
@@ -201,51 +144,33 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.cardName = getContainerPropsValue(container, 'content.cardName', '卡券');
+
+        //整体
         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', {});
-        this.rowSpacing = getContainerPropsValue(container, 'content.padding', 20);
 
-        //标题
-        this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
-
-        //添加按钮
-        this.addBtnBgColor = getContainerPropsValue(container, 'content.addBtnBgColor', 'rgba(0,0,0,0)');
-        this.addBtnStyle = getContainerPropsValue(container, 'content.addBtnStyle', {});
-        this.addBtnBorder = getContainerPropsValue(container, 'content.addBtnBorder', {});
-        this.addBtnRadius = getContainerPropsValue(container, 'content.addBtnRadius', '40');
-        this.addBtnShadow =  getContainerPropsValue(container, 'content.addBtnShadow', {});
-
-        //进入
-        this.contentPadding = getContainerPropsValue(container, 'content.contentPadding', {});
+        //基础
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
-        this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
-
-        //进入按钮
-        this.btnBgColor = getContainerPropsValue(container, 'content.btnBgColor', this.mainGradient||this.mainColor);
+        this.padding = getContainerPropsValue(container, 'content.padding', 20);
+        this.btnBgColor = getContainerPropsValue(container, 'content.btnBgColor', this.mainGradient);
         this.btnTextColor = getContainerPropsValue(container, 'content.btnTextColor', '#fff');
         this.btnFontSize = getContainerPropsValue(container, 'content.btnFontSize',26);
-        this.btnRadius =  getContainerPropsValue(container, 'content.btnRadius','40');
-        this.contBorder = getContainerPropsValue(container, 'content.contBorder', {});
+        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.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.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', '卡券');
+
       },
     }
   }
@@ -272,6 +197,9 @@
         width: unit(200, rpx);
         height: unit(60, rpx);
         line-height: unit(60, rpx);
+        border-radius: unit(30, rpx);
+        border: 1px solid #FF5733;
+        color: #FF5733;
         text-align: center;
       }
     }
@@ -307,6 +235,7 @@
         height: unit(80, rpx);
         line-height: unit(80, rpx);
         border-radius: unit(100, rpx);
+        font-size: unit(24, rpx);
         text-align: center;
         margin-top: unit(30, rpx);
       }

package/src/components/JfbBaseUserInfo/Attr.js

@@ -6,6 +6,12 @@ export default {
   style: [],
   content: (data)=>{
     return [
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey:'advanced',
+      },
       {
         label: '内容排版:',
         ele: 'xd-radio',
@@ -21,39 +27,30 @@ export default {
         ]
       },
       {
-        label: '退出登录自定义名称:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey:'content',
-        valueKey: 'logoutName',
-        value: data['logoutName'] || '',
-        notice: '退出登录自定义名称设置，默认值：<span style="color:red">[退出登录]</span>',
-        inline: false,
-        className: 'input60',
-      },
-
-      {
-        ele: 'title',
-        label: '用户图像设置',
-        size: 'small',
-        groupKey:'content',
+        label: '内容文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'textColor',
+        groupKey:'style',
+        value: data.textColor || '',
+        placeholder: '请选择内容文字颜色',
+        classNmae: 'input80',
       },
       {
-        label: '边框颜色:',
+        label: '内容背景颜色:',
         ele: 'xd-color',
-        groupKey:'content',
-        valueKey: 'imageColor',
-        value: data['imageColor'] || '',
-        placeholder: '请选择背景颜色',
+        valueKey: 'backgroundColor',
+        groupKey:'style',
+        value: data.backgroundColor || '',
+        placeholder: '请选择内容背景颜色',
         classNmae: 'input80',
       },
       {
-        label: '圆角设置:',
+        label: '内容圆角设置:',
         ele: 'xd-site-select-list',
-        valueKey: 'imageRadius',
-        value: data['imageRadius'] || '50%',
-        groupKey:'content',
-        placeholder: '请选择圆角设置',
+        valueKey: 'radius',
+        value: data['radius'] || '',
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input60',
         handleCustom({action, data}) {
@@ -62,21 +59,15 @@ export default {
             key: Date.now()
           })
             .then(res => {
-              data.cb(res.list.map(item=>{
-                return {
-                  ...item,
-                  value: item.value + 'rpx'
-                }
-              }).concat({label: '圆角', value:'50%'}))
+              data.cb(res.list)
             })
             .catch(error => {
               console.error(error);
             });
         },
       },
-
       {
-        label: '设置外边距:',
+        label: '内容设置外边距:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         groupKey:'style',
@@ -84,11 +75,12 @@ export default {
         setting: {
           type: 'margin',
         },
+        placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
       },
       {
-        label: '设置填充:',
+        label: '内容设置内边距:',
         groupKey:'style',
         ele: 'xd-margin-padding',
         valueKey: 'padding',
@@ -96,127 +88,15 @@ export default {
         setting: {
           type: 'padding',
         },
-        placeholder: '设置填充',
+        placeholder: '请设置边距',
         inline: false,
-        notice: '设置填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
-      {
-        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',
-        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-shadow',
-        groupKey:'style',
-        valueKey: 'contShadow',
-        value: data['contShadow'] || '',
-        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'] || '',
-        setting: {
-          selected:'N'
-        },
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      {
-        label: "昵称字体样式设置",
-        ele: "xd-text-and-bgc",
-        groupKey:'style',
-        valueKey: 'nickStyle',
-        value: data['nickStyle'] || 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-text-and-bgc",
-        groupKey:'style',
-        valueKey: 'logoutStyle',
-        value: data['logoutStyle'] || 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([])
-            });
-        },
-      },
-
-      //=====属性已废弃(不能删除，已隐藏)====
       {
         ele: 'title',
         label: '投影设置',
         size: 'small',
         groupKey:'style',
-        hidden: true,
       },
       {
         label: '是否有投影:',
@@ -227,7 +107,6 @@ export default {
         placeholder: '请选择是否投影',
         multiple: false,
         className: 'input80',
-        hidden: true,
         list: [
           {label: '是', value: 'Y'},
           {label: '否', value: 'N'},
@@ -241,7 +120,6 @@ export default {
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
-        hidden: true,
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
@@ -264,19 +142,16 @@ export default {
               console.error(error);
             });
         },
-        hidden: true,
       },
       {
         ele: 'title',
         label: '边框设置',
         size: 'small',
         groupKey:'style',
-        hidden: true,
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
-        hidden: true,
         valueKey: 'is_border',
         groupKey:'style',
         value: data['is_border'] || 'N',
@@ -290,7 +165,6 @@ export default {
       },
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
-        hidden: true,
         ele: 'xd-color',
         groupKey:'style',
         valueKey: 'is_border_c',
@@ -299,7 +173,6 @@ export default {
         classNmae: 'input80',
       },
       data['is_border'] === 'Y' && {
-        hidden: true,
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
@@ -309,28 +182,6 @@ export default {
         placeholder: '请输入边框颜色',
         className: 'input80',
       },
-      //=====属性已废弃====
-
-      0&&{
-        label: '是否显示设置:',
-        ele: 'xd-radio',
-        valueKey: 'isSetting',
-        value: data['isSetting'] || 'N',
-        groupKey:'advanced',
-        placeholder: '是否显示设置',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '不显示', value: 'N'},
-          {label: '显示', value: 'Y'},
-        ]
-      },
-      {
-        label: '',
-        ele: 'slot',
-        slot: 'is_reference_title',
-        groupKey:'advanced',
-      },
       {
         label: '',
         ele: 'slot',