Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_aliyun

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参考来控制

public/react/src/modules/tpm/NewHeader.js

@@ -306,11 +306,10 @@ class NewHeader extends Component {
             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,6 +400,14 @@ 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>
+
+				</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>
 						{
 							`
@@ -437,15 +444,8 @@ class NewHeader extends Component {
                             </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 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>
 
         );

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}