From 171f14bd2a78007bd58ee32b24ac1253c5414412 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 1 Apr 2021 16:25:53 +0800
Subject: [PATCH] noticeurl

---
 src/forge/Head/Header.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 64ad93fc8..05f763ed6 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -111,7 +111,7 @@ class NewHeader extends Component {
   }
 
   onGlobalSearch=(value,item)=>{
-    window.location.href=`${item && item.url}?value=` + value;
+    window.location.href=`${item}?value=` + value;
   }
 
   openNotification = (messge) => {
@@ -577,8 +577,8 @@ class NewHeader extends Component {
       })
     }
 
-    let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索");
-    let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知");
+    let search_url = settings && settings.common && settings.common.search;
+    let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
         <div className="headerContent">
@@ -646,7 +646,7 @@ class NewHeader extends Component {
             }
           </div>
           <div className="head-right">
-            {search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""}
+            {search_url ? this.SearchInput(openSearch,search_url):""}
             {
               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">
@@ -654,10 +654,10 @@ class NewHeader extends Component {
               </Dropdown>:""
             }
             
-            {this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ?
+            {this.props.user && this.props.user.login && notice_url ?
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
-                  <a href={`${notice_url[0].url}`} style={{ position: 'relative' }}>
+                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
                     <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
                     <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                     </span>