From b1dd7463eebcd7e67f94244988ebbc3b9d29c1b7 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 16:35:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/layout/components/Navbar.vue |   84 +++++++++++++++++++++++-------------------
 1 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ba4d987..0fe19aa 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,18 +7,18 @@
     <div class="right-menu">
       <div class="right-serves">
         <!-- <i class="el-icon-setting" /> -->
-        
+
         <p @click="toMessage"><el-badge is-dot class="el-icon-bell message-icon"></el-badge></p>
         <!-- <i class="el-icon-time" /> -->
       </div>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <a class="user-avatar">{{ user.name.slice(0,1) }}</a>
+          <a class="user-avatar">{{ user.name.slice(0, 1) }}</a>
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
-            <el-dropdown-item >
-              <p @click="dialogFormVisible = true">淇敼瀵嗙爜</p>
-            </el-dropdown-item>
+          <el-dropdown-item>
+            <p @click="dialogFormVisible = true">淇敼瀵嗙爜</p>
+          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span style="display:block;">閫�鍑虹櫥褰�</span>
           </el-dropdown-item>
@@ -49,15 +49,15 @@
 import { mapGetters } from 'vuex'
 // import Breadcrumb from '@/components/Breadcrumb'
 // import Hamburger from '@/components/Hamburger'
-	import {
-		get,
-		post,
-		wpost,
-		postFile
-	} from "@/api/util/requestUtil.js"
+import {
+  get,
+  post,
+  wpost,
+  postFile
+} from "@/api/util/requestUtil.js"
 
 export default {
-  data(){
+  data() {
     return {
       form: {
         oldPwd: '',
@@ -65,15 +65,15 @@
         confirmPwd: ''
       },
       user: {
-				id: null,
-				name: 'value'
-			},
+        id: null,
+        name: 'value'
+      },
       dialogFormVisible: false,
       formLabelWidth: '120px',
-			user: {
-				id: null,
-				name: 'value'
-			}
+      user: {
+        id: null,
+        name: 'value'
+      }
     }
   },
   components: {
@@ -86,20 +86,20 @@
       'avatar'
     ])
   },
-	mounted() {
-		this.getUser()
-	},
+  mounted() {
+    this.getUser()
+  },
   methods: {
-    reset(){
+    reset() {
       this.dialogFormVisible = false;
       this.form.oldPwd = '';
       this.form.newPwd = '';
       this.form.confirmPwd = '';
     },
-    toMessage(){
+    toMessage() {
       this.$router.push('/message/toDo');
     },
-    editPwd(){
+    editPwd() {
       console.log(1);
     },
     toggleSideBar() {
@@ -108,16 +108,18 @@
     async logout() {
       // await this.$store.dispatch('user/logout')
       sessionStorage.removeItem("user")
+      localStorage.removeItem("autoenter");
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)     
       this.$router.replace({path: '/login'});
       location.reload();
+      
     },
-		getUser(){
-			get(this.$url.info).then(res=>{
-				this.user = res.data
-        sessionStorage.setItem("user",JSON.stringify(res.data))
-			})
-		}
+    getUser() {
+      get(this.$url.info).then(res => {
+        this.user = res.data
+        sessionStorage.setItem("user", JSON.stringify(res.data))
+      })
+    }
   }
 }
 </script>
@@ -130,21 +132,24 @@
   background: #fff;
   display: flex;
   border-bottom: 1px solid #f0f2f5;
+
   // box-shadow: 0 0 0.857143rem rgba(0, 0, 0, 0.12);
   // box-shadow: 0 1px 4px rgba(0,21,41,.08);
-  .message-icon{
+  .message-icon {
     margin-right: 10px;
     cursor: pointer;
   }
-  .v-modal{
+
+  .v-modal {
     z-index: 8;
   }
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -161,11 +166,13 @@
     line-height: 50px;
     display: flex;
     justify-content: right;
-    .right-serves{
+
+    .right-serves {
       height: 100%;
       display: flex;
       align-items: center;
-      >i{
+
+      >i {
         display: inline-block;
         margin: auto 10px;
         font-size: 20px;
@@ -198,6 +205,7 @@
     .avatar-container {
       margin-right: 24px;
       height: 100%;
+
       .avatar-wrapper {
         // margin-top: 5px;
         width: 40px;
@@ -206,6 +214,7 @@
         display: flex;
         align-items: center;
         justify-content: center;
+
         .user-avatar {
           cursor: pointer;
           width: 30px;
@@ -229,5 +238,4 @@
       }
     }
   }
-}
-</style>
+}</style>

--
Gitblit v1.9.3