From 2383710c548360f97bb6357e71469f2ea293676d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 1 Apr 2021 15:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80=EF=BC=8Ctrustie=E6=94=B9=E4=B8=BAed?=
 =?UTF-8?q?ucoder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/DevOps/ServiceModal.jsx |  2 +-
 src/forge/Head/Header.js          | 12 ++++++------
 src/modules/login/LoginDialog.js  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/forge/DevOps/ServiceModal.jsx b/src/forge/DevOps/ServiceModal.jsx
index 3fac8bc94..9be3dc2a1 100644
--- a/src/forge/DevOps/ServiceModal.jsx
+++ b/src/forge/DevOps/ServiceModal.jsx
@@ -12,7 +12,7 @@ function ServiceModal({sureModal}){
     <div className="mt30" style={{textAlign:"center"}}>
       <Radio.Group value={type} onChange={changeType}>
         <Radio value={1}>自有服务器</Radio>
-        <Radio value={2}>Trustie服务器</Radio>
+        <Radio value={2}>EduCoder服务器</Radio>
       </Radio.Group>
       <p className="mt30"><Button type="primary" onClick={()=>sureModal(type)}>下一步</Button></p>
     </div>
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 3248c4749..af6228cd2 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-white"></i>
                     <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                     </span>
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index aebfba8c7..cdc73bc26 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -470,7 +470,7 @@ class LoginDialog extends Component {
   }
 
   render() {
-    let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
+    let { login, isGoing, isGoingValue, disabled, Phonenumberisnotco,
       dialogBox, isRender, weixinlogin } = this.state;
 
     let { settings } = this.props;