From e3e0b7beffb1818e126aa09a77b91316f260ccf2 Mon Sep 17 00:00:00 2001
From: liuyx <1517482303@qq.com>
Date: Mon, 21 Nov 2022 23:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Header=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/layout/components/Header.vue | 43 +++++++++++++++++++++-----
 admin/src/layout/components/Menu.vue   | 10 ++++++
 admin/src/layout/index.vue             |  3 --
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/admin/src/layout/components/Header.vue b/admin/src/layout/components/Header.vue
index d288e57..16ba538 100644
--- a/admin/src/layout/components/Header.vue
+++ b/admin/src/layout/components/Header.vue
@@ -8,7 +8,7 @@
         </el-icon>
       </div>
       <!-- 面包屑 -->
-      <h3>{{ $route.name }}</h3>
+      <span class="page-name">{{ $route.name }}</span>
       <div class="right-navbar">
         <!-- 全屏按钮 -->
         <el-icon size="25px" class="screenfull" @click="toggleScreen">
@@ -38,7 +38,9 @@
           @click="goTo(item)"
         >
           {{ item.name }}
-          <el-icon v-if="item.name !== '首页'" @click.stop="removeTab(item)"><Close /></el-icon>
+          <el-icon v-if="item.name !== '首页'" @click.stop="removeTab(item)" :size="18">
+            <Close class="close-icon" />
+          </el-icon>
         </span>
       </div>
       <div class="tabs-close" @click="closeAllTab">全部关闭</div>
@@ -54,7 +56,7 @@ import { useStore } from '@/store'
 
 const router = useRouter()
 const route = useRoute()
-const circleUrl = ref('https://liuyxcc.github.io/img/avatar.png')
+const circleUrl = ref('https://typora-lyx.oss-cn-guangzhou.aliyuncs.com/typora/avatar.jpg')
 const store = useStore()
 
 const toggleCollapse = () => {
@@ -73,7 +75,7 @@ const goTo = (item) => {
 const removeTab = (item) => {
   store.removeTab(item)
   if (route.path === item.path) {
-    router.replace('/home')
+    router.replace(store.tabList[store.tabList.length - 1])
   }
 }
 
@@ -113,13 +115,20 @@ watch(
 .header-container {
   padding: 0 10px;
   height: 100%;
-  box-shadow: 0 2px 3px #888888;
-  height: 84px;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.32);
+  height: 94px;
   .navbar {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    height: 42px;
+    height: 32px;
+    padding: 10px;
+    .page-name {
+      padding: 5px;
+      border-bottom: 3px solid #626aef;
+      width: 85px;
+      text-align: center;
+    }
     .right-navbar {
       display: flex;
       justify-content: center;
@@ -133,8 +142,11 @@ watch(
 .tabs-container {
   display: flex;
   align-items: center;
-  height: 42px;
+  height: 32px;
   justify-content: space-between;
+  font-size: 14px;
+  padding: 5px;
+  border-top: 1px dotted #a8a8a8;
   .tabs-content {
     text-align: center;
     .tabs-content-item {
@@ -143,15 +155,30 @@ watch(
       background-color: #eee;
       padding: 5px;
       border-radius: 5px;
+      line-height: 27px;
       transition: all 0.4s ease;
+      .close-icon {
+        transition: all 0.2s ease-in-out;
+      }
+      .close-icon:hover {
+        background-color: #bdb8b8;
+        border-radius: 50%;
+      }
     }
     .tabs-content-item-active {
       background-color: #626aef;
       color: #eee;
+      border-radius: 5px;
     }
   }
   .tabs-close {
     cursor: pointer;
+    border: 1px solid #d8dce5;
+    padding: 2px;
   }
 }
+.el-icon svg {
+  position: relative;
+  top: 3px;
+}
 </style>
diff --git a/admin/src/layout/components/Menu.vue b/admin/src/layout/components/Menu.vue
index 6d5edd6..dcd9601 100644
--- a/admin/src/layout/components/Menu.vue
+++ b/admin/src/layout/components/Menu.vue
@@ -31,6 +31,7 @@
         <el-icon><Setting /></el-icon>
         <span>系统管理</span>
       </template>
+      <el-menu-item index="/website">网站管理</el-menu-item>
       <el-menu-item index="/page">页面图片</el-menu-item>
       <el-menu-item index="/about">关于我</el-menu-item>
     </el-sub-menu>
@@ -65,3 +66,12 @@ const store = useStore()
   overflow-y: auto;
 }
 </style>
+
+<style>
+.el-menu-item {
+  transition: all 0.15s ease-in-out;
+}
+.el-menu-item.is-active {
+  font-weight: bold;
+}
+</style>
diff --git a/admin/src/layout/index.vue b/admin/src/layout/index.vue
index 20c1908..effd0d5 100644
--- a/admin/src/layout/index.vue
+++ b/admin/src/layout/index.vue
@@ -6,9 +6,6 @@
     <el-container :class="'main-container ' + isHide">
       <el-header><Header /></el-header>
       <el-main>
-        <!-- <transition name="fade" mode="out-in">
-          <router-view class="m-content"></router-view>
-        </transition> -->
         <router-view class="m-content" v-slot="{ Component }">
           <transition name="fade" mode="out-in">
             <component :is="Component" />