From 9090bb7dad196dfb3f60530491b21919c55c68e0 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期一, 28 四月 2025 18:40:58 +0800
Subject: [PATCH] 合并最新dev解决冲突
---
src/layout/components/Navbar.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4ae24d8..7c59d72 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -17,13 +17,13 @@
<template #dropdown>
<el-dropdown-menu>
<router-link to="/user/profile">
- <el-dropdown-item>涓汉涓績</el-dropdown-item>
+ <el-dropdown-item>{{$t(`topNav.center`)}}</el-dropdown-item>
</router-link>
<!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
<span>甯冨眬璁剧疆</span>
</el-dropdown-item> -->
<el-dropdown-item divided command="logout">
- <span>閫�鍑虹櫥褰�</span>
+ <span>{{$t(`topNav.logout`)}}</span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
@@ -96,7 +96,7 @@
overflow: hidden;
position: relative;
background: var(--navbar-bg);
- box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+ // box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container {
line-height: 46px;
--
Gitblit v1.9.3