调整

public/react/src/AppConfig.js

@@ -13,23 +13,14 @@ function locationurl(list){
   if (window.location.port === "3007") {
 
   } else {
-
-    if(list===402){
-      SetAppModel(402)
-    }else if(list===407){
-
-    }else{
       window.location.replace(list)
-    }
-
   }
 }
 
 // TODO 开发期多个身份切换
-const debugType =""
-// 	window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-//         window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
-// window._debugType = debugType;
+const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+        window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+window._debugType = debugType;
 
 export function initAxiosInterceptors(props) {
 
@@ -154,16 +145,16 @@ export function initAxiosInterceptors(props) {
             locationurl('/500');
         }
 
-        if (response.data.status === 402) {
-          console.log(response.data.status);
-          console.log(response.data);
-          // locationurl(402);
-        }
+        // if (response.data.status === 402) {
+        //   console.log(response.data.status);
+        //   console.log(response.data);
+        //   // locationurl(402);
+        // }
 
 
-			if (response.data.status === 401) {
-				return config;
-			}
+				if (response.data.status === 401) {
+					return config;
+				}
         // if (response.data.status === 407) {
         // 在app js 中解决   Trialapplication
         //     // </Trialapplication>

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

@@ -676,9 +676,12 @@ submittojoinclass=(value)=>{
               </li>
 
 							{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
-              <li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a></li>
+              <li className="">
+								<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
+								<img className="roundedRectangles" src="/images/educoder/roundedRectangle.png" />
+              </li>
 							<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
-							<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包社区</a></li>
+							<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包创新</a></li>
               <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
               <li
                 style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}
@@ -710,7 +713,7 @@ submittojoinclass=(value)=>{
                     // onSearch={value => console.log(value)}
 
                     onPressEnter={this.onKeywordSearchKeyDown}
-                    style={{ width: 295 }}
+                    style={{ width: 300 }}
                   />
                 </div>
 
@@ -736,11 +739,11 @@ submittojoinclass=(value)=>{
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
           { user===undefined?
-            <span className="font-15 fr mt17">
+            <span className="font-15 fr mt17 ml20">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
-            </span> :user.login===""?<span className="font-15 fr mt17">
+            </span> :user.login===""?<span className="font-15 fr mt17 ml20">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
@@ -773,7 +776,7 @@ submittojoinclass=(value)=>{
             </div>
          }
           {/*href="https://www.educoder.net/login"*/}
-          { user===undefined?"":user.login===""?"":<div className="fr head-right">
+         <div className="fr head-right ">
             { loadHeader()}
             <a id="search-open" className="fl mr30 headIcon">
               {/*"/images/educoder/icon/search.svg"
@@ -861,7 +864,7 @@ submittojoinclass=(value)=>{
               </div>
             </div>
 
-            <div className="fl mr30 edu-menu-panel headIcon">
+			  	 <div className="fl mr30 edu-menu-panel headIcon">
               { user===undefined?"":user.login===""?"": <a
                 href={this.props.Headertop===undefined?"":this.props.Headertop.message_url}
                 style={{position:'relative'}}
@@ -904,7 +907,7 @@ submittojoinclass=(value)=>{
               </div>
             </Modal>
 
-          </div>}
+          </div>
         </div>
       </div>
 

public/react/src/modules/tpm/TPMIndex.css

@@ -191,4 +191,10 @@ body>.-task-title {
 
 .HeaderSearch .ant-input-search .ant-input-suffix{
     background: transparent !important;
+}
+
+.roundedRectangles{
+    position: absolute;
+    top: 10px;
+    right: -22px;
 }