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

public/react/src/AppConfig.js

@@ -18,10 +18,9 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-const debugType =""
+const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-// 	window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+        window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
-//         window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+window._debugType = debugType;
-// window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
     // TODO 避免重复的请求 https://github.com/axios/axios#cancellation

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

@@ -91,7 +91,7 @@ class PathModal extends Component{
     this.setState({
       type:types,
       page:1,
-			newshixunmodallist:[]
+			newshixunmodallist:undefined
     })
     this.funshixunpathlist(Searchvalue,types,true,1)
   }
@@ -105,7 +105,7 @@ class PathModal extends Component{
   SenttotheSearch=(value)=>{
 		this.setState({
 			page:1,
-			newshixunmodallist:[]
+			newshixunmodallist:undefined
 		})
     let{type}=this.state;
     this.funshixunpathlist(value,type,true,1)
@@ -267,12 +267,19 @@ class PathModal extends Component{
                      margin-top:0px !important;
                          height: 40px;
                   }
+
                 `}
               </style>
 
-							{ newshixunmodallist&&newshixunmodallist.length===0?"":<div className="over210 pl20 pr20"
+
+
+							{ newshixunmodallist === undefined ? <div className="over210 pl20 pr20" style={{height:"204px"}}></div>:newshixunmodallist&&newshixunmodallist.length===0?<div className="alltask edu-back-white">
+								<div className="edu-tab-con-box clearfix edu-txt-center">
+									<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+									<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+							</div>:<div className="over210 pl20 pr20"
                    onScroll={this.contentViewScrolledit}
-                   style={{"Height":"204px"}}>
+                   style={{height:"204px"}}>
                   <Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit}>
                     {
 

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

@@ -82,7 +82,6 @@ class ShixunModal extends Component{
 
   //勾选实训
   shixunhomeworkedit=(list)=>{
-debugger
     let newpatheditarry=[];
     if (this.props.singleChoose == true) {
       if (list.length > 0) {
@@ -330,7 +329,7 @@ debugger
 
                 <div className="over210 pl20 pr20"
                      onScroll={this.contentViewScrolledit}
-                     style={{height:"158px"}}>
+                    >
                   <style>
                     {
                       `
@@ -355,8 +354,12 @@ debugger
                   {/*<Loading visible={hometypepvisible} shape="dot-circle" className="newnext-loading" color='#4AC7FF'>*/}
                     <Checkbox.Group style={{ width: '100%' }} value={patheditarry}  onChange={this.shixunhomeworkedit}>
                       {
-                        newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{
+                        newshixunmodallist === undefined ? "":newshixunmodallist.length===0?
-                        	console.log(item)
+													<div className="alltask edu-back-white">
+														<div className="edu-tab-con-box clearfix edu-txt-center">
+															<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+															<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+													</div>:newshixunmodallist.map((item,key)=>{
                           return(
                             <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
                               <li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -117,7 +117,6 @@ class GraduationTasksSubmitnew extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    	debugger
 		if (info.file.status === 'uploading') {
 			let fileList = info.fileList;
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });

public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js

@@ -80,7 +80,6 @@ class GraduateTopicDetailTable extends Component{
   }
   sureAgreeTopic=(count)=>{
     if(count > 0){
-      debugger
       let{tableData}=this.props;
       let{operationId,classesId}=this.state
       let courseId=this.props.match.params.course_id;
@@ -118,7 +117,6 @@ class GraduateTopicDetailTable extends Component{
 
   //切换分班
   changeClasses=(value)=>{
-    debugger
     this.setState({
       classesId:value
     })

public/react/src/modules/courses/new/CoursesNew.js

@@ -134,7 +134,6 @@ class CoursesNew extends Component {
         let coursesId = this.props.match.params.coursesId;
         let {is_public,datatime} = this.state
         // console.log(is_public)
-
         if (coursesId != undefined) {
             // 编辑
 
@@ -180,7 +179,7 @@ class CoursesNew extends Component {
                             name: values.classroom,
                             class_period: values.period,
                             credit: parseFloat(values.credit),
-                            end_date: datatime,
+                            end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
                             authentication: this.state.Realnamecertification,
@@ -234,7 +233,7 @@ class CoursesNew extends Component {
                             name: values.classroom,
                             class_period: values.period,
                             credit: parseFloat(values.credit),
-                            end_date: datatime,
+                            end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
                             authentication: this.state.Realnamecertification,

public/react/src/modules/courses/poll/PollNew.js

@@ -2074,7 +2074,6 @@ class PollNew extends Component {
 	//最小值
 	HandleGradationGroupChangee = (value, index, max, length) => {
 
-		debugger
 		var minbool = false;
 		var maxbool = false;
 		let arr = this.state.adddom;

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

@@ -993,7 +993,7 @@ class Listofworksstudentone extends Component {
 		}
 		axios.post(urll, datasysl).then((result) => {
 			console.log("980000000____________________");
-       debugger
+
 			if(result === undefined){
 				return
 			}

public/react/src/modules/login/LoginDialog.js

@@ -337,6 +337,7 @@ class LoginDialog extends Component {
     }
 
     loginEDU=()=>{
+
       let {loginValue,passValue,regular,isGoingValue}=this.state;
       if(regular===1){
           return
@@ -372,14 +373,16 @@ class LoginDialog extends Component {
                     this.setState({
                         isRender:false
                     })
-                    window.location.reload();
-                }
-            }
-          try {
 								  	this.props.Modifyloginvalue();
-          }catch (e) {
+                    window.location.reload();
 
                 }
+            }
+          // try {
+          //   this.props.Modifyloginvalue();
+          // }catch (e) {
+					//
+          // }
         }).catch((error) => {
           console.log("356");
             console.log(error)

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -298,7 +298,6 @@ class DetailCardsEditAndAdd extends Component{
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
       // console.log("到达底部");
-		debugger
 				this.setState({
 					hometypepvisible:true
 				})

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -139,20 +139,19 @@ class PathDetailIndex extends Component{
     let pathid=this.props.match.params.pathId;
     let url="/paths/"+pathid+".json";
     axios.get(url).then((result)=>{
-        if (result.data.status == 407 || result.data.status == 401) {
+        if (result.data.status === 407 || result.data.status === 401) {
           return;
         }
+
+				if (result.data.status === 403) {
+					return;
+				}
+
 				if(result.data.allow_visit===true){
 					this.setState({
 						detailInfoList:result.data,
 						 items:  getItems(result.data.members.length),
 					})
-        }else{
-          window.location.href = "/403";
-          // this.setState({
-          //   Modalstype:true,
-          //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
-          // })
 				}
 
     }).catch((error)=>{
@@ -168,6 +167,9 @@ class PathDetailIndex extends Component{
       if (result.data.status == 407 || result.data.status == 401) {
         return;
       }
+			if (result.data.status === 403 ) {
+				return;
+			}
 
       if(result.data.allow_visit===true){
         this.setState({
@@ -175,13 +177,8 @@ class PathDetailIndex extends Component{
           items:  getItems(result.data.members.length),
           user_id:undefined,
         })
-      }else{
-        window.location.href = "/403";
-        // this.setState({
-        //   Modalstype:true,
-        //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
-        // })
       }
+
     }).catch((error)=>{
       console.log(error);
     })

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

@@ -487,7 +487,6 @@ submittojoinclass=(value)=>{
   }
 
 	showSearchOpen=(e)=>{
-  	debugger
   	this.setState({
 			showSearchOpentype:true
 		})
@@ -495,7 +494,6 @@ submittojoinclass=(value)=>{
 	}
 
 	hideshowSearchOpen=(e)=>{
-  	debugger
   	let {setevaluatinghides}=this.state;
   	 if(setevaluatinghides===true){
 			 this.setState({
@@ -520,7 +518,6 @@ submittojoinclass=(value)=>{
 	}
 
 	setevaluatinghides=()=>{
-		debugger
   	this.setState(
 			{
 				setevaluatinghides:true
@@ -602,7 +599,6 @@ submittojoinclass=(value)=>{
     //    rolearr:["",""],
     // console.log("618");
     // console.log(user_phone_binded);
-		console.log(showSearchOpentype)
     return (
 
       <div className="newHeader" id="nHeader"  >