Merge branch 'develop' into release-test

@@ -13,7 +13,7 @@ export const getTokenByCode = (params) => {
 export const loginOut = () => {
 export const loginOut = () => {
   return request({
   return request({
     url: `${import.meta.env.VITE_APP_USER_API_BASEURL}/user/logout`,
     url: `${import.meta.env.VITE_APP_USER_API_BASEURL}/user/logout`,
-    method: 'get'
+    method: 'post'
   })
   })
 }
 }
 
 

@@ -65,9 +65,9 @@ const handleShowMessage = () => {
               <div v-if="item.children && item.children.length !== 0" class="item-container"
               <div v-if="item.children && item.children.length !== 0" class="item-container"
                 :class="{ active: index === menuStore.actived }">
                 :class="{ active: index === menuStore.actived }">
                 <div class="item" @click="switchTo(index)" v-preReClick>
                 <div class="item" @click="switchTo(index)" v-preReClick>
-                  <el-icon v-if="item.meta?.icon">
+                  <!-- <el-icon v-if="item.meta?.icon">
                     <svg-icon :name="item.meta.icon" />
                     <svg-icon :name="item.meta.icon" />
-                  </el-icon>
+                  </el-icon> -->
                   <span v-if="item.meta?.title">{{ item.meta.title }}</span>
                   <span v-if="item.meta?.title">{{ item.meta.title }}</span>
                 </div>
                 </div>
               </div>
               </div>
@@ -149,8 +149,8 @@ header {
     background-color: inherit;
     background-color: inherit;
 
 
     .logo {
     .logo {
-      width: 179px;
-      height: 48px;
+      width: 168px;
+      height: 45px;
     }
     }
 
 
     span {
     span {

@@ -36,6 +36,10 @@ function userCommand(command: 'home' | 'setting' | 'updatePwd' | 'hotkeys' | 'lo
 function pro() {
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', '_blank')
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', '_blank')
 }
 }
+const loaclStorageInfo: any = localStorage.getItem("userData")
+onMounted(() => {
+  console.log('mounted', JSON.parse(userStore.userData).abbreviation)
+})
 </script>
 </script>
 <template>
 <template>
   <div class="tools">
   <div class="tools">
@@ -53,11 +57,17 @@ function pro() {
             <svg-icon name="ep:user-filled" />
             <svg-icon name="ep:user-filled" />
           </el-icon>
           </el-icon>
         </el-avatar>
         </el-avatar>
-        {{ userStore.userName }}
+        <div class="v-uerinfo">
+          <div class="v-top">{{ userStore.userName }}</div>
+          <div class="v-top"> {{ JSON.parse(loaclStorageInfo).abbreviation }}</div>
+        </div>
+        <div>
           <el-icon>
           <el-icon>
             <svg-icon name="ep:caret-bottom" />
             <svg-icon name="ep:caret-bottom" />
           </el-icon>
           </el-icon>
         </div>
         </div>
+
+      </div>
       <template #dropdown>
       <template #dropdown>
         <el-dropdown-menu class="user-dropdown">
         <el-dropdown-menu class="user-dropdown">
           <!-- <el-dropdown-item command="setting">
           <!-- <el-dropdown-item command="setting">
@@ -143,10 +153,26 @@ function pro() {
   cursor: pointer;
   cursor: pointer;
 
 
   .user-wrapper {
   .user-wrapper {
+    display: flex;
+    align-items: center;
+    height: 100%;
+
+    .v-uerinfo {
+      display: flex;
+      flex-direction: column;
+      font-size: 12px;
+
+      .v-top {
+        height: 18px;
+        line-height: 18px;
+      }
+    }
+
     .el-avatar {
     .el-avatar {
       vertical-align: middle;
       vertical-align: middle;
       margin-top: -2px;
       margin-top: -2px;
       margin-right: 4px;
       margin-right: 4px;
     }
     }
   }
   }
-}</style>
+}
+</style>