From d62aff64528ea821c4c8932cd619a37a3f17f055 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 16:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/css/edu-all.css         |   3 +-
 public/react/src/AppConfig.js               |  20 ++--
 public/react/src/modules/tpm/NewHeader.js   | 104 ++++++++++----------
 public/react/src/modules/tpm/TPMIndexHOC.js |   2 +-
 public/stylesheets/educoder/edu-all.css     |   2 +-
 5 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index 4eeb5497c..f58d44978 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -11,10 +11,11 @@
     float: left;
     width: 97px;}
 .head-nav{
+    float: left;
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 4928b525f..2ad7df0d5 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -20,16 +20,16 @@ function locationurl(list){
 
 // TODO 开发期多个身份切换
 let debugType =""
-// if (isDev) {
-//   	const _search = window.location.search;
-//     let parsed = {};
-//     if (_search) {
-//       parsed = queryString.parse(_search);
-//   	}
-//     debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-//         window.location.search.indexOf('debug=s') != -1 ? 'student' :
-//         window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-// }
+if (isDev) {
+  	const _search = window.location.search;
+    let parsed = {};
+    if (_search) {
+      parsed = queryString.parse(_search);
+  	}
+    debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+        window.location.search.indexOf('debug=s') != -1 ? 'student' :
+        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+}
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 6b435b619..f4a90fd81 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -713,68 +713,68 @@ submittojoinclass=(value)=>{
               ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
             </ul>
 
-						<style>
-							{
-								`
+
+          </div>
+				</div>
+
+				<style>
+					{
+						`
 								.posi-searchs{
-										opacity: 1;
-										position: absolute;
-										top: -2px;
-										background: #fff;
-										z-index: 2;
-										right: -241px;
+						    opacity: 1;
+								position: absolute;
+								top: -2px;
+								background: #fff;
+								z-index: 2;
+								right: 185px;
 								}
 								`
-							}
-						</style>
-         <div className="posi-searchs"  >
-              <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>实训</a></li>
-                      <li><a>课堂</a></li>
-                      <li><a>用户</a></li>
-                    </ul>
-                  </div>
-                {/*<input type="text" className="search-input fl" id="search-input" */}
-                  {/*onKeyDown={this.onKeywordSearchKeyDown} name="search_keyword" placeholder="搜索实训项目"/>*/}
-								{/*搜索框*/}
-								{showSearchOpentype===true?<div
-							    className={"HeaderSearch"}
-									onBlur={(e)=>this.hideshowSearchOpen(e)}	onMouseLeave={()=>this.setevaluatinghides()}>
-                  <Search
-										  id={"HeaderSearchs"}
-                      placeholder="实践课程/翻转课堂/开发社区/交流问答"
-											onInput={()=>this.onKeywordSearchKeyDowns()}
-											onSearch={(value) => this.onKeywordSearchKeyDown(value)}
-                      // onPressEnter={this.onKeywordSearchKeyDown}
-                      style={{ width: 300,height:32}}
-											autoFocus={true}
-                  />
-                </div>:""}
-
-                {/*<a className="search-icon fl" id="header_keyword_search" onClick={this.onKeywordSearch}>*/}
-                  {/*/!*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*!/*/}
-                  {/*<i className="iconfont icon-sousuo color-blue"></i>*/}
-
-                {/*</a>*/}
-                {/* TODO 需要服务端接口提供最近搜索
+					}
+				</style>
+				<div className="posi-searchs"  >
+					<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>实训</a></li>
+								<li><a>课堂</a></li>
+								<li><a>用户</a></li>
+							</ul>
+						</div>
+						{/*<input type="text" className="search-input fl" id="search-input" */}
+						{/*onKeyDown={this.onKeywordSearchKeyDown} name="search_keyword" placeholder="搜索实训项目"/>*/}
+						{/*搜索框*/}
+						{showSearchOpentype===true?<div
+							className={"HeaderSearch"}
+							onBlur={(e)=>this.hideshowSearchOpen(e)}	onMouseLeave={()=>this.setevaluatinghides()}>
+							<Search
+								id={"HeaderSearchs"}
+								placeholder="实践课程/翻转课堂/开发社区/交流问答"
+								onInput={()=>this.onKeywordSearchKeyDowns()}
+								onSearch={(value) => this.onKeywordSearchKeyDown(value)}
+								// onPressEnter={this.onKeywordSearchKeyDown}
+								style={{ width: 300,height:32}}
+								autoFocus={true}
+							/>
+						</div>:""}
+
+						{/*<a className="search-icon fl" id="header_keyword_search" onClick={this.onKeywordSearch}>*/}
+						{/*/!*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*!/*/}
+						{/*<i className="iconfont icon-sousuo color-blue"></i>*/}
+
+						{/*</a>*/}
+						{/* TODO 需要服务端接口提供最近搜索
                             <div className="search-content none" style="width: 86%;left:  0px;">
                               <div className="search-title">最近搜索</div>
                                   <div><a href="javascript:void(0)" className="search_history">绿盟</a></div>
                                   <div><a href="javascript:void(0)" className="search_history">qwe</a></div>
                             </div>*/}
-              </div>
-            </div>
-
-          </div>
+					</div>
 				</div>
 
-
           {/*<span className="font-15 fr mt17">
 			      	<%= link_to '登录', signin_path, :className => "mr5" %>
 			      	<em className="vertical-line"></em>
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index e092c17d4..0cf22376f 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -20,7 +20,7 @@ const versionNum = '0001';
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
-	_url_origin="https://newweb.educoder.net";
+	_url_origin="http://47.96.87.25:48080/";
 }
 
 // let _url_origin=`https://www.educoder.net`;
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 29fa6f5dc..6c77ee1c5 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -15,7 +15,7 @@
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;