From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
admin/src/components/common/Header.vue | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/Header.vue b/admin/src/components/common/Header.vue
index a286282..a812472 100644
--- a/admin/src/components/common/Header.vue
+++ b/admin/src/components/common/Header.vue
@@ -4,7 +4,6 @@
<h2>
<i class="el-icon-s-unfold" v-if="menuData.collapse" @click="switchCollapseMenu(null)"></i>
<i class="el-icon-s-fold" v-else @click="switchCollapseMenu(null)"></i>
- {{title}}
</h2>
<tagsview class="tags"></tagsview>
</div>
@@ -41,7 +40,6 @@
h2 {
flex-shrink: 0;
line-height: 48px;
- width: 240px;
font-size: 19px;
color: #606263;
font-weight: normal;
--
Gitblit v1.9.3