jufubao-base 1.0.129 → 1.0.130-beta3

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTopLess.less

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

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -5,146 +5,12 @@ 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"},
@@ -153,67 +19,15 @@ 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',
@@ -226,6 +40,7 @@ export default {
         label: '自定义内容:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data['notice'] || null,
         className: 'input70',
         setting: {
@@ -246,11 +61,12 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close(){}}
 
           //获取显示内容
           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'])
@@ -267,7 +83,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()
@@ -290,6 +106,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -304,6 +121,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -317,6 +135,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -331,6 +150,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -345,6 +165,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -359,6 +180,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -372,6 +194,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -386,6 +209,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -400,6 +224,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -414,6 +239,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -428,12 +254,203 @@ 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

@@ -336,9 +336,7 @@
                   padding: 10rpx 0;
                   margin: 32rpx 0 32rpx 32rpx;
                 "
-                >{{
-                  info.codes.length > 10 ? index + 1 : `0${index + 1}`
-                }}</view
+                >{{info.codes.length > 10 ? index + 1 : `0${index + 1}` }}</view
               >
               <view
                 class="jfb-base-order-detail__body-card jfb-base-order-detail__body-num"
@@ -867,9 +865,11 @@ export default {
     },
     ...mapState(["brandInfo"]),
     outMargin() {
-      return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${
-        this.margin.bottom || 20
-      }rpx ${this.margin.left || 20}rpx`;
+      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
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -997,12 +997,30 @@ export default {
               if(item.logo) {
                 item.logo = getServiceUrl(item.logo)
               }
-              if (item.show_type === "qrcode" || item.show_type === "barcode") {
+              if (
+                item.show_type === "qrcode"
+                || item.show_type === "barcode"
+                || item.show_type === "qrcode-pass"
+                || item.show_type === "barcode-pass"
+              ) {
                 let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
                 item.code_url = reg.test(item.code_url)? item.code_url:`${this.brandInfo['api_host']}${item.code_url}`
               }
+
+              //二维码 + 密码处理
+              if(item.show_type === "qrcode-pass") {
+                item.show_type = 'qrcode';
+                item.can_read_code = item.can_read_password;
+              }
+              //条形码 + 密码处理
+              if(item.show_type === "barcode-pass") {
+                item.show_type = 'barcode';
+                item.can_read_code = item.can_read_password;
+              }
+
               return item;
             });
+
           if (res.film_show && Object.keys(res.film_show).length > 0) {
             res.film_show.show_time = this.$xdUniHelper.getDate(
               res.film_show.show_time * 1000