From a426c23b9bc90df787bc4d66718872f7c95c255a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 十二月 2019 10:46:37 +0800
Subject: [PATCH] 2019-12-11

---
 src/components/header/index.jsx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index ad1127c..d9d7865 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -12,7 +12,7 @@
 import zhCN from '@/locales/zh-CN/header.js'
 import enUS from '@/locales/en-US/header.js'
 import Utils from '@/utils/utils.js'
-import logourl from '@/assets/img/mlogo.png'
+import logourl from '@/assets/img/main-logo.png'
 import avatar from '@/assets/img/avatar.jpg'
 import './index.scss'
 
@@ -32,7 +32,8 @@
     visible: false, // 淇敼瀵嗙爜妯℃�佹
     dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
     confirmLoading: false,
-    userName: localStorage.getItem('username')
+    userName: localStorage.getItem('username'),
+    logourl: window.GLOB.mainlogo || logourl
   }
 
   handleCollapse = () => {
@@ -225,7 +226,6 @@
   }
 
   render () {
-    // let logourl = window.GLOB.logo
     const menu = (
       <Menu overlayclassname="header-dropdown">
         {this.props.debug && <Menu.Item key="0">
@@ -239,7 +239,7 @@
 
     return (
       <header className="header-container ant-menu-dark">
-        <div className={this.props.collapse ? "collapse header-logo" : "header-logo"}><img src={logourl} alt=""/></div>
+        <div className={this.props.collapse ? "collapse header-logo" : "header-logo"}><img src={this.state.logourl} alt=""/></div>
         <div className={this.props.collapse ? "collapse header-collapse" : "header-collapse"} onClick={this.handleCollapse}>
           <Icon type={this.props.collapse ? 'menu-unfold' : 'menu-fold'} />
         </div>

--
Gitblit v1.8.0