Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -134,9 +134,9 @@ class Exercisesetting extends Component{
                     //         end_timetype:false
                     //     })
                     // }else{
-                    //     this.setState({
-                    //         end_timetype:true
-                    //     })
+                        this.setState({
+                            end_timetype:true
+                        })
                     // }
                 }
 

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

@@ -911,6 +911,8 @@ class Listofworksstudentone extends Component {
 		}
 	}
 	student=()=>{
+		console.log("914");
+		debugger
 		this.props.triggerRef(this);
 		var homeworkid = this.props.match.params.homeworkid;
 		this.Getalistofworks(homeworkid);
@@ -930,7 +932,8 @@ class Listofworksstudentone extends Component {
 	// 获取作品列表
 	Getalistofworks = (homeworkid) => {
 		// console.log("获取作品列表");
-
+		console.log("935");
+		debugger
 		let urll = `/homework_commons/${homeworkid}/works_list.json`;
 		var data = {
 			search: "",
@@ -945,9 +948,10 @@ class Listofworksstudentone extends Component {
           if(result === undefined){
           	return
 					}
-
+			console.log("951");
+			console.log(result);
+			debugger
 				if (result.status === 200) {
-					if(this.props.isNotMember()===false) {
 					this.setState({
 						teacherdata: result.data,
 						task_status: result.data.task_status,
@@ -970,7 +974,6 @@ class Listofworksstudentone extends Component {
 					}
 
 		  	}
-		  	}
 		}).catch((error) => {
 			console.log(error);
 		})
@@ -1373,7 +1376,6 @@ class Listofworksstudentone extends Component {
 			if (result !== undefined) {
 				// console.log("学生公开的作品列表")
 				// console.log(JSON.stringify(result))
-				if(this.props.isNotMember()===false) {
 				this.setState({
 					teacherdata: result.data,
 					task_status: result.data.task_status,
@@ -1391,7 +1393,6 @@ class Listofworksstudentone extends Component {
 					this.props.Getdataback(result,result.data);
 					this.seacthdata(result.data);
 			}
-			}
 		}).catch((error) => {
 			console.log(error)
 			this.setState({
@@ -1487,7 +1488,6 @@ class Listofworksstudentone extends Component {
 		}
 		axios.post(urll, data).then((result) => {
 
-			if(this.props.isNotMember()===false){
 				if (result !== undefined) {
 					// console.log(url)
 					// console.log("作品列表6789077")
@@ -1507,7 +1507,7 @@ class Listofworksstudentone extends Component {
 					})
 					this.props.Getdataback(result,result.data);
 					this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
-				}		}
+		}
 		}).catch((error) => {
 			console.log(error)
 			this.setState({
@@ -1550,7 +1550,6 @@ class Listofworksstudentone extends Component {
 			// console.log(url)
 			// console.log("作品列表______________________")
 			// console.log(JSON.stringify(result))
-			if(this.props.isNotMember()===false){
 				if (result !== undefined) {
 					this.setState({
 						teacherdata: result.data,
@@ -1567,9 +1566,8 @@ class Listofworksstudentone extends Component {
 					})
 					this.props.Getdataback(result,result.data);
 					this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
-				}
-			}
 				// }
+			}
 		}).catch((error) => {
 			console.log(error)
 			this.setState({