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

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

@@ -114,7 +114,6 @@ class Testpapersettinghomepage extends Component{
 
         axios.get(url).then((response) => {
         	   console.log(response);
-				  	debugger
             if(response.data.status&&response.data.status===-1){
 
             }else if(response.data.status&&response.data.status===-2){

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

@@ -350,6 +350,9 @@ class Listofworksstudentone extends Component {
           if(result === undefined){
           	return
 					}
+          try {
+
+
 				if (result.status === 200) {
 					if(this.props.isNotMember()===false) {
 					this.setState({
@@ -374,10 +377,12 @@ class Listofworksstudentone extends Component {
 					}
 
 				}
-			}
-
+		  	}
+					}catch (e) {
+						console.log(e);
+					}
 		}).catch((error) => {
-			console.log(error)
+			console.log(error);
 		})
 	}
 

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

@@ -188,14 +188,14 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																												 to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/shixun_work_report`}>
+																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
 									查看实训报告
 								</Link> : ""}
 								{
 									teacherdata === undefined ? ""
 										: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :
 										<a className="fr color-blue font-16"
-											 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>
+											 href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>
 								}
 								{teacherdata === undefined ? "" : <Startshixuntask
 									{...this.props}

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

@@ -572,7 +572,7 @@ class ShixunStudentWork extends Component {
 				key: 'operating',
 				render: (text, record) => (
 					<span>
-             <a onClick={()=>this.Viewstudenttraininginformation("/courses/"+this.state.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+this.props.match.params.homeworkid+"/review_detail/"+record.operating)} >查看</a>
+             <a onClick={()=>this.Viewstudenttraininginformation("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+this.props.match.params.homeworkid+"/review_detail/"+record.operating)} >查看</a>
           </span>
 				)
 			},

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

@@ -59,7 +59,6 @@ class EducoderInteresse extends Component {
 								display: "flex",
 								justifyContent: "center",
 								width: "100%",
-								height: "600px",
 								marginTop: "20px",
 							}}>
 								<InterestpageComponent {...this.props} {...this.state}>

public/react/src/modules/user/common.css

@@ -73,7 +73,7 @@
     display: flex;
     flex-direction:column;
     margin-left: 73px;
-    margin-top: 15px;
+    margin-top: 8px;
   }
 .ysldivhomediv2{
   width: 110px;