From e538d64f9aa1920ec228c9b8222f2b9777b0ea40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 16:59:42 +0800
Subject: [PATCH] =?UTF-8?q?logo=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/educoder/newheadNavLogo.png | Bin 0 -> 2816 bytes
 public/react/src/modules/tpm/NewHeader.js |  18 +++++++++---------
 public/react/src/modules/tpm/TPMIndex.css |   5 +++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 public/images/educoder/newheadNavLogo.png

diff --git a/public/images/educoder/newheadNavLogo.png b/public/images/educoder/newheadNavLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..436d23490404beedcf7cd776bbf8ed0282794ca4
GIT binary patch
literal 2816
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
SnFiSa0000<MNUMnLSTaR+K){D

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 66a120716..a722d4b4d 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -699,9 +699,9 @@ submittojoinclass=(value)=>{
 					{...this.props}
 					{...this.state}
 				/>:""}
-				<a href="/" className={"fl mr60 ml25 mt15"}>
+				<Link to="/" className={"fl mr20 ml25 mt10"}>
 					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
-				</a>
+				</Link>
 
 				<style>
 					{
@@ -720,21 +720,21 @@ submittojoinclass=(value)=>{
           <div className="head-nav pr">
 
             <ul id="header-nav">
-              <li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>
+              {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
 
               {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
               <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
-                <a href={this.props.Headertop===undefined?"":'/paths'}>实践课程</a>
+								<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
               </li>
 
               {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
               <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
                 {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
-                <a href={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</a>
+								<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
               </li>
 
               <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
-                <a href="/shixuns">开发社区</a>
+								<Link to="/shixuns">开发社区</Link>
                 <img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">
                 </img>
               </li>
@@ -765,11 +765,11 @@ submittojoinclass=(value)=>{
 										 src={require('./roundedRectangle.png')}
 								/>
               </li>
-							<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}><a href={`/moop_cases`}>教学案例</a></li>
+							<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
 							<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>
-								<a href={'/crowdsourcing'}>众包创新</a>
+								<Link to={'/crowdsourcing'}>众包创新</Link>
 							</li>
-              <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
+              <li className={`${activeForums === true ? 'active' : ''}`}>	<Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
               <li
                 style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}
               ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css
index 5c2580093..076777945 100644
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@@ -212,4 +212,9 @@ body>.-task-title {
 
 .ml18a{
     margin-left:18%;
+}
+
+.logoimg{
+    float: left;
+    width: 40px;
 }
\ No newline at end of file