jufubao-base 1.0.129 → 1.0.130-beta3

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,7 +93,6 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import { jfbRootExec } from "@/utils/xd.event";
-import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
@@ -102,6 +101,7 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
   name: "JfbBasePhoneCollect",

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollectLess.less

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

package/src/components/JfbBasePhoneLogin/Attr.js

@@ -8,6 +8,7 @@ export default {
       label: '隐私政策:',
       ele: 'xd-site-news',
       valueKey: 'notice',
+      groupKey:'content',
       value: {type: 'privacy'},
       className: 'input70',
       setting: {
@@ -29,7 +30,7 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -73,6 +74,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -87,6 +89,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -100,6 +103,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -114,6 +118,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -128,6 +133,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -142,6 +148,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -155,6 +162,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -169,6 +177,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -183,6 +192,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -197,6 +207,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -211,6 +222,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -222,6 +234,7 @@ export default {
       label: '用户服务协议:',
       ele: 'xd-site-news',
       valueKey: 'notices',
+      groupKey:'content',
       value: {type: 'privacy'},
       className: 'input70',
       setting: {
@@ -242,7 +255,8 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        //获取返回参数(场景类型名称为必填)
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -286,6 +300,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -300,6 +315,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -313,6 +329,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -327,6 +344,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -341,6 +359,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -355,6 +374,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -368,6 +388,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -382,6 +403,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -396,6 +418,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -410,6 +433,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -424,6 +448,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLoginLess.less

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

package/src/components/JfbBasePoster/Attr.js

@@ -8,15 +8,15 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
-    console.log(params,'anananananana');
     if(!params['isCarousel']) params['isCarousel'] = 1;
     return [
       {
-        label: '广告位置配置:', //label
-        ele: 'xd-site-poster', //package 名称
-        valueKey: 'poster', //form[valueKey]
+        label: '广告位置配置:',
+        ele: 'xd-site-poster',
+        valueKey: 'poster',
         className: 'input80',
         value: params.poster || {},
+        groupKey:'content',
         setting: {
           count: 1,
           scene: {label: '广告', value: 'normal'}
@@ -215,82 +215,49 @@ export default {
             loading.close()
           }
         },
-        inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请选择广告位置', trigger: 'change'},
-        ],
-      },
-      {
-        ele: 'title',
-        label: '广告位轮廓设置',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '广告位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置广告位边距设置',
-        inline: false,
-        notice: '设置边距充，<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
+        rules: [{
+          required: true,
+          validator: (rule, value, callback) => {
+            let message = '请设置广告相关内容';
+            if(!value) {
+              callback(message);
+              return;
+            }
+            if(value.size && !value.size.height){
+              callback(message);
+              return
+            }
 
+            if(value.size && !value.size.width){
+              callback(message);
+              return
+            }
+            callback()
+          },trigger: ['blur', 'change']
+        }],
       },
-      params.poster && params.poster['type']&& params.poster['type'] !== '1' &&{
-        label: '广告位填充设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'bgImagePadding',
-        value: params['bgImagePadding'] || null,
-        disabled: false,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请填充设置',
-        inline: false,
-        notice: '设置内填充，<span style="color: red">单位：像素（px）</span>。无背景时候默认值：<span style="color: red">20</span>像素。有背景时候默认值：<span style="color: red">20</span>像素。',
-      },
-      params.poster &&  params.poster['type'] &&params.number > 1 && {
-        label: '广告内容之间间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: params.padding || 0,
-        className: 'input40',
-        placeholder: '请广告内容之间间距设置',
-        notice: '请广告内容之间间距设置。<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
-        inline: false,
-      },
-      {
-        label: '广告圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: params['radius'] || '20',
-        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);
-            });
-        },
+      params['isCarousel']=== 2 && (params.poster && params.poster['type'] && params.poster['type'] === '1') && {
+        label: '是否启用配套背景:',
+        ele: 'xd-radio',
+        valueKey: 'isSupport',
+        value: params['isSupport'] || 'Y',
+        groupKey:'style',
+        list: [
+          {"label": "启用", "value": 'Y'},
+          {"label": "禁用", "value": 'N'},
+        ]
       },
       {
         ele: 'title',
         label: '广告位参数配置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'content',
       },
       params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
         label: '广告背景图:',
         ele: 'xd-upload',
         valueKey: 'background',
+        groupKey:'content',
         value: params.background || {},
         defaultValue: params.background || null,
         slot: true,
@@ -311,6 +278,7 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'number',
+        groupKey:'content',
         value: params.number || 1,
         placeholder: '请输入广告位置使用张数',
         className: 'input40',
@@ -328,6 +296,7 @@ export default {
         ele: 'xd-radio',
         valueKey: 'isCarousel',
         value: params['isCarousel'] || 1,
+        groupKey:'content',
         rules: [
           {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
         ],
@@ -340,7 +309,7 @@ export default {
         label: '广告位轮播周期:',
         ele: 'el-input',
         type: 'number',
-        isKey: true,
+        groupKey:'content',
         valueKey: 'carouselTime',
         value: params.carouselTime || 5,
         placeholder: '请输入广告位轮播周期，单位秒',
@@ -355,10 +324,11 @@ export default {
         ]
       },
       params['isCarousel'] === 2 && {
-        label: '广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'dot_type', //form[valueKey]
-        value: params['dot_type'] || 'dot', //v-model
+        label: '广告显示dot类型:',
+        ele: 'xd-select-list',
+        valueKey: 'dot_type',
+        value: params['dot_type'] || 'dot',
+        groupKey:'content',
         placeholder: '请选择广告显示dot类型',
         multiple: false,
         className: 'input80',
@@ -376,6 +346,7 @@ export default {
         label: '广告位内容显示行数:',
         ele: 'xd-radio',
         valueKey: 'rows',
+        groupKey:'content',
         value: params.rows || 1,
         list: [
           {"label": "一行", "value": 1},
@@ -383,16 +354,65 @@ export default {
           {"label": "三行", "value": 3},
         ]
       },
-      params['isCarousel']===2 && params['rows'] === 1 && {
-        label: '是否启用配套背景:',
-        ele: 'xd-radio',
-        valueKey: 'isSupport',
-        value: params['isSupport'] || 'Y',
-        list: [
-          {"label": "启用", "value": 'Y'},
-          {"label": "禁用", "value": 'N'},
-        ]
+      {
+        label: '广告位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        groupKey:'style',
+        value: params.margin || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置广告位边距设置',
+        inline: false,
+        notice: '设置边距充，<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
+
       },
+      {
+        label: '广告位填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bgImagePadding',
+        value: params['bgImagePadding'] || null,
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请填充设置',
+        inline: false,
+        notice: '设置内填充，<span style="color: red">单位：像素（px）</span>。无背景时候默认值：<span style="color: red">20</span>像素。有背景时候默认值：<span style="color: red">0</span>像素。',
+      },
+      params.poster &&  params.poster['type'] && params.number > 1 && {
+        label: '广告内容之间间距设置:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'padding',
+        value: params.padding || 0,
+        groupKey:'style',
+        className: 'input40',
+        placeholder: '请广告内容之间间距设置',
+        notice: '请广告内容之间间距设置。<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
+        inline: false,
+      },
+      {
+        label: '广告圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        groupKey:'style',
+        value: params['radius'] || '20',
+        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);
+            });
+        },
+      },
+
     ].filter(i=>i)
   },
   advanced: [