jufubao-base 1.0.130-beta5 → 1.0.131

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -5,12 +5,146 @@ export default {
   advanced: [],
   content: (data)=>{
     return [
+      {
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: data['margin'] || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'backgroundColor',
+        value: data['backgroundColor'] || null,
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '间距:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'padding',
+        value: data.padding || '',
+        placeholder: '请输入间距',
+        className: 'input80',
+      },
+      {
+        ele: 'title',
+        label: '投影设置',
+        size: 'small', //default/mini/small
+      },
+      {
+        label: '是否有投影:',
+        ele: 'xd-radio',
+        valueKey: 'is_shadow',
+        value: data['is_shadow'] || 'N',
+        placeholder: '请选择是否投影',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影颜色:',
+        ele: 'xd-color',
+        valueKey: 'is_shadow_bg',
+        value: data['is_shadow_bg'] || '',
+        placeholder: '请选择投影颜色',
+        classNmae: 'input80',
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影范围:',
+        ele: 'xd-site-select-list',
+        valueKey: 'is_shadow_w',
+        value: data['is_shadow_w'] || '10',
+        placeholder: '请选择投影范围',
+        multiple: false,
+        className: 'input80',
+        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);
+            });
+        },
+      },
+      {
+        ele: 'title',
+        label: '边框设置',
+        size: 'small', //default/mini/small
+      },
+      {
+        label: '是否有边框:',
+        ele: 'xd-radio',
+        valueKey: 'is_border',
+        value: data['is_border'] || 'N',
+        placeholder: '请选择是否有边框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'is_border_c',
+        value: data['is_border_c'] || '',
+        placeholder: '请选择边框颜色',
+        classNmae: 'input80',
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框大小:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'is_border_w',
+        value: data['is_border_w'] || '',
+        placeholder: '请输入边框颜色',
+        className: 'input80',
+      },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '',
+        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: '业务类型预览（只是预览模式生效）',
         ele: "xd-select-list",
         valueKey: "viewStatus",
         value: data.viewStatus || "mall",
-        groupKey:'content',
         className: 'input80',
         list: [
           {label: '商城', value: "mall"},
@@ -19,15 +153,67 @@ export default {
           {label: '在线选座&演出电子码', value: "playCode"},
           {label: '核销', value: "cashier"},
         ],
+      },
+      {
+        label: '查看品牌路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'brandPath', //form[valueKey]
+        placeholder: '请选择查看品牌路径',
+        value: data['brandPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '查看访问路径容器:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'webViewPath', //form[valueKey]
+        placeholder: '请选择查看访问路径容器',
+        value: data['webViewPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '支付路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'payPath', //form[valueKey]
+        placeholder: '请选择支付路径',
+        value: data['payPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      // {
+      //   label: '查看单个包裹物流路径:', //label
+      //   ele: 'xd-select-pages-path', //package 名称
+      //   valueKey: 'logisticsPath', //form[valueKey]
+      //   placeholder: '请选择查看单个包裹物流路径',
+      //   value: data['logisticsPath'] || null,
+      //   setting: {
+      //     router: XdBus.getParentApi('getPagesTree'),
+      //   },
+      //   inline: false,
+      // },
+      {
+        label: '查看包裹列表路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'packageListPath', //form[valueKey]
+        placeholder: '请选择查看包裹列表路径',
+        value: data['packageListPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
         inline: false,
-        notice: '前台页面展示会根据返回数据类型进行页面渲染'
       },
       {
         label: '是否需要客服电话:',
         ele: 'xd-radio',
         valueKey: 'is_hot',
         value: data['is_hot'] || 'N',
-        groupKey:'content',
         placeholder: '请选择是否需要客服电话',
         multiple: false,
         className: 'input80',
@@ -40,7 +226,6 @@ export default {
         label: '自定义内容:',
         ele: 'xd-site-news',
         valueKey: 'notice',
-        groupKey:'content',
         value: data['notice'] || null,
         className: 'input70',
         setting: {
@@ -61,12 +246,11 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
+          let loading = XdBus.getParentApi('loading')({});
 
           //获取显示内容
           if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
+            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
               .then(res => {
                 loading.close();
                 data.cb(res['list'])
@@ -83,7 +267,7 @@ export default {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
               .then(res => {
                 loading.close()
-                data.cb({list: res.list, selectId: res.selected})
+                data.cb({ list: res.list, selectId: res.selected })
               })
               .catch(error => {
                 loading.close()
@@ -106,7 +290,6 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -121,7 +304,6 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -135,7 +317,6 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -150,7 +331,6 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -165,7 +345,6 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -180,7 +359,6 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -194,7 +372,6 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -209,7 +386,6 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -224,7 +400,6 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -239,7 +414,6 @@ export default {
 
           //内容发布
           if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -254,203 +428,12 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
-      },
-      {
-        label: '外填充:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: data['margin'] || null,
-        groupKey:'style',
-        setting: {
-          type: 'margin',
-        },
-        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'] || null,
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '间距:',
-        groupKey:'style',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: data.padding || '',
-        placeholder: '请输入间距',
-        className: 'input80',
-        inline: false,
-        notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
-      {
-        ele: 'title',
-        label: '投影设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '是否有投影:',
-        ele: 'xd-radio',
-        groupKey:'style',
-        valueKey: 'is_shadow',
-        value: data['is_shadow'] || 'N',
-        placeholder: '请选择是否投影',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
-      },
-      data['is_shadow'] === 'Y' && {
-        label: '投影颜色:',
-        ele: 'xd-color',
-        groupKey:'style',
-        valueKey: 'is_shadow_bg',
-        value: data['is_shadow_bg'] || '',
-        placeholder: '请选择投影颜色',
-        classNmae: 'input80',
-      },
-      data['is_shadow'] === 'Y' && {
-        label: '投影范围:',
-        ele: 'xd-site-select-list',
-        valueKey: 'is_shadow_w',
-        groupKey:'style',
-        value: data['is_shadow_w'] || '10',
-        placeholder: '请选择投影范围',
-        multiple: false,
-        className: 'input80',
-        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);
-            });
-        },
-      },
-      {
-        ele: 'title',
-        label: '边框设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '是否有边框:',
-        ele: 'xd-radio',
-        valueKey: 'is_border',
-        value: data['is_border'] || 'N',
-        groupKey:'style',
-        placeholder: '请选择是否有边框',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
-      },
-      data['is_border'] === 'Y' && {
-        label: '边框颜色:',
-        ele: 'xd-color',
-        groupKey:'style',
-        valueKey: 'is_border_c',
-        value: data['is_border_c'] || '',
-        placeholder: '请选择边框颜色',
-        classNmae: 'input80',
-      },
-      data['is_border'] === 'Y' && {
-        label: '边框大小:',
-        groupKey:'style',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'is_border_w',
-        value: data['is_border_w'] || '',
-        placeholder: '请输入边框颜色',
-        className: 'input80',
-      },
-      {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        groupKey:'style',
-        value: data['radius'] || '',
-        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);
-            });
-        },
-      },
-
-      {
-        label: '查看品牌路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'brandPath',
-        groupKey:'advanced',
-        placeholder: '请选择查看品牌路径',
-        value: data['brandPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      {
-        label: '查看访问路径容器:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'webViewPath',
-        groupKey:'advanced',
-        placeholder: '请选择查看访问路径容器',
-        value: data['webViewPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      {
-        label: '支付路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'payPath',
-        groupKey:'advanced',
-        placeholder: '请选择支付路径',
-        value: data['payPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      {
-        label: '查看包裹列表路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'packageListPath',
-        groupKey:'advanced',
-        placeholder: '请选择查看包裹列表路径',
-        value: data['packageListPath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
         inline: false,
+        notice: '',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -783,7 +783,6 @@ import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
 import { mapState } from "vuex";
 import bizMock from "./bizMock";
-import { Base64 } from "js-base64";
 
 export default {
   name: "JfbBaseOrderDetail",
@@ -865,11 +864,9 @@ export default {
     },
     ...mapState(["brandInfo"]),
     outMargin() {
-      let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-      return str
+      return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${
+        this.margin.bottom || 20
+      }rpx ${this.margin.left || 20}rpx`;
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -1294,11 +1291,12 @@ export default {
   &__body {
     color: #333;
     .logo-icon {
-      width: unit(100, rpx) !important;
-      height: unit(100, rpx) !important;
+      width: unit(80, rpx) !important;
+      height: unit(80, rpx) !important;
       position: absolute;
       top: 50%;
       transform: translate(-50rpx, -50rpx);
+      margin-top: 0;
     }
     &-show {
       display: flex;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetailLess.less

@@ -13,8 +13,9 @@
 
 //start
 .jfb-base-order-detail {
+  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -22,21 +23,21 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx {
     position: relative;
-    z-index: 3;
-    &::after {
-      border: 2rpx dashed blue;
-      content: " ";
-      position: absolute;
-      top:0;
-      left:0;
-      bottom:0;
-      right:0;
-      z-index: 4;
-      cursor: pointer;
-    }
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
 
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
   }
 
 
@@ -71,9 +72,9 @@
 
 /**notPreview**/
 .jfb-base-order-detail {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
+  &:before {
+    content: " ";
+    display: table;
+  }
 }
 /**endNotPreview**/