From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 四月 2024 16:00:49 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/design/header/index.jsx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index f9110ad..70fd769 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -23,6 +23,7 @@
     menulist: null, // 涓�绾ц彍鍗�
     userName: sessionStorage.getItem('CloudUserName'),
     avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
+    logo: sessionStorage.getItem('CloudLogo') || MainLogo,
     visible: false,
     loading: false
   }
@@ -408,11 +409,11 @@
 
   render () {
     const { mainMenu, editLevel } = this.props
-    const { menulist, visible, loading } = this.state
+    const { menulist, visible, loading, logo } = this.state
 
     return (
       <header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
-        <div className="header-logo"><img src={MainLogo} alt=""/></div>
+        <div className="header-logo"><img src={logo} alt=""/></div>
         <div className="header-collapse">
           <MenuFoldOutlined/>
         </div>

--
Gitblit v1.8.0