jufubao-base 1.0.63-beta203 → 1.0.63-beta205

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.63-beta203",
+  "version": "1.0.63-beta205",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBasePosterType/Attr.js

@@ -285,7 +285,7 @@ export default {
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
-          {"label": "两行", "value": 3},
+          {"label": "三行", "value": 3},
         ]
       },
       {

package/src/components/JfbBaseVideo/Attr.js

@@ -8,22 +8,21 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
-    if(!params['isCarousel']) params['isCarousel'] = 1;
     return [
       {
-        label: '广告位置配置:', //label
+        label: '视频位置配置:', //label
         ele: 'xd-site-poster', //package 名称
-        valueKey: 'poster', //form[valueKey]
+        valueKey: 'video', //form[valueKey]
         className: 'input80',
-        value: params.poster || {},
+        value: params.video || {},
         setting: {
           count: 1,
-          scene: {label: '广告', value: 'normal'}
+          scene: {label: '视频', value: 'video'}
         },
         handleCustom({action, data}) {
           //设置场景参数
           if(data) {
-            data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
+            data.params = Object.assign({}, {scene: 'video'}, data.params || {})
           }
 
           //获取显示内容
@@ -216,30 +215,34 @@ export default {
         inline: false,
         notice: '',
         rules: [
-          {required: true, message: '请选择广告位置', trigger: 'change'},
+          {required: true, message: '请选择视频位置', trigger: 'change'},
         ],
       },
-      params.poster && params.poster['type'] !== '1' && {
-        label: '广告位内容间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: params.padding || 0,
-        className: 'input40',
-        placeholder: '请广告位内容间距设置',
-        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
-        inline: false,
+      {
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+
       },
       {
-        label: '广告圆角设置:',
+        label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: params['radius'] || '20',
-        placeholder: '请选择广告圆角设置',
+        value: params['radius'] || '0',
+        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)
             })
@@ -248,96 +251,6 @@ export default {
             });
         },
       },
-      {
-        label: '广告位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置广告位边距设置',
-
-      },
-      {
-        label: '广告位置使用张数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'number',
-        value: params.number || 1,
-        placeholder: '请输入广告位置使用张数',
-        className: 'input40',
-        unit: '张',
-        rules: [
-          {
-            required: true,
-            message: '请输入广告位置使用张数',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '广告位显示方式:',
-        ele: 'xd-radio',
-        valueKey: 'isCarousel',
-        value: params['isCarousel'] || 1,
-        rules: [
-          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "焦点图显示", "value": 1},
-          {"label": "轮播图显示", "value": 2},
-        ]
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告位轮播周期:',
-        ele: 'el-input',
-        type: 'number',
-        isKey: true,
-        valueKey: 'carouselTime',
-        value: params.carouselTime || 5,
-        placeholder: '请输入广告位轮播周期，单位秒',
-        className: 'input40',
-        unit: '秒',
-        rules: [
-          {
-            required: true,
-            message: '请输入广告位置高度',
-            trigger: 'blur'
-          },
-        ]
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'dot_type', //form[valueKey]
-        value: params['dot_type'] || 'dot', //v-model
-        placeholder: '请选择广告显示dot类型',
-        multiple: false,
-        className: 'input80',
-        list:[
-          {label: '显示圆点', value: 'dot'},
-          {label: '显示长方形', value: 'default'},
-          {label: '显示圆点+长条', value: 'round'},
-          {label: '显示索引+标题', value: 'nav'},
-          {label: '显示索引', value: 'indexes'},
-        ],
-        notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
-        inline: false,
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告位内容显示行数:',
-        ele: 'xd-radio',
-        valueKey: 'rows',
-        value: params.rows || 1,
-        list: [
-          {"label": "一行", "value": 1},
-          {"label": "两行", "value": 2},
-        ]
-      },
-
-
     ].filter(i=>i)
   },
   advanced: [