jufubao-base 1.0.77-beta6 → 1.0.77-beta7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.77-beta6",
+  "version": "1.0.77-beta7",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -14,7 +14,17 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-entry__body" :style="bodyStyle">
-      <view class="entry_list" :style="entryStyle">
+      <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
+        <view v-for="i in 5" :key="i"
+          :class="'row_num_'+rowNum"
+          class="entry_item"
+        >
+          <image v-if="rowNum == 1" style="height: 260rpx;"/>
+          <image v-if="rowNum == 2" style="height: 200rpx;"/>
+          <image v-if="rowNum == 3" style="height: 150rpx;"/>
+        </view>
+      </view>
+      <view v-else class="entry_list" :style="entryStyle">
         <view v-for="(item,i) in entryList" :key="i"
           class="entry_item"
           :class="'row_num_'+rowNum"
@@ -52,6 +62,7 @@
         bgcolor: "",
         rowNum: 1,
         paddingInput: 20,
+        loadingList: true,
       }
     },
     computed: {
@@ -96,6 +107,7 @@
           vm: this,
           data: {}
         }).then(res => {
+          this.loadingList = false;
           this.$xdHideLoading();
           this.entryList = res.list.map(item => {
             const {dir, path, host} = item['redirect_data'];
@@ -160,9 +172,15 @@
     &__body{
       .entry_list{
         display: grid;
+        &.skeleton-wrap{
+          .entry_item{
+            .skeleton-item(100%, auto);
+          }
+        }
         .entry_item{
           width: 100%;
           box-sizing: border-box;
+
           image{
             width: 100%;
             display: block;

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -196,7 +196,7 @@
             if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
             else jumpUrl = path;
             //#endif
-            jumpUrl = `${jumpUrl}${bus}`;
+            jumpUrl = `${jumpUrl}${bus}}`;
             return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
           }
         })

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -37,25 +37,28 @@
               <xd-font-icon :color="color" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>
           </template>
-          <view class="no-image" :style="{borderColor: color}" v-else>
+          <view v-else class="no-image" :style="{borderColor: color}">
             <xd-font-icon :color="color" icon="iconwode_mian" size="90"></xd-font-icon>
           </view>
+
           <view v-if="logined && textType ==='N'" :style="{color:color}">{{userInfo|getName}}</view>
           <view class="vertical-user" v-if="logined && textType ==='Y'" :style="{color:color}">
             <view>{{userInfo|getName}}</view>
-            <view @click="handleToLink()" v-if="0">
+            <view @click="handleToLink()">
               <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
-        <view @click="handleToLink()" v-if="logined && textType ==='N' && 0 ">
-          <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
+
+        <view @click="handleLogout()" v-if="logined" class="logout">
+          <view v-if="textType ==='N'">[退出登录]</view>
         </view>
       </view>
     </view>
   </view>
 </template>
 
+
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { jfbRootExec } from "@/utils/xd.event";
@@ -64,6 +67,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import {mapState} from 'vuex';
+  import store from "@/store";
   export default {
     name: "JfbBaseUserInfo",
     components: {
@@ -72,7 +76,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserInfoMixin],
     computed: {
       ...mapState(['jfbAuthorize']),
-      
+
       outMargin() {
         let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
         margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
@@ -106,24 +110,24 @@
         logined: false,
         userInfo: null,
         address_url: '',
-        
+
         //基础
         color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         textType: 'N', //默认水平
         radius: 0,
-        
+
         //投影
         is_shadow: 'Y',
         is_shadow_bg: 0,
         is_shadow_w: 0,
-        
-        
+
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
-        
+
         //其他
         margin: {
           top: 0,
@@ -137,7 +141,7 @@
           right: 0,
           bottom: 0
         },
-        
+
       }
     },
     watch: {
@@ -154,8 +158,27 @@
           url: '/pages/settings/settings'
         })
       },
+
+      async handleLogout(){
+        debugger
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
+
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res=>{
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err=>{
+            console.error(err);
+          })
+        }
+      },
+
       async onJfbLoad(options) {
-        
+
         //预览模式
         if(this.$configProject.isPreview) {
           jfbRootExec('getBaseUserInfo', {
@@ -170,10 +193,10 @@
           });
           return;
         }
-        
+
         this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
         if(!this.logined) return;
-        
+
         jfbRootExec('getBaseUserInfo', {
           vm: this,
           data: {}
@@ -194,16 +217,16 @@
         this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
-        this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
-        
+        this.textType = "N";//getContainerPropsValue(container, 'content.text_type', 'N');
+
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
         this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
-  
+
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '10');
-        
+
         this.radius = getContainerPropsValue(container, 'content.radius', '0');
       },
     }
@@ -213,7 +236,7 @@
 
 <style scoped lang="less">
   @import "./JfbBaseUserInfoLess.less";
-  
+
   .vertical-user {
     display: flex;
     justify-content: center;
@@ -229,29 +252,29 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        
-    
+
+
         &-left {
           display: flex;
           align-items: center;
           flex: 1;
-  
+
           &.vertical {
             width: 100%;
             flex-direction: column;
-            
+
             & > view:last-child {
               width: 100%;
               text-align: center;
               flex-shrink: 0;
               padding-top: unit(20, rpx);
             }
-  
+
             & > image, .no-image {
               margin-right: unit(0, rpx);
             }
           }
-      
+
           & > image, .no-image {
             width: unit(140, rpx);
             height: unit(140, rpx);
@@ -263,21 +286,28 @@
             flex-shrink: 0;
             overflow: hidden;
           }
-          
+
           .no-image {
             border: unit(4, rpx) solid #e5e5e5;
           }
-      
+
           & > view {
             color: #383838;
             font-size: unit(32, rpx);
           }
         }
-        
+
         & > view:nth-child(2) {
           flex-shrink: 0;
         }
       }
     }
+
+    .logout {
+      font-size: unit(26, rpx);
+      & > view {
+        color: #333;
+      }
+    }
   }
 </style>