jufubao-base 1.0.129 → 1.0.130-beta3

package/src/components/JfbBaseSuccess/Attr.js

@@ -1,6 +1,11 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,radius:null}, null, 'list');
+let styleForm = new StyleForm(
+  {border: null, shadow: null, spacing: '',  margin: null,radius:null},
+  null,
+  'list',
+  true
+);
 export default {
   style: [],
   content: (data)=>{
@@ -10,24 +15,16 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'custom_btn_name',
+        groupKey:'content',
         value: data['custom_btn_name'] || '',
         placeholder: '请输入自定义按钮名称',
         className: 'input80'
       },
-      {
-        "label": "自定义按钮跳转地址:",
-        "ele": "xd-select-pages-path",
-        "valueKey": "custom_btn_path",
-        "value": data['custom_btn_path'] || null,
-        "setting": {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        "inline": false,
-      },
       {
         label: '是否显示码:',
         ele: 'xd-radio',
         valueKey: 'is_show_code',
+        groupKey:'content',
         value:data['is_show_code']|| '',
         placeholder: '请选择',
         list: [
@@ -39,6 +36,7 @@ export default {
         label: '是否显示商品:',
         ele: 'xd-radio',
         valueKey: 'is_show_product',
+        groupKey:'content',
         value:data['is_show_product']|| '',
         placeholder: '请选择',
         list: [
@@ -47,8 +45,9 @@ export default {
         ],
       },
       {
-        label: '自定义内容:',
+        label: '温馨提示配置:',
         ele: 'xd-site-news',
+        groupKey:'content',
         valueKey: 'notice',
         value: data['notice'] || null,
         className: 'input70',
@@ -70,11 +69,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'])
@@ -91,7 +91,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()
@@ -114,6 +114,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -128,6 +129,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -141,6 +143,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -155,6 +158,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -169,6 +173,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -183,6 +188,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -196,6 +202,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -210,6 +217,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -224,6 +232,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -238,6 +247,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -252,14 +262,65 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
         inline: false,
-        notice: '',
+        notice: '温馨提示内容配置选用后(组件预览将不做实时生效处理)，将根据不同业务线展示对应提示内容。',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'listBgColor',
+        groupKey:'style',
+        value: data.listBgColor || '',
+        placeholder: '请选择背景颜色',
+        classNmae: 'input80',
+      },
+      ...styleForm.getForm(data, '二维码样式配置'),
+      {
+        ele: 'title',
+        label: '按钮样式设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnBorderColor',
+        groupKey:'style',
+        value: data['btnBorderColor'] || '',
+        classNmae: 'input80',
+      },
+      {
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnBgColor',
+        groupKey:'style',
+        value: data.btnBgColor || '',
+        classNmae: 'input80',
+      },
+      {
+        label: '文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnTextColor',
+        groupKey:'style',
+        value: data.btnTextColor || '',
+        classNmae: 'input80',
+      },
+      {
+        "label": "自定义按钮跳转地址:",
+        "ele": "xd-select-pages-path",
+        "valueKey": "custom_btn_path",
+        "value": data['custom_btn_path'] || null,
+        "groupKey":'advanced',
+        "setting": {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        "inline": false,
       },
-      ...styleForm.getForm(data, '内容配置')
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -49,9 +49,7 @@
                 ></xd-font-icon>
               </view>
               <view>{{ info.status.status_name }}</view>
-              <view class="jfb-base-success__body-icon-item-tip">{{
-                info.status.comment
-              }}</view>
+              <view class="jfb-base-success__body-icon-item-tip">{{info.status.comment }}</view>
             </view>
             <view class="jfb-base-success__body-icon-btn">
               <view v-for="(item, index) in info['btn']" :key="index">
@@ -107,12 +105,8 @@
                     ></image>
                     <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
                   </view>
-                <view class="jfb-base-success__body-cashier-text">
-                  {{ info.codes[0].can_read_code }}
-                </view>
-                <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
-                  {{info.codes[0].refund_tip_text}}
-                </view>
+                <view class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
+                <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
                   v-if="info.codes[0].code_end_time"
                   class="jfb-base-success__body-cashier-code"
@@ -581,10 +575,26 @@ 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:\/\/|\/\/)+.+$/;
             if (!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;
         });
 

package/src/components/JfbBaseSuccess/JfbBaseSuccessLess.less

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

package/src/components/JfbBaseTestApi/JfbBaseTestApiLess.less

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

package/src/components/JfbBaseTestBody/JfbBaseTestBodyLess.less

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

package/src/components/JfbBaseTestBottom/JfbBaseTestBottomLess.less

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

package/src/components/JfbBaseTestNotice/JfbBaseTestNoticeLess.less

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

package/src/components/JfbBaseTestTop/JfbBaseTestTopLess.less

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