jufubao-base 1.0.77-beta7 → 1.0.77

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -37,28 +37,25 @@
               <xd-font-icon :color="color" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>
           </template>
-          <view v-else class="no-image" :style="{borderColor: color}">
+          <view class="no-image" :style="{borderColor: color}" v-else>
             <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()">
+            <view @click="handleToLink()" v-if="0">
               <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
-
-        <view @click="handleLogout()" v-if="logined" class="logout">
-          <view v-if="textType ==='N'">[退出登录]</view>
+        <view @click="handleToLink()" v-if="logined && textType ==='N' && 0 ">
+          <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
         </view>
       </view>
     </view>
   </view>
 </template>
 
-
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { jfbRootExec } from "@/utils/xd.event";
@@ -67,7 +64,6 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import {mapState} from 'vuex';
-  import store from "@/store";
   export default {
     name: "JfbBaseUserInfo",
     components: {
@@ -76,7 +72,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`;
@@ -110,24 +106,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,
@@ -141,7 +137,7 @@
           right: 0,
           bottom: 0
         },
-
+        
       }
     },
     watch: {
@@ -158,27 +154,8 @@
           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', {
@@ -193,10 +170,10 @@
           });
           return;
         }
-
+        
         this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
         if(!this.logined) return;
-
+        
         jfbRootExec('getBaseUserInfo', {
           vm: this,
           data: {}
@@ -217,16 +194,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 = "N";//getContainerPropsValue(container, 'content.text_type', 'N');
-
+        this.textType = 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');
       },
     }
@@ -236,7 +213,7 @@
 
 <style scoped lang="less">
   @import "./JfbBaseUserInfoLess.less";
-
+  
   .vertical-user {
     display: flex;
     justify-content: center;
@@ -252,29 +229,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);
@@ -286,28 +263,21 @@
             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>