jufubao-base 1.0.129 → 1.0.130-beta2

package/src/components/JfbBaseRecharge/Attr.js

@@ -8,38 +8,31 @@ export default {
   content: (data) => {
     return [
       {
-        label: '券号框自定义文案:',
+        label: '票券框自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'card_num_placeholder',
+        groupKey:'content',
         value: data.card_num_placeholder||'',
-        placeholder: '请输入券号框自定义文案',
+        placeholder: '请输入票券框自定义文案',
         className: 'input80'
       },
       {
-        label: '充值点数自定义文案:',
+        label: '票券充值点数自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'point_placeholder',
+        groupKey:'content',
         value: data.point_placeholder || '',
-        placeholder: '请输入充值点数自定义文案',
+        placeholder: '请输入票券充值点数自定义文案',
         className: 'input80'
       },
-      {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
-        value: data['payPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
+
       {
         label: '注意事项:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data.notice || null,
         className: 'input70',
         setting: {
@@ -60,7 +53,10 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
+          //let loading = XdBus.getParentApi('loading')({});
+
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close(){}}
 
           //获取显示内容
           if (action === 'screen') {
@@ -104,6 +100,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -118,6 +115,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -131,6 +129,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -145,6 +144,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -159,6 +159,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -173,6 +174,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -186,6 +188,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -200,6 +203,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -214,6 +218,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -228,6 +233,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -242,19 +248,25 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
+      },
+      {
+        label: '票券支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择票券支付路径',
+        value: data['payPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
         inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-        ],
       },
     ].filter(i=>i)
   },
-  advanced: [
-    
-  ],
+  advanced: [ ],
 };

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -42,10 +42,16 @@
           >
         </view>
       </view>
-      <view style="font-size: 30rpx; padding: 0rpx 40rpx 40rpx 40rpx">
-        <view style="color: #666666">注意事项:</view>
-        <view v-html="content"></view>
+      <view class="xd-notice-content" v-if="content">
+        <view>注意事项:</view>
+        <view v-html="content" class="prod_info"></view>
       </view>
+      <view
+        v-if="isPreview && statusContent === true && content === '' "
+        class="xd-notice"
+        :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
+      >注意事项未配置数据，因此改模块在正式环境将不显示</view>
+      <view class="bottom_btn-mask"></view>
     </view>
   </view>
 </template>
@@ -58,6 +64,7 @@ import JfbBaseRechargeMixin from "./JfbBaseRechargeMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
+import Color from "color";
 export default {
   name: "JfbBaseRecharge",
   components: {
@@ -68,13 +75,19 @@ export default {
   data() {
     return {
       card_num_placeholder: "",
-      card_pwd_placeholder: "",
-      content: "",
+      point_placeholder: "",
+
       cardNumber: "",
       card_point: "",
       payPath: "",
       amount: "",
-      timer:null
+      timer:null,
+
+      //提示文案
+      isPreview: false,
+      content: "",
+      statusContent: false,
+      noticeBgc:'',
     };
   },
   watch: {
@@ -91,6 +104,8 @@ export default {
     },
   },
   created() {
+    this.isPreview = this.$configProject.isPreview;
+    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
     this.init(this.container);
   },
   methods: {
@@ -125,8 +140,10 @@ export default {
         },
       })
         .then((res) => {
-          this.content = res.list[0].content;
-          console.log(this.content, "this.content");
+          if(res && res.list && res.list.length > 0) {
+            this.content = res.list[0].content;
+          }
+          this.statusContent = true;
         })
         .catch((error) => {
           console.error(error);
@@ -216,6 +233,35 @@ export default {
         margin-bottom: unit(30, rpx);
       }
     }
+
+    .xd-notice-content {
+      padding: 0 40rpx 40rpx 40rpx;
+      & > view:first-child {
+        font-size: 32rpx;
+        font-weight: 500;
+        color: #333;
+        margin-bottom: 20rpx;
+      }
+      & > view:last-child {
+        line-height: 44rpx;
+        font-size: 26rpx;
+        color: #666;
+        /deep/ img, /deep/ image{
+          max-width: 100% !important;
+          height: auto !important;
+          margin: 22rpx 0;
+        }
+
+        /deep/ *{
+          max-width: 100% !important;
+        }
+      }
+    }
+    .xd-notice {
+      margin-top: unit(20, rpx);
+      padding: unit(40, rpx);
+      border-radius: unit(15, rpx)
+    }
   }
 }
 </style>

package/src/components/JfbBaseRecharge/JfbBaseRechargeLess.less

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

package/src/components/JfbBaseRechargeOrder/Attr.js

@@ -9,23 +9,24 @@ export default {
   content: (data) => {
     return [
       {
-        label: '外边距:',
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
+        groupKey:'style',
         value: data['margin'] || null,
-        disabled: false,
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置外边距',
+        placeholder: '请设置外填充',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置填充距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
         value: data['backgroundColor'] || null,
+        groupKey:'style',
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
       },
@@ -35,18 +36,23 @@ export default {
         type: 'number',
         valueKey: 'padding',
         value: data.padding || '',
+        groupKey:'style',
         placeholder: '请输入间距',
         className: 'input80',
+        inline: false,
+        notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
         label: '投影设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
         valueKey: 'is_shadow',
+        groupKey:'style',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
@@ -60,6 +66,7 @@ export default {
         label: '投影颜色:',
         ele: 'xd-color',
         valueKey: 'is_shadow_bg',
+        groupKey:'style',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
         classNmae: 'input80',
@@ -68,6 +75,7 @@ export default {
         label: '投影范围:',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
+        groupKey:'style',
         value: data['is_shadow_w'] || '10',
         placeholder: '请选择投影范围',
         multiple: false,
@@ -88,13 +96,15 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
         ele: 'xd-radio',
         valueKey: 'is_border',
         value: data['is_border'] || 'N',
+        groupKey:'style',
         placeholder: '请选择是否有边框',
         multiple: false,
         className: 'input80',
@@ -107,6 +117,7 @@ export default {
         label: '边框颜色:',
         ele: 'xd-color',
         valueKey: 'is_border_c',
+        groupKey:'style',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
         classNmae: 'input80',
@@ -115,6 +126,7 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
         placeholder: '请输入边框颜色',
@@ -124,6 +136,7 @@ export default {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -139,27 +152,24 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '其他',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
-        placeholder: '请选择订单详情路径',
-        value: data.detailPath || {},
+        label: '订单详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
+        placeholder: '请选择订单详情地址',
+        value: data.detailPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
       {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
-        value: data.payPath || {},
+        label: '去支付地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择去支付地址',
+        value: data.payPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -92,7 +92,7 @@
           </view>
         </view>
       </template>
-      
+
     </view>
   </view>
 </template>
@@ -156,9 +156,11 @@ export default {
   },
   computed: {
     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")
@@ -280,18 +282,18 @@ export default {
         url: `${this.detailPath}?id=${item.order_id}`,
       });
     },
-   
+
     onJfbReachBottom(options) {
       if (this.hasNext) {
         this.page_token = this.next_page_token;
         this.getList();
       }
     },
-    
+
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack()
     },
-    
+
   },
 };
 </script>
@@ -304,6 +306,9 @@ export default {
     color: #333;
     &-order {
       padding: unit(32, rpx);
+      &:last-child {
+        margin-bottom: 0!important;
+      }
 
       &-header {
         font-size: unit(28, rpx);

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrderLess.less

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

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetailLess.less

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

package/src/components/JfbBaseRechargeSuccess/Attr.js

@@ -8,21 +8,23 @@ export default {
   content: (data) => {
     return [
       {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
+        label: '充值成功去订单详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
         placeholder: '请选择订单详情路径',
-        value: data.detailPath || {},
+        value: data.detailPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
       {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
+        label: '重新支付地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择重新支付地址',
         value: data.payPath || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree'),