From b23188df0c4343d51cbc777121d4a138c5a5a1f4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 08 十一月 2023 09:49:29 +0800
Subject: [PATCH] 增加显示用户名及退出优化

---
 src/components/layout/components/appHeader/index.vue |   84 ++++++++++++++++++++++-------------------
 1 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/components/layout/components/appHeader/index.vue b/src/components/layout/components/appHeader/index.vue
index 673e5be..3369f4d 100644
--- a/src/components/layout/components/appHeader/index.vue
+++ b/src/components/layout/components/appHeader/index.vue
@@ -4,7 +4,7 @@
     <div class="header-user-info">
       <div class="avatar"><el-avatar icon="el-icon-user-solid"></el-avatar></div>
       <el-dropdown @command="handleCommand">
-        <div class="el-dropdown-link">鐢ㄦ埛鍚�<i class="el-icon-arrow-down el-icon--right"></i></div>
+        <div class="el-dropdown-link">{{ username }}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item command="logout">閫�鍑�</el-dropdown-item>
         </el-dropdown-menu>
@@ -21,27 +21,33 @@
     headerTitle: String
   },
   data() {
-    return {}
+    return {
+      username: ""
+    }
+  },
+  mounted() {
+    this.username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
   },
   methods: {
-    environmentType(){
+    environmentType() {
       let type
-      if (location.href.includes('192.168.20.119')) {
-          type = 'test'
-      } else if (location.href.includes('192.168') || location.href.includes('localhost')) {
-          type = 'dev'
+      if (location.href.includes("192.168.20.119")) {
+        type = "test"
+      } else if (location.href.includes("192.168") || location.href.includes("localhost")) {
+        type = "dev"
       } else {
-          type = 'prod'
+        type = "prod"
       }
+
       return type
     },
-    getApsPage(){
+    getApsPage() {
       // 棣栭〉閮ㄧ讲鍦ㄥ悇涓幆澧冪殑绔彛
       const loginPathMap = {
-          prod:`//${window.location.hostname}:9080`,
-          test:`//192.168.20.119:9080`,
-          // 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
-          dev: `//192.168.8.112:8082`
+        prod: `//${window.location.hostname}:9080`,
+        test: `//192.168.20.119:9080`,
+        // 鎯宠烦鍒版湰鍦板惎鍔ㄧ殑鐧诲綍椤电殑璇濋渶瑕佹妸dev鏀规垚浣犳湰鍦伴」鐩矾寰�
+        dev: `//192.168.20.102:8080`
       }
       return loginPathMap[this.environmentType()]
     },
@@ -49,25 +55,27 @@
       console.log(command)
       if (command === "logout") {
         // this.$router.push({ path: "/login" })
-        document.cookie = "cookieName=; path=/;";
-        this.$confirm('纭畾瑕佹敞閿�褰撳墠鐢ㄦ埛鍚�?', '娉ㄩ攢鐢ㄦ埛', {
-          confirmButtonText: '纭畾',
-          cancelButtonText: '鍙栨秷',
-          type: 'warning'
-        }).then(() => {
-          Cookies.remove('token')
-          // window.location.href = 'http://localhost:8080/login'; //鏈湴鐨勬櫤鎱у伐鍘�-鐧诲綍椤�
-          window.location.href = 'http:'+this.getApsPage()+'/login'; 
-          this.$message({
-            type: 'success',
-            message: '娉ㄩ攢鎴愬姛!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '宸插彇娑堟敞閿�'
-          });          
-        });
+        document.cookie = "cookieName=; path=/;"
+        this.$confirm("纭畾瑕佹敞閿�褰撳墠鐢ㄦ埛鍚�?", "娉ㄩ攢鐢ㄦ埛", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning"
+        })
+          .then(() => {
+            Cookies.remove("token")
+            // window.location.href = 'http://localhost:8080/login'; //鏈湴鐨勬櫤鎱у伐鍘�-鐧诲綍椤�
+            window.location.href = "http:" + this.getApsPage() + "/login"
+            this.$message({
+              type: "success",
+              message: "娉ㄩ攢鎴愬姛!"
+            })
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "宸插彇娑堟敞閿�"
+            })
+          })
       }
     }
   }
@@ -79,16 +87,14 @@
 .sales-lead {
   display: flex;
   height: 50px;
-  line-height: 50px;
-  flex-shrink: 0;
   box-sizing: border-box;
-  background-color: transparent;
+  line-height: 50px;
+  background-color: $color-bg;
   border: 1px solid #ccc;
-  align-items: center;
   .header-title {
-    margin-left: 16px;
+    padding-left: 16px;
     font-size: 18px;
-    font-weight: 700;
+    font-weight: bold;
     color: #171718;
   }
   .header-user-info {
@@ -96,7 +102,7 @@
     margin-right: 20px;
     display: flex;
     .avatar {
-      margin-top: 8px;
+      margin-top: 4px;
       margin-right: 10px;
     }
   }

--
Gitblit v1.8.0