jufubao-base 1.0.130-beta5 → 1.0.131

package/src/components/JfbBaseOrderList/Attr.js

@@ -5,49 +5,22 @@ export default {
   content: (data)=>{
     return [
       {
-        label: '设置订单状态:',
-        ele: 'xd-order-setting',
-        valueKey: 'orderTypeList',
-        value: data['orderTypeList'] || null,
-        groupKey:'content',
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        handleCustom({action, data}) {
-          if (action === 'number') {
-            data.cb([
-              {"label": "全部", "value": 'all'},
-              {"label": "待付款", "value": 'unpaid'},
-              {"label": "待收货", "value": 'unreceived'},
-              {"label": "已取消", "value": 'cancel'},
-              {"label": "已完成", "value": 'com'},
-            ])
-          }
-        },
-        inline: false,
-        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
-        rules: [
-          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
-        ],
-      },
-      {
-        label: '外填充:',
+        label: '外边距:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         value: data['margin'] || null,
-        groupKey:'style',
+        disabled: false,
         setting: {
-          type: 'padding',
+          type: 'margin',
         },
-        placeholder: '请设置外填充',
+        placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
-        groupKey:'style',
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
@@ -57,24 +30,19 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
-        groupKey:'style',
         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',
+        size: 'small', //default/mini/small
       },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
         valueKey: 'is_shadow',
-        groupKey:'style',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
@@ -87,7 +55,6 @@ export default {
       data['is_shadow'] === 'Y' && {
         label: '投影颜色:',
         ele: 'xd-color',
-        groupKey:'style',
         valueKey: 'is_shadow_bg',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
@@ -95,7 +62,6 @@ export default {
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
-        groupKey:'style',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
         value: data['is_shadow_w'] || '10',
@@ -118,12 +84,10 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small',
-        groupKey:'style',
+        size: 'small', //default/mini/small
       },
       {
         label: '是否有边框:',
-        groupKey:'style',
         ele: 'xd-radio',
         valueKey: 'is_border',
         value: data['is_border'] || 'N',
@@ -138,7 +102,6 @@ export default {
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
-        groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -148,7 +111,6 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
-        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
@@ -158,7 +120,6 @@ export default {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        groupKey:'style',
         value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -173,12 +134,40 @@ export default {
             });
         },
       },
-
       {
-        label: '订单详情路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'detailPath',
-        groupKey:'advanced',
+        ele: 'title',
+        label: '其他',
+        size: 'small', //default/mini/small
+      },
+      {
+        label: '设置订单状态:', //label
+        ele: 'xd-order-setting', //package 名称
+        valueKey: 'orderTypeList', //form[valueKey]
+        value: data['orderTypeList'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        handleCustom({action, data}) {
+          if (action === 'number') {
+            data.cb([
+              {"label": "全部", "value": 'all'},
+              {"label": "待付款", "value": 'unpaid'},
+              {"label": "待收货", "value": 'unreceived'},
+              {"label": "已取消", "value": 'cancel'},
+              {"label": "已完成", "value": 'com'},
+            ])
+          }
+        },
+        inline: false,
+        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
+        rules: [
+          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
+        ],
+      },
+      {
+        label: '订单详情路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'detailPath', //form[valueKey]
         placeholder: '请选择订单详情路径',
         value: data['detailPath'] || null,
         setting: {
@@ -187,10 +176,9 @@ export default {
         inline: false,
       },
       {
-        label: '去支付路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'payPath',
-        groupKey:'advanced',
+        label: '去支付路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'payPath', //form[valueKey]
         placeholder: '请选择去支付路径',
         value: data['payPath'] || null,
         setting: {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -252,11 +252,9 @@ export default {
 
   computed: {
     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")

package/src/components/JfbBaseOrderList/JfbBaseOrderListLess.less

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

package/src/components/JfbBasePay/Attr.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm({bgColor: ''}, null, 'pay', true);
+let styleForm = new StyleForm({bgColor: ''}, null, 'pay');
 
 export default {
   style: [],
@@ -15,12 +15,23 @@ export default {
         valueKey: 'pay_success_path', //form[valueKey]
         placeholder: '请选择支付成功路径',
         value: data.pay_success_path || null,
-        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
+      // {
+      //   label: '充值成功跳转路径:', //label
+      //   ele: 'xd-select-pages-path', //package 名称
+      //   valueKey: 'rechargeSuccessPath', //form[valueKey]
+      //   placeholder: '请选择充值成功路径',
+      //   value: data.rechargeSuccessPath || null,
+      //   setting: {
+      //     router: XdBus.getParentApi('getPagesTree'),
+      //
+      //   },
+      //   inline: false,
+      // },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -72,7 +72,7 @@
               <view>ID：{{ ticket.card_number }}</view>
               <view>有效期至：{{ ticket.end_time }}</view>
             </view>
-            <view class="_footer" :style="{borderTop:'1px solid ' + borderColor }">
+            <view class="_footer">
               <view class="_item">
                 <text>剩余：</text>
                 <xd-unit
@@ -180,9 +180,8 @@ import XdRadio from "@/components/XdRadio/XdRadio";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import StyleForm from "@/utils/StyleForm";
 import {isWechat,isWechatTools} from "@/utils/xd.base";
-import color from "color";
-const Color = require('color');
-let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay', true);
+
+let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay');
 
 export default {
   name: "JfbBasePay",
@@ -220,7 +219,6 @@ export default {
       paySuccessPath: "", //支付成功
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
-      borderColor:'rgba(0,0,0,0)',
       options:{}
     };
   },
@@ -280,8 +278,8 @@ export default {
         "content.rechargeSuccessPath",
         { value: "" }
       ).value;
-      styleForm.getInitItem(this, container);
-      this.borderColor = color(this.jfbPayBgColor).lighten(0.5).hex();
+
+      styleForm.getInitItem(this, container)
     },
     getTimeFormat(time) {
       let date = null;
@@ -577,6 +575,7 @@ export default {
           justify-content: space-between;
           font-size: 24rpx;
           padding: 20rpx 30rpx;
+          border-top: unit(2, rpx) solid #eee;
           ._item {
             display: flex;
             align-items: center;

package/src/components/JfbBasePay/JfbBasePayLess.less

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

package/src/components/JfbBasePay/Mock.js

@@ -34,6 +34,5 @@ module.exports = {
         "use_card_point": "5000"
       },
     ],
-  },
-  getBaseOrderStatus:{},
+  }
 }

package/src/components/JfbBasePhoneCollect/Attr.js

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

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,6 +93,7 @@
 <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";
@@ -101,7 +102,6 @@ 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",