From 5426d73ed3df6d46b37f4d52d5eb5aad985ab435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 29 Jul 2019 17:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/index.js                 |  2 +-
 public/react/src/modules/tpm/NewHeader.js | 80 +++++++++++------------
 public/stylesheets/educoder/edu-all.css   |  2 +-
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/public/react/src/index.js b/public/react/src/index.js
index 55cebf17..73bc2829 100644
--- a/public/react/src/index.js
+++ b/public/react/src/index.js
@@ -41,7 +41,7 @@ var proxy = "http://localhost:3000"
 //  proxy = "http://testbdweb.trustie.net"
 //    proxy = "http://testbdweb.educoder.net"
    // proxy ="http://192.168.2.63:3000"
-    proxy='http://120.27.231.56:48080'
+    proxy='http://localhost:3000'
 const requestMap={};
 // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
 // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 6d521f3a..c5eb9105 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -305,12 +305,11 @@ class NewHeader extends Component {
 				}else{
             activeIndex = true;
         }
-        
-        
- 
-        console.log(this.props.user&&this.props.user.is_student=== true||this.props.current_user&&this.props.current_user.is_student==true)
-			  console.log(this.state.current_user)
+
+        // console.log(this.props.user&&this.props.user.is_student=== true||this.props.current_user&&this.props.current_user.is_student==true)
+			  // console.log(this.state.current_user)
         // console.log(match.path.startsWith("/ec_courses"))
+
         return (
         <div className="newHeader" id="nHeader">
 
@@ -401,51 +400,52 @@ class NewHeader extends Component {
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">交流问答</a></li>
                         <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}</a></li>
                     </ul>
-						<style>
-							{
-								`
+
+				</div>
+						</div>
+			    {/*<span className="font-15 fr mt17">
+			      	<%= link_to '登录', signin_path, :className => "mr5" %>
+			      	<em className="vertical-line"></em>
+			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
+			    </span>*/}
+					<style>
+						{
+							`
 								.marf28{
 								    margin-right: -28px;
 								}
 								`
-							}
-						</style>
-				    <div className="posi-search marf28" id="posi-search" style={{display: 'none'}}>
-				        <div className="search-all clearfix">
-				          {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
-				          	<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>
-				            	<input type="hidden" id="search_type" value="1"></input>
-					            <span className="searchkey">实训</span>
-					            <i className="fa fa-angle-down ml5 font-16"></i>
-					            <ul id="searchkey" className="edu-menu-list edu-txt-center" style={{minWidth: '80px',right: '-10px',top: '50px'}}>
-					              	<li><a href="javascript:void(0)">实训</a></li>
-					              	<li><a href="javascript:void(0)">课堂</a></li>
-					              	<li><a href="javascript:void(0)">用户</a></li>
-					            </ul>
-				          	</div>
-				          	<input type="text" className="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/开发社区/交流问答"/>
-				          	<a href="javascript:void(0)" className="search-icon fl" id="header_keyword_search">
-                                {/*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*/}
-                                <i className="iconfont icon-sousuo color-blue"></i>
+						}
+					</style>
+					<div className="posi-search marf28" id="posi-search" style={{display: 'none'}}>
+						<div className="search-all clearfix">
+							{/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
+							<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>
+								<input type="hidden" id="search_type" value="1"></input>
+								<span className="searchkey">实训</span>
+								<i className="fa fa-angle-down ml5 font-16"></i>
+								<ul id="searchkey" className="edu-menu-list edu-txt-center" style={{minWidth: '80px',right: '-10px',top: '50px'}}>
+									<li><a href="javascript:void(0)">实训</a></li>
+									<li><a href="javascript:void(0)">课堂</a></li>
+									<li><a href="javascript:void(0)">用户</a></li>
+								</ul>
+							</div>
+							<input type="text" className="search-input fl" id="search-input" name="search_keyword" placeholder="实践课程/翻转课堂/开发社区/交流问答"/>
+							<a href="javascript:void(0)" className="search-icon fl" id="header_keyword_search">
+								{/*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*/}
+								<i className="iconfont icon-sousuo color-blue"></i>
 
-                            </a>
-                        {/* TODO 需要服务端接口提供最近搜索
+							</a>
+							{/* TODO 需要服务端接口提供最近搜索
                             <div class="search-content none" style="width: 86%;left:  0px;">
                               <div class="search-title">最近搜索</div>
                                   <div><a href="javascript:void(0)" class="search_history">绿盟</a></div>
                                   <div><a href="javascript:void(0)" class="search_history">qwe</a></div>
                             </div>*/}
-				        </div>
-				    </div>
-				</div>
-
-			    {/*<span className="font-15 fr mt17">
-			      	<%= link_to '登录', signin_path, :className => "mr5" %>
-			      	<em className="vertical-line"></em>
-			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
-			    </span>*/}
+						</div>
+					</div>
                 <div style={{display:isLogin===true?'block':'none'}}>
-                    <div className="fr edu-menu-panel" style={{height:'60px'}}>
+                    <div className="fr edu-menu-panel mr10" style={{height:'60px'}}>
                             <a href={`/users/${current_user.login}`} className="fl">
                                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" nhname="avatar_image"
                                         src={`/images/${current_user.image_url}`} width="34">
@@ -554,7 +554,7 @@ class NewHeader extends Component {
                     </div>
                     */}
 			  	</div>
-			</div>
+
         </div>
 
         );
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 0eafefc0..52d682d9 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -48,7 +48,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .search-icon path{ fill: #4CACFF;}
 
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
-.posi-search{opacity: 1;position: absolute;top: -2px;background: #fff;z-index: 2; right: -200px;}
+.posi-search{opacity: 1;position: absolute;top: -2px;background: #fff;z-index: 2; right:140px}
  .posi-search.unlogin{right: -161px;}
 .search-content{box-sizing: border-box;position: absolute;height: 300px;background: #fff;border-radius: 0px 0px 5px 5px;width: 100%;left: 0px;top:58px;box-shadow: 0 4px 8px 0 rgba(0,0,0,.2);overflow-y: auto}
 .search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left}