From 244881f142d9ac4c515fb5a13c7ed8f2b01c05cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Tue, 7 Sep 2021 11:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=9A=E7=9F=A5=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js   | 23 ++++++++++-------------
 src/forge/Head/header.scss |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 912b8b4e..1dcfdbea 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
-import { Input , notification , Dropdown , Menu,Badge, Button } from 'antd';
+import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
 import { Link } from 'react-router-dom';
 
 import LoginDialog from '../../modules/login/LoginDialog';
@@ -415,7 +415,7 @@ class NewHeader extends Component {
                 {
                   settings.navbar && settings.navbar.map((item, key) => {
                     var new_link = item.link;
-                    var user_login = this.props.user && this.props.user.login;
+                    var user_login = current_user && current_user.login;
                     var is_hidden = item.hidden
                     if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
                       if (user_login) {
@@ -451,23 +451,20 @@ class NewHeader extends Component {
             {
               current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
               <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
-                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+                <i className="iconfont icon-tianjiafangda color-grey-6 ml30 mr15"></i>
               </Dropdown>:""
             }
             
-            {/* {this.props.user && this.props.user.login && notice_url ? */}
-            {this.props.user && this.props.user.login ?
-              <div className="ml30 edu-menu-panel">
-                {user && user.login &&
-                  <Dropdown placement={`bottomRight`} overlay={this.messageList(settings && settings.personal)}>
-                    <a href={`/settings/notice/myNotice`} style={{ position: 'relative' }}>
-                      <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+            {/* {current_user && current_user.login && notice_url ? */}
+            {current_user && current_user.login ?
+                  <Popover placement={`bottomRight`} content={this.messageList(settings && settings.personal)}>
+                    <a href={`/settings/notice/myNotice`} >
+                      <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
                       <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                       </span>
                     </a>
-                  </Dropdown>
-                }
-              </div>:""
+                  </Popover>
+              :""
             }
           </div>
           {!user || (user && !user.login)  ?
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index 12aa417a..7831788c 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -24,7 +24,7 @@
   width: 34px;
   height: 34px;
   border-radius: 50%;
-  margin-left: 30px;
+  margin-left: 15px;
 }
 
 .messageHoverDiv{