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 @@
-
{{ $route.name }}
+ {{ $route.name }}
@@ -38,7 +38,9 @@
@click="goTo(item)"
>
{{ item.name }}
-
+
+
+
全部关闭
@@ -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;
+}
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 @@
系统管理
+ 网站管理
页面图片
关于我
@@ -65,3 +66,12 @@ const store = useStore()
overflow-y: auto;
}
+
+
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 @@
-