From 051213b5e5e17c56b54bed9663d24cde83077397 Mon Sep 17 00:00:00 2001
From: louis <869322496@qq.com>
Date: Wed, 28 Feb 2024 13:29:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E5=85=AC=E5=8F=B8log?=
 =?UTF-8?q?o=E6=A0=B7=E5=BC=8F=E9=9A=8F=E4=B8=BB=E9=A2=98=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/logo/index.vue          | 19 ++++++++++++++-----
 src/store/modules/layoutSetting.ts |  2 +-
 src/styles/antdv.override.less     |  3 +++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue
index 2e5670b..f464782 100644
--- a/src/layout/logo/index.vue
+++ b/src/layout/logo/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="logo">
-    <img v-if="!collapsed" src="~@/assets/images/logowithtext.png" alt="" />
+    <!-- <img v-if="!collapsed" src="~@/assets/images/logowithtext.png" alt="" /> -->
+    <div v-if="!collapsed" class="flex items-center">
+      <img src="~@/assets/images/logo.png" /><span class="company-name">華信智能</span></div
+    >
     <img v-else src="~@/assets/images/logo.png" class="collapsed-icon" />
     <!-- <h2 v-show="!collapsed" class="title">华信OA</h2> -->
   </div>
@@ -15,6 +18,15 @@
 </script>
 
 <style lang="less" scoped>
+  .ant-layout-sider-dark {
+    .company-name {
+      color: white;
+    }
+  }
+  .company-name {
+    @apply text-2xl font-bold ml-xs tracking-widest;
+    font-family: cursive;
+  }
   .logo {
     @apply flex overflow-hidden whitespace-nowrap items-center justify-center;
 
@@ -22,10 +34,7 @@
     line-height: 64px;
 
     img {
-      height: 45px;
-    }
-    .collapsed-icon {
-      height: 35px;
+      height: 2.5rem;
     }
 
     .title {
diff --git a/src/store/modules/layoutSetting.ts b/src/store/modules/layoutSetting.ts
index 40edb0f..00df3aa 100644
--- a/src/store/modules/layoutSetting.ts
+++ b/src/store/modules/layoutSetting.ts
@@ -35,7 +35,7 @@ export type LayoutSetting = {
 };
 
 export const defaultSetting: LayoutSetting = {
-  navTheme: 'dark', // theme for nav menu
+  navTheme: 'light', // theme for nav menu
   colorPrimary: '#2a71b9', // '#F5222D', // primary color of ant design
   layout: 'sidemenu', // nav menu position: `sidemenu` or `topmenu`
   contentWidth: 'Fluid', // layout of content: `Fluid` or `Fixed`, only works when layout is topmenu
diff --git a/src/styles/antdv.override.less b/src/styles/antdv.override.less
index 3a6a48a..e88071d 100644
--- a/src/styles/antdv.override.less
+++ b/src/styles/antdv.override.less
@@ -11,3 +11,6 @@ body {
 .ant-image-preview-root img {
   display: unset;
 }
+:where(.css-dev-only-do-not-override-1mg5uni).ant-tabs-card > .ant-tabs-nav .ant-tabs-tab {
+  transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
+}