jufubao-base 1.0.131 → 1.0.132-beta2

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)
   },

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -21,14 +21,14 @@
       <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
         <view class="my-order__add">
           <view :style="{color:cardNameColor}">我的订单</view>
-          <view @click="handleToLink(afterUrl)" :style="{borderColor:mainColor,color: mainColor}">售后订单</view>
+          <view @click="handleToLink(afterUrl)" :style="{borderColor:subColor || mainColor,color: subColor || mainColor}">售后订单</view>
         </view>
         <view
           class="my-order__content"
           :style="{
             borderRadius: radius + 'rpx',
             background: backgroundColor,
-            marginTop: margin.top ? margin.top + 'rpx': '20rpx',
+            marginTop: spacing + 'rpx',
             border: borderBox,
           }"
         >
@@ -75,10 +75,18 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserOrderMixin],
     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}`;
@@ -95,6 +103,7 @@
         backgroundColor: 'rgba(0,0,0,0)',
         radius: 0,
         iconColor: '',
+        spacing:20,
 
         //边框
         is_border: 'Y',
@@ -111,11 +120,15 @@
         bodyBackgroundColor: 'rgba(0,0,0,0)',
         bodyMargin: {top: 0, left: 0, right: 0, bottom: 0},
         cardNameColor: '#333',
+        subColor:'',
       }
     },
     watch: {
       container(value) {
-        this.init(value)
+        this.init(value);
+        if(this.$configProject.isPreview) {
+          this.onJfbLoad( this.options)
+        }
       }
     },
     created() {
@@ -124,7 +137,6 @@
     methods: {
       onJfbLoad(options) {
         this.options = options;
-
         //处理方法
         const handle = (res)=>{
           this.list = this.list.map(item => {
@@ -146,7 +158,7 @@
               'com': [0, 4, 9, 99, 888][this.$xdUniHelper.random(0, 4)],
             };
             handle(res)
-          }, 1000)
+          }, 400)
         }
         else{
           jfbRootExec('getBaseOrderListCount', {
@@ -172,6 +184,8 @@
         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.cardNameColor = getContainerPropsValue(container, 'content.cardNameColor', '#333');
+        this.subColor = getContainerPropsValue(container, 'content.cardNameColor', '');
+        this.spacing = getContainerPropsValue(container, 'content.spacing', 20);
 
         //其他
         this.afterUrl = getContainerPropsValue(container, 'content.after_url', {value: ''}).value;

package/src/components/JfbBaseUserOrder/JfbBaseUserOrderLess.less

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

package/src/components/JfbBaseVideo/Attr.js

@@ -8,16 +8,28 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
+    let size = {width:750};
+    let video = {
+      size: Object.assign({},(params.video && params.video.size),size),
+      type:'1',
+      position: Object.assign({},params.video && params.video.position)
+    };
     return [
       {
-        label: '视频位置配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'video', //form[valueKey]
+        label: '视频位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'video',
+        groupKey:'content',
         className: 'input80',
-        value: params.video || {},
+        value:video,
         setting: {
           count: 1,
-          scene: {label: '视频', value: 'video'}
+          scene: {label: '视频', value: 'video'},
+          sizeDisabled: {
+            wDisabled:true,
+            hDisabled: false,
+          },
+          typeDisabled: true
         },
         handleCustom({action, data}) {
           //设置场景参数
@@ -212,32 +224,46 @@ export default {
             loading.close()
           }
         },
-        inline: false,
-        notice: '',
         rules: [
-          {required: true, message: '请选择视频位置', trigger: 'change'},
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              let message = '请设置视频位置相关内容';
+              if(!value) {
+                callback(message);
+                return;
+              }
+              if(value.size && !value.size.height){
+                callback(message);
+                return
+              }
+              // if(value.position && (!value.position['position_name'] || !value.position['position_id'])) {
+              //   callback(message);
+              //   return
+              // }
+              callback()
+            },trigger: ['blur', 'change']
+          }
         ],
       },
       {
-        label: '视频位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置视频位边距设置',
-
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        groupKey:'style',
+        value: params.bgColor || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
       },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: params['radius'] || '0',
         placeholder: '请选择内容圆角设置',
         multiple: false,
-        className: 'input80',
+        className: 'input60',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({
             setting_id: 'edtix_style_radius',
@@ -251,6 +277,33 @@ export default {
             });
         },
       },
+      {
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        groupKey:'style',
+        value: params.margin || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '视频位填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'padding',
+        groupKey:'style',
+        value: params.padding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置视频位填充设置',
+        inline: false,
+        notice: '设置填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+
     ].filter(i=>i)
   },
   advanced: [