jufubao-base 1.0.187-beta2 → 1.0.187

package/src/components/JfbBaseFooter/Attr.js

@@ -1,152 +1,86 @@
 'use strict';
-import ICONS from '@/ICONS'
-
 export default {
   style: [],
   advanced: [],
-  content:(data)=>{
-    let footerSettingImage = [];
-    let footerSetting = [];
-    if(data['footerSettingImage'] && data['footerSettingImage'].length > 0 ) {
-      footerSettingImage = data['footerSettingImage'];
-    }
-    if(data['footer-setting'] && data['footer-setting'].length > 0){
-      footerSetting = data['footer-setting'];
-      footerSetting.map((item,index)=>{
-        if(!footerSettingImage[index]) footerSettingImage[index] = {};
-        footerSettingImage[index] = Object.assign({},JSON.parse(JSON.stringify(item)),footerSettingImage[index])
-      })
-    }
-    return [
-      {
-        label: '',
-        ele: 'slot',
-        slot: 'is_reference_title',
-        groupKey: 'advanced',
-      },
-      {
-        label: '背景图设置:',
-        ele: 'xd-upload',
-        valueKey: 'backgroundImage',
-        groupKey:'content',
-        value: data.backgroundImage || {},
-        defaultValue: data.backgroundImage || null,
-        slot: true,
-        oneWidth: 375,
-        oneHeight: 55,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB。建议尺寸：<span style="color:red">750*110</span>像素',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: .5,
-        action: 'action',
-        sort: true,
-        maxlen: 1,
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        groupKey:'content',
-        value: data['bgColor'] || '',
-        placeholder: '请选择背景颜色',
-        setting: {
-          isAlpha: false
-        },
-        classNmae: 'input80',
+  content: [
+    {
+      label: '',
+      ele: 'slot',
+      slot: 'is_reference_title',
+      groupKey: 'advanced',
+    },
+    {
+      label: '背景颜色:',
+      ele: 'xd-color',
+      valueKey: 'bgColor',
+      groupKey:'style',
+      value: '',
+      placeholder: '请选择背景颜色',
+      setting: {
+        isAlpha: false
       },
-      {
-        label: '菜单文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'color',
-        groupKey:'content',
-        value: data['color'] || '',
-        setting: {
-          isAlpha: false
-        },
-        placeholder: '请选择菜单文字颜色',
-        classNmae: 'input80',
+      classNmae: 'input80',
+    },
+    {
+      label: '菜单文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'color',
+      groupKey:'style',
+      value: '',
+      setting: {
+        isAlpha: false
       },
-      {
-        label: '菜单文字选中颜色:',
-        ele: 'xd-color',
-        valueKey: 'selectedColor',
-        groupKey:'content',
-        setting: {
-          isAlpha: false
-        },
-        value:data['selectedColor'] || '',
-        placeholder: '请选择菜单文字选中颜色',
-        classNmae: 'input80',
+      placeholder: '请选择菜单文字颜色',
+      classNmae: 'input80',
+    },
+    {
+      label: '菜单文字选中颜色:',
+      ele: 'xd-color',
+      valueKey: 'selectedColor',
+      groupKey:'style',
+      setting: {
+        isAlpha: false
       },
-      footerSetting.length > 0 && {
-        label: '菜单图片配置:',
-        ele: 'xd-footer-setting',
-        valueKey: 'footerSettingImage',
-        groupKey:'content',
-        value: footerSettingImage,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-          hideAdd: true,
-          showField: {
-            path: false,
-            icon: false,
-            notice: false,
-            image: true,
-            actImage: true
-          }
-        },
-        handleCustom({action,data}){
-          if(action === 'number') {
-            XdBus.getParentApi('getOptionsNoticeNumber')()
-              .then(res => {
-                data.cb(res.list)
-              })
-              .catch();
-          }
-        },
-      },
-
-      {
-        label: '菜单配置:',
-        ele: 'xd-footer-setting',
-        valueKey: 'footer-setting',
-        groupKey:'advanced',
-        value: footerSetting,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-          icons:ICONS,
-
-          showField: {
-            path: true,
-            icon: true,
-            notice: true,
-          }
-        },
-        handleCustom({action,data}){
-          console.log(`handleCustom.${action}`, data);
-          if(action === 'number') {
-            XdBus.getParentApi('getOptionsNoticeNumber')()
-              .then(res => {
-                data.cb(res.list)
-              })
-              .catch();
-          }
-        },
-        inline: false,
-        notice: '设置底部菜单的链接地址1、标题(最多<sapn style="color: red">五个汉字</sapn>)、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>）和是否有消息数量显示（无数量显示可以不填写）',
-        rules: [
-          {required: true, message: '请添加内容', trigger: 'change'},
-        ],
+      value: '',
+      placeholder: '请选择菜单文字选中颜色',
+      classNmae: 'input80',
+    },
+    {
+      label: '菜单配置:',
+      ele: 'xd-footer-setting',
+      valueKey: 'footer-setting',
+      groupKey:'advanced',
+      value: [],
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+        showField: {
+          path: true,
+          icon: true,
+          notice: true
+        }
       },
-      {
-        label: '',
-        ele: 'slot',
-        slot: 'is_reference',
-        groupKey: 'advanced',
+      handleCustom({action,data}){
+        console.log(`handleCustom.${action}`, data);
+        if(action === 'number') {
+          XdBus.getParentApi('getOptionsNoticeNumber')()
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch();
+        }
       },
-    ].filter(i=>i);
-  },
+      inline: false,
+      notice: '设置底部菜单的链接地址1、标题(最多<sapn style="color: red">五个汉字</sapn>)、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>）和是否有消息数量显示（无数量显示可以不填写）',
+      rules: [
+        {required: true, message: '请添加内容', trigger: 'change'},
+      ],
+    },
+    {
+      label: '',
+      ele: 'slot',
+      slot: 'is_reference',
+      groupKey: 'advanced',
+    },
+  ],
 };
 

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -16,19 +16,16 @@
       <view class="jfb-base-footer__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-footer__body">
-      <view :style="[bodyStyle]">
-        <xd-footer-bar
-          style="height:100%"
-          v-if="list !== null"
-          :height="height"
-          :tabbar="list"
-          :view="view"
-          :styles="styles"
-          :key="footerBarKey"
-          :base-url="baseUrl"
-        ></xd-footer-bar>
-      </view>
+    <view class="jfb-base-footer__body" :style="{height:height + 'rpx'}">
+      <xd-footer-bar
+        v-if="list !== null"
+        :height="height"
+        :tabbar="list"
+        :view="view"
+        :styles="styles"
+        :key="footerBarKey"
+        :base-url="baseUrl"
+      ></xd-footer-bar>
     </view>
   </view>
 </template>
@@ -45,7 +42,6 @@
     getContainerPropsValue,
     getComponentAttr
   } from "@/utils/xd.base";
-  import getServiceUrl from "@/common/getServiceUrl";
 
   export default {
     name: "JfbBaseFooter",
@@ -54,21 +50,6 @@
       XdFooterBar
     },
     mixins: [componentsMixins,extsMixins,JfbBaseFooterMixin],
-    computed:{
-      bodyStyle(){
-        let background = 'url(none)';
-        if(this.backgroundImage && this.backgroundImage.url) {
-          background = `url(${getServiceUrl(this.backgroundImage.url)})`;
-        }
-        return {
-          height: this.height + 'rpx',
-          backgroundImage: background,
-          backgroundSize: '100% 100%',
-          backgroundRepeat: 'no-repeat',
-          backgroundPosition: 'top center',
-        }
-      }
-    },
     data() {
       return {
         height: 0,
@@ -77,7 +58,6 @@
         numObj: {},
         footerBarKey: 'footerBarKey', //刷新
         baseUrl: '',
-        backgroundImage: '',
       }
     },
     watch: {
@@ -102,14 +82,12 @@
 
       //设置高度
       if(this.$configProject.isPreview) {
-        this.height = getComponentAttr(this.componentAttr, 'height');
+        this.height = getComponentAttr(this.componentAttr, 'height') - 4;
       }
       else {
         this.height = getComponentAttr(this.componentAttr, 'height');
       }
 
-      this.height =  Number(this.height);
-
       this.init(this.container);
       //监听重试消息数量
       this.$xdRoot.$on('restFooterNumber', this.handle)
@@ -181,13 +159,6 @@
         this.footerBarKey = this.$xdUniHelper.randomChar(20);
       },
 
-      getImage(list=[],index,key){
-        if(!list[index]) return '';
-        if(list[index] && !list[index][key]) return  '';
-        let item = list[index][key];
-        return getServiceUrl(item.url, 'size1');
-      },
-
       /**
        * @description 监听事件变化
        * @param value {object} 业务组件对象自己
@@ -195,11 +166,8 @@
       init(value) {
         //设置底部菜单
         let bar = getContainerPropsValue(value, 'content.footer-setting', []);
-        let imageIcons = getContainerPropsValue(value, 'content.footerSettingImage', []);
-        this.backgroundImage = getContainerPropsValue(value, 'content.backgroundImage', '');
         this.list = {
           bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
-          bodyStyle: this.bodyStyle,
           selectedColor: getContainerPropsValue(value, 'content.selectedColor', this.mainColor),
           color: getContainerPropsValue(value, 'content.color', '#333'),
           list: bar.map((item,index)=>{
@@ -209,8 +177,6 @@
               path: item.path.value,
               size: item.size,
               num: this.numObj[index] ? this.numObj[index]: 0 ,
-              image: this.getImage(imageIcons,index,'image') || this.getImage(imageIcons,index,'actImage'),
-              actImage: this.getImage(imageIcons,index,'actImage') || this.getImage(imageIcons,index,'image'),
             }
           }),
         };
@@ -224,7 +190,6 @@
   @import "./JfbBaseFooterLess.less";
 
   .jfb-base-footer {
-
     &__body{
       box-sizing: border-box;
     }

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -332,50 +332,48 @@ export default {
         notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: "主体信息行间距:",
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'lineHeight',
+        ele: 'title',
+        label: '投影设置',
+        size: 'small',
         groupKey:'style',
-        value: data['lineHeight'] || 20,
-        placeholder: '请输入主体信息行间距',
-        className: 'input80',
       },
       {
-        label: '投影设置:',
-        ele: "xd-shadow",
-        valueKey: "sectionShadow",
-        value: data.sectionShadow || {},
+        label: '是否有投影:',
+        ele: 'xd-radio',
         groupKey:'style',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-              data.cb([])
-            });
-        },
+        valueKey: 'is_shadow',
+        value: data['is_shadow'] || 'N',
+        placeholder: '请选择是否投影',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
       },
-      {
-        label: "边框设置:",
-        ele: "xd-border",
-        valueKey: "sectionBorder",
-        value: data.sectionBorder || {},
+      data['is_shadow'] === 'Y' && {
+        label: '投影颜色:',
+        ele: 'xd-color',
         groupKey:'style',
+        valueKey: 'is_shadow_bg',
+        value: data['is_shadow_bg'] || '',
+        placeholder: '请选择投影颜色',
+        classNmae: 'input80',
       },
-      {
-        label: '内容圆角设置:',
+      data['is_shadow'] === 'Y' && {
+        label: '投影范围:',
         ele: 'xd-site-select-list',
-        valueKey: 'radius',
+        valueKey: 'is_shadow_w',
         groupKey:'style',
-        value: data['radius'] || '',
-        placeholder: '请选择内容圆角设置',
+        value: data['is_shadow_w'] || '10',
+        placeholder: '请选择投影范围',
         multiple: false,
         className: 'input80',
         handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
             .then(res => {
               data.cb(res.list)
             })
@@ -385,45 +383,50 @@ export default {
         },
       },
       {
-        label: "底部按钮配置",
-        ele: "title",
-        groupKey: "style",
-        size: "small"
+        ele: 'title',
+        label: '边框设置',
+        size: 'small',
+        groupKey:'style',
       },
       {
-        label: "容器内边距:",
-        ele: 'xd-margin-padding',
-        valueKey: 'bottomPadding',
-        value: data['bottomPadding'] || null,
+        label: '是否有边框:',
+        ele: 'xd-radio',
+        valueKey: 'is_border',
+        value: data['is_border'] || 'N',
         groupKey:'style',
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置容器内边距',
+        placeholder: '请选择是否有边框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
       },
-      {
-        label: "容器背景颜色:",
-        ele: "xd-color",
-        valueKey: "bottomBgColor",
-        value: data.bottomBgColor || null,
-        groupKey: "style",
+      data['is_border'] === 'Y' && {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_border_c',
+        value: data['is_border_c'] || '',
+        placeholder: '请选择边框颜色',
+        classNmae: 'input80',
       },
-      {
-        label: "按钮高度:",
-        ele: "el-input",
-        type: 'number',
-        valueKey: "bottomBtnHeight",
+      data['is_border'] === 'Y' && {
+        label: '边框大小:',
         groupKey:'style',
-        value: data['bottomBtnHeight'] || 60,
-        placeholder: '请输入按钮高度',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'is_border_w',
+        value: data['is_border_w'] || '',
+        placeholder: '请输入边框颜色',
         className: 'input80',
       },
       {
-        label: '按钮圆角:',
-        ele: "xd-site-select-list",
-        valueKey: "bottomBtnRadius",
-        value: data['bottomBtnRadius'] || '',
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
         groupKey:'style',
+        value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
@@ -437,6 +440,7 @@ export default {
             });
         },
       },
+
       {
         label: '查看品牌路径:',
         ele: 'xd-select-pages-path',