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

public/react/src/AppConfig.js

@@ -25,9 +25,7 @@ if (isDev) {
     if (_search) {
       parsed = queryString.parse(_search);
   	}
-    debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+    debugType = window.location.search.indexOf('debug=t') != -1 ?  "cxt" : ''
-        window.location.search.indexOf('debug=s') != -1 ? 'student' : 
-        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
 }
 	
 window._debugType = debugType;
@@ -144,6 +142,7 @@ export function initAxiosInterceptors(props) {
         // }
         if (response.data.status === 403) {
             // props.history.replace('/403')
+					  debugger
             // 这里会分2个情况，1、刚进入页面发请求返回的403；2、进入页面后，其他用户操作触发请求返回的403；
             // TODO 这里做一个403弹框比较好？
             locationurl('/403');

public/react/src/modules/courses/coursesPublic/Addcourses.js

@@ -147,6 +147,8 @@ class Addcourses extends Component{
 
 		if(Addcoursestype===true){
 			this.props.hideAddcoursestype();
+		}else{
+			window.location.href = "/";
 		}
 
   }

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -382,7 +382,7 @@ class ShixunhomeWorkItem extends Component{
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
 								{this.props.isAdminOrCreator()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               {/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
-              <WordsBtn className="btn colorblue  font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
+              <WordsBtn className="btn colorblue  font-16 ml20"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
             </div>:""}
 
 

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

@@ -487,10 +487,11 @@ submittojoinclass=(value)=>{
   }
 
 	showSearchOpen=(e)=>{
+  	debugger
   	this.setState({
 			showSearchOpentype:true
 		})
-		e.stopPropagation(e);//阻止冒泡
+
 	}
 
 	hideshowSearchOpen=(e)=>{
@@ -500,7 +501,7 @@ submittojoinclass=(value)=>{
 				 showSearchOpentype:false,
 				 setevaluatinghides:false
 			 })
-			 e.stopPropagation(e);//阻止冒泡
+
 		 }
 	}