From 06d11265f12e79a9b33fd3ec9dd7f477a8eba184 Mon Sep 17 00:00:00 2001
From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com>
Date: 星期六, 11 一月 2025 15:50:26 +0800
Subject: [PATCH] !13 合并到主分支 Merge pull request !13 from zhitan-cloud/develop1.0
---
zhitan-vue/src/layout/components/Sidebar/Logo.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/zhitan-vue/src/layout/components/Sidebar/Logo.vue b/zhitan-vue/src/layout/components/Sidebar/Logo.vue
index 9fe31c0..4831fa2 100644
--- a/zhitan-vue/src/layout/components/Sidebar/Logo.vue
+++ b/zhitan-vue/src/layout/components/Sidebar/Logo.vue
@@ -14,9 +14,9 @@
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
</router-link>
</transition> -->
- <div class="logo">
- <img v-if="sideTheme === 'theme-dark'" :src="logo" class="sidebar-logo" />
- <img v-else :src="logo2" class="sidebar-logo" />
+ <div class="logo" v-if="systemInfo && systemInfo.leftLogo">
+ <img v-if="sideTheme === 'theme-dark'" :src="systemInfo.leftLogo" class="sidebar-logo" />
+ <img v-else :src="systemInfo.leftLogo" class="sidebar-logo" />
</div>
<div class="name" v-if="!collapse" :style="{ color: sideTheme === 'theme-dark' ? '#fff' : '#487FEE' }">
@@ -40,7 +40,7 @@
},
})
-const title = import.meta.env.VITE_APP_TITLE
+const title = systemInfo.systemName || import.meta.env.VITE_APP_TITLE
const settingsStore = useSettingsStore()
const sideTheme = computed(() => settingsStore.sideTheme)
</script>
@@ -68,8 +68,8 @@
margin-top: 24px;
margin-bottom: 15px;
.logo {
- width: 87px;
- height: 30px;
+ width: 40px;
+ height: 40px;
margin-left: 13px;
.sidebar-logo {
width: 100%;
@@ -77,12 +77,12 @@
}
}
.name {
- width: 150px;
+ width: 210px;
margin-top: 2px;
margin-left: 6px;
font-family: OPPOSans, OPPOSans;
font-weight: bold;
- font-size: 24px;
+ font-size: 20px;
color: #ffffff;
}
--
Gitblit v1.9.3