From 2012837024ce5b43fed96bc764e772594898f398 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Oct 2023 15:58:04 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4LOGO=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout.vue                         |  8 ++++----
 src/views/system/setting/components/change-logo.vue | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index 6981d38d..5aaf7e95 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -203,7 +203,7 @@ document.addEventListener('visibilitychange', function () {
           </template>
           <template v-if="appStore.logoType === 'brand'">
             <img
-              class="logo-brand"
+              :class="{'logo-brand': proConfig.layout !== 'side'}"
               :src="appStore.getLOGOBrand"
               :alt="t('common.title')"
               :title="appStore.appName"
@@ -281,17 +281,17 @@ document.addEventListener('visibilitychange', function () {
 
 .logo-brand {
   height: 48px;
-  width: 224px;
+  width: 174px;
   vertical-align: middle;
   border-style: none;
-  margin-right: 12px;
+  margin-right: 16px;
 }
 
 .title {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 180px;
+  width: 130px;
 }
 
 .footer {
diff --git a/src/views/system/setting/components/change-logo.vue b/src/views/system/setting/components/change-logo.vue
index c5e6ed65..a8bf8368 100644
--- a/src/views/system/setting/components/change-logo.vue
+++ b/src/views/system/setting/components/change-logo.vue
@@ -164,7 +164,7 @@ onMounted(() => {
     <a-col :lg="12" :md="12" :xs="24" style="margin-bottom: 30px">
       <div class="header">
         <div class="header-brand" v-show="state.type === 'brand'">
-          <img :width="224" :height="48" :src="state.brand" />
+          <img :width="174" :height="48" :src="state.brand" />
         </div>
         <div class="header-icon" v-show="state.type === 'icon'">
           <img :src="state.icon" />
@@ -219,7 +219,7 @@ onMounted(() => {
         <a-typography-title :level="5">全图</a-typography-title>
         <a-typography-paragraph>
           将整张图片展示到系统LOGO区域，请使用透明背景，尺寸比例大小
-          <a-typography-text mark>224x48</a-typography-text>
+          <a-typography-text mark>174x48</a-typography-text>
         </a-typography-paragraph>
         <a-typography-title :level="5">小图</a-typography-title>
         <a-typography-paragraph>
@@ -242,7 +242,7 @@ onMounted(() => {
   margin-bottom: 24px;
 
   &-brand {
-    width: 224px;
+    width: 174px;
     height: 48px;
     margin-right: 12px;
     border: 1px var(--ant-primary-color) solid;
@@ -250,10 +250,10 @@ onMounted(() => {
   &-icon {
     display: flex;
     align-content: center;
-    min-width: 192px;
+    min-width: 174px;
     height: 100%;
     align-items: center;
-    margin-right: 12px;
+    margin-right: 16px;
     border: 1px var(--ant-primary-color) solid;
 
     & > img {
@@ -266,7 +266,7 @@ onMounted(() => {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      width: 180px;
+      width: 130px;
       color: #fff;
       margin: 0 0 0 12px;
       font-weight: 600;