调整

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

@@ -891,17 +891,17 @@ class NewHeader extends Component {
 												`
                     }
                   </style>
-                  {/*<li className={`pr  questionbanks`}>*/}
+                  <li className={`pr `}>
-                  {/*	<Popover   placement="bottom"  content={contents} trigger="click" >*/}
+                    <Popover placement="bottom" content={contents} trigger="click" >
-                  {/*		<div className=" sortinxdirection mr10">*/}
+                      <div className=" sortinxdirection mr10">
-                  {/*			<div style={{*/}
+                        <div style={{
-                  {/*				color:"#fff"*/}
+                          color: "#fff"
-                  {/*			}}>*/}
+                        }}>
-                  {/*				题库*/}
+                          题库
-                  {/*			</div>*/}
+													</div>
-                  {/*		</div>*/}
+                      </div>
-                  {/*	</Popover>*/}
+                    </Popover>
-                  {/*</li>*/}
+                  </li>
 
                   <li
                     style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block' }}
@@ -941,7 +941,7 @@ class NewHeader extends Component {
                   {/*<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>*/}
-                    <Link to={this.props.Headertop === undefined ? "" : '/courses'}>教学课堂</Link>
+                    <Link to={this.props.Headertop === undefined ? "" : '/courses'}>翻转课堂</Link>
                   </li>
                   <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
                     <Link to="/shixuns">实训项目</Link>
@@ -992,10 +992,16 @@ class NewHeader extends Component {
 
 
 
+<<<<<<< HEAD
     <style>
       {
         `
-            .posi-searchs{
+=======
+				<style>
+					{
+						`
+>>>>>>> e49ad4f... 调整
+          .posi - searchs{
         opacity: 1;
             position: absolute;
             top: -2px;
@@ -1055,7 +1061,8 @@ class NewHeader extends Component {
 			      	<em className="vertical-line"></em>
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
-        {user === undefined ?
+    {
+      user === undefined ?
       <span className="font-15 fr mt17 ml5 mr25">
         <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
         <em className="vertical-line"></em>
@@ -1106,7 +1113,7 @@ class NewHeader extends Component {
           </ul>
         </div>
     }
-        {/*href="https://www.educoder.net/login"*/}
+    {/*href="https://www.educoder.net/login"*/ }
     <div className="fr head-right">
       {/*{ loadHeader()}*/}
       {showSearchOpentype === true ? "" : this.props.user && this.props.user.main_site === true ? <a id="search-open" className="fl mr30 headIcon" onClick={(e) => this.showSearchOpen(e)}>
@@ -1251,7 +1258,7 @@ class NewHeader extends Component {
 
     </div>
 
-      </div>
+      </div >
 
     );
   }