jufubao-base 1.0.135 → 1.0.137-beta1

package/src/components/JfbBaseWallet/JfbBaseWallet.vue

@@ -14,21 +14,22 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-wallet__body">
-      <view class="jfb-base-wallet__body-title">我的账户</view>
-      <view class="jfb-base-wallet__body-type">
-        <view
-          :style="{
-            marginRight: index === showType.length - 1 ? '0' : '36rpx',
-          }"
-          v-for="(item, index) in showType"
-          @click="handleJumpTo(item)"
-          :key="index"
-          class="jfb-base-wallet__body-type-item"
-        >
-          <XdFontIcon :icon="item.icon"></XdFontIcon>
-          <view>{{ item.label }}</view>
+      <template v-if="showContent">
+        <view class="jfb-base-wallet__body-title">我的账户</view>
+        <view class="jfb-base-wallet__body-type" v-if="showType.length > 0">
+          <view
+            :style="{marginRight: index === showType.length - 1 ? '0' : '36rpx',}"
+            v-for="(item, index) in showType"
+            @click="handleJumpTo(item)"
+            :key="index"
+            class="jfb-base-wallet__body-type-item"
+          >
+            <XdFontIcon :icon="item.icon"></XdFontIcon>
+            <view>{{ item.label }}</view>
+          </view>
         </view>
-      </view>
+        <view v-else class="jfb-base-wallet__body-type notice" :style="{backgroundColor:backgroundColor, color:warningColor}">我的账户无配置数据，在正式环境将不显示改模块</view>
+      </template>
     </view>
   </view>
 </template>
@@ -40,6 +41,7 @@ import JfbBaseWalletMixin from "./JfbBaseWalletMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
+import Color from "color";
 export default {
   name: "JfbBaseWallet",
   components: {
@@ -55,7 +57,7 @@ export default {
           value: "card",
         },
         {
-          icon: "iconyuanbao", 
+          icon: "iconyuanbao",
           label: "元宝",
           value: "wallet",
         },
@@ -73,6 +75,9 @@ export default {
       cardPath: "",
       yuanbaoPath: "",
       integralPath: "",
+
+
+      backgroundColor: '',
     };
   },
   watch: {
@@ -160,7 +165,6 @@ export default {
     showType() {
       this.typeList.forEach((item1, index) => {
         const item2 = this.newLabel.find((item) => item.value === item1.value);
-
         if (item2) {
           item1.label = item2.newLabel || item1.label;
           item1.sort = item2.sort;
@@ -169,21 +173,21 @@ export default {
       this.typeList.sort((a, b) => a.sort - b.sort);
       return this.typeList;
     },
+    showContent(){
+      if(this.$configProject.isPreview) return true;
+      return this.showType.length > 0;
+    }
   },
   created() {
+    this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.init(this.container);
     this.isPreview = this.$configProject.isPreview;
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {
-      // jfbRootExec('baiduUserLogin', {
-      //   vm: this,//   data: {
-      //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-      //   }
-      // }).then().catch()
+
     },
+
     /**
      * @description 监听事件变化
      * @param container {object} 业务组件对象自己
@@ -242,27 +246,6 @@ export default {
           break;
       }
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
-    },
-    onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
-    onJfbShow(options) {
-      console.log("event.onJfbShow", options);
-    },
-    onJfbHide(options) {
-      console.log("event.onJfbHide", options);
-    },
-    onJfbBack(options) {
-      console.log("event.onJfbBack", options);
-    },
-    onJfbUpdate(...data) {
-      console.log("event.onJfbUpdate", data);
-    },
-    onJfbCustomEvent(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
   },
 };
 </script>
@@ -283,6 +266,10 @@ export default {
       padding: 32rpx 48rpx 32rpx 48rpx;
       margin: 0 20rpx 0;
 
+      &.notice {
+        font-size: 26rpx;
+      }
+
       &-item {
         color: #999999;
         flex: 1;

package/src/components/JfbBaseWallet/JfbBaseWalletLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-wallet {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-wallet {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWalletDetail/Attr.js

@@ -6,11 +6,7 @@
 export default {
   style: [],
   content: (data) => {
-    return [
-
-    ].filter(i=>i)
+    return [].filter(i=>i)
   },
-  advanced: [
-  ],
+  advanced: [],
 };
- 

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetailLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-wallet-detail {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-wallet-detail {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffectiveLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-wallet-effective {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-wallet-effective {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWalletIndex/Attr.js

@@ -11,15 +11,17 @@ export default {
         label: '钱包详情跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'walletDetailPath',
+        groupKey:'advanced',
         value: data['walletDetailPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
-      }, 
+      },
       {
         label: '账单详情跳转路径:',
         ele: 'xd-select-pages-path',
+        groupKey:'advanced',
         valueKey: 'billDetailPath',
         value: data['billDetailPath'] || {},
         setting: {

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndexLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-wallet-index {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-wallet-index {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWalletItem/Attr.js

@@ -11,16 +11,18 @@ 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,9 +13,7 @@
 
 //start
 .jfb-base-wallet-item {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-wallet-item {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWebview/JfbBaseWebviewLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-webview {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    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-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,