jufubao-base 1.0.134-beta9 → 1.0.135

package/src/components/JfbBaseWalletItem/Attr.js

@@ -11,18 +11,16 @@ export default {
         label: '账单详情跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'billDetailPath',
-        groupKey:'advanced',
         value: data['billDetailPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
-      },
+      }, 
       {
         label: '有效期列表跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'effectivePath',
-        groupKey:'advanced',
         value: data['effectivePath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')

package/src/components/JfbBaseWalletItem/JfbBaseWalletItemLess.less

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

package/src/components/JfbBaseWebview/JfbBaseWebviewLess.less

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

package/src/components/JfbBaseWxAuthorize/Api.js

@@ -1,13 +1,13 @@
 'use strict';
 
 /**
- * @description 微信用户授权登录
+ * @description 微信用户授权登陆
  * @type {*[]}
  */
 module.exports = [
   {
     mapFnName: 'userPhoneWxLogin',
-    title: "用户授权登录",
+    title: "用户授权登陆",
     path: "/passport/v1/user/login-phone-number",
     isRule: false,
     params: {
@@ -24,7 +24,7 @@ module.exports = [
     path: "/cms/v1/news-content",
     isRule: false,
     params: {
-
+      
     },
     isConsole: true,
     disable: true,

package/src/components/JfbBaseWxAuthorize/Attr.js

@@ -14,7 +14,6 @@ export default {
         label: '文字颜色:',
         ele: 'xd-color',
         valueKey: 'textColor',
-        groupKey:'style',
         value: data.textColor,
         placeholder: '请选择文字颜色',
         classNmae: 'input80',
@@ -24,7 +23,6 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'notice',
-        groupKey:'content',
         value: data.notice,
         placeholder: '请输入授权按钮下面文案',
         className: 'input80',
@@ -33,11 +31,10 @@ export default {
         label: '背景图:',
         ele: 'xd-upload',
         valueKey: 'bgImage',
-        groupKey:'content',
         value: data.bgImage,
         defaultValue: data.bgImage,
         slot: true,
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*1334像素',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*1120像素',
         type: ['jpg', 'png', 'jpeg'],
         styleType: 'one',
         uploadType: 'aliyun',
@@ -50,7 +47,6 @@ export default {
         label: '隐私政策:',
         ele: 'xd-site-news',
         valueKey: 'privacy',
-        groupKey:'content',
         value: data['privacy'] || {type: 'privacy'},
         className: 'input70',
         setting: {
@@ -72,7 +68,7 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
+          let loading = XdBus.getParentApi('loading')({});
 
           //获取显示内容
           if (action === 'screen') {
@@ -116,7 +112,6 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -131,7 +126,6 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -145,7 +139,6 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -160,7 +153,6 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -175,7 +167,6 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -190,7 +181,6 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -204,7 +194,6 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -219,7 +208,6 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -234,7 +222,6 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -249,7 +236,6 @@ export default {
 
           //内容发布
           if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -264,7 +250,6 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
@@ -276,7 +261,6 @@ export default {
         label: '用户服务协议:',
         ele: 'xd-site-news',
         valueKey: 'service',
-        groupKey:'content',
         value: data['service'] || {type: 'privacy'},
         className: 'input70',
         setting: {
@@ -297,8 +281,7 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
+          let loading = XdBus.getParentApi('loading')({});
 
           //获取显示内容
           if (action === 'screen') {
@@ -342,7 +325,6 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -357,7 +339,6 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -371,7 +352,6 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -386,7 +366,6 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -401,7 +380,6 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -416,7 +394,6 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -430,7 +407,6 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -445,7 +421,6 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -460,7 +435,6 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -475,7 +449,6 @@ export default {
 
           //内容发布
           if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -490,7 +463,6 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -15,14 +15,8 @@
     <!-- #endif -->
     <view class="jfb-base-wx-authorize__body">
       <view class="app-body">
-        <view
-          class="app-body__bg"
-          :style="{
-            height: layoutInfo.bodyMinHeightRpx + 'rpx',
-            backgroundImage:'url('+ (bgImage ? bgImage:'none') + ')',
-            color:'#ff0'
-          }"
-        >
+        <view class="app-body__bg" :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx'}">
+          <image :src="bgImage" mode="widthFix"></image>
         </view>
         <view class="app-body__bottom">
           <view class="app-body__bottom-btn">
@@ -74,7 +68,7 @@
   import getServiceUrl from "@/common/getServiceUrl";
   import {Base64} from 'js-base64';
   import {mapState} from 'vuex';
-
+  
   export default {
     name: "JfbBaseWxAuthorize",
     components: {
@@ -113,7 +107,7 @@
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
     },
-
+  
     methods: {
       handlePrivacy(code) {
         let params = `page_id=${this.pageAttr["page_id"]}`;
@@ -122,11 +116,11 @@
           url: `/pages/content/content?${params}`
         })
       },
-
+      
       handleRadioClick(e) {
         this.selectPolicy = !this.selectPolicy;
       },
-
+  
       decryptPhoneNumber(e) {
         if (e === undefined) {
           this.$xdConfirm({
@@ -142,10 +136,10 @@
         if (e.detail.errMsg.indexOf('fail') !== -1) {
           return;
         }
-
+    
         let {iv, encryptedData} = e.detail;
         let raw_data = JSON.stringify({iv, encryptedData});
-
+        
         jfbRootExec("userPhoneWxLogin", {
           vm: this,
           data: {
@@ -166,7 +160,7 @@
               $vm: this,
               isTitle: false,
               showClose: false,
-              content: '用户登录失败',
+              content: '用户登陆失败',
               cancel: false,
               confirmText: '我知道了',
               zIndex: this.isPreview ? 2000 : 1400
@@ -177,16 +171,16 @@
             $vm: this,
             isTitle: false,
             showClose: false,
-            content: '用户登录失败',
+            content: '用户登陆失败',
             cancel: false,
             confirmText: '我知道了',
             zIndex: this.isPreview ? 2000 : 1400
           });
         })
-
+        
       },
-
-
+      
+     
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -197,7 +191,7 @@
         this.notice = getContainerPropsValue(container, 'content.notice', '');
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#fff');
       },
-
+  
       onJfbLoad(options = {}) {
         if(this.$xdUniHelper.checkVarType(options) === 'object') {
           this.auth_code = options.auth_code;
@@ -230,30 +224,30 @@
     height: 100%;
     position: relative;
     box-sizing: border-box;
-
+  
     &__bg {
       width: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      background-position: top left;
-
+    
+      & > image {
+        width: 100%;
+      }
     }
-
+  
     &__bottom {
       position: absolute;
       bottom: unit(80, rpx);
       right: unit(30, rpx);
       left: unit(30, rpx);
-
+    
       &-btn {
         display: flex;
         justify-content: center;
         align-items: center;
         padding-bottom: unit(26, rpx);
-
+      
         & > button {
           width: unit(400, rpx);
           height: unit(90, rpx);
@@ -268,13 +262,13 @@
           color: #fff;
         }
       }
-
+    
       &-tips {
         font-size: @xd-font-size-base;
         color: #fffbf9;
         text-align: center;
       }
-
+    
       &-policy {
         padding-top: unit(50, rpx);
         display: flex;
@@ -282,21 +276,21 @@
         align-items: center;
         font-size: @xd-font-size-base;
         color: #fffbf9;
-
+      
         & > view:first-child {
           transform: scale(0.7);
         }
-
+      
         & > view:last-child {
           display: flex;
           justify-content: flex-start;
           align-items: center;
           flex-wrap: wrap;
-
+  
           & > view:first-child {
             color: #fff;
           }
-
+        
           .privacy_book {
             color: #e5e5e5;
             text-decoration: underline;

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorizeLess.less

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

package/src/components/JfbBaseWxAuthorizeError/Attr.js

@@ -7,37 +7,33 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '提示图片:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'noticeBg', //form[valueKey]
+        value: data.noticeBg || null, //v-model
+        defaultValue: data.noticeBg || null, //默认图片对象
+        slot: true, //按钮是否使用slot
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*800像素',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+      },
       {
         label: '按钮自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'btn_placeholder',
-        groupKey: 'content',
         value: data.btn_placeholder || '',
         placeholder: '按钮自定义文案',
         className: 'input80'
       },
       {
-        label: '提示图片:',
-        ele: 'xd-upload',
-        valueKey: 'noticeBg',
-        groupKey: 'content',
-        value: data.noticeBg || null,
-        defaultValue: data.noticeBg || null,
-        slot: true,
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：200*200像素',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5, //5M
-        action: 'aliyun',
-      },
-
-      {
-        label: '返回地址路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'backPath',
-        groupKey: 'advanced',
+        label: '返回地址路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'backPath', //form[valueKey]
         value: data['backPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')