From 3ddac7bdddd8593a4403b0e6e1a84e411ff58af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 20:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   | 36 ++++++++++---------
 .../shixunHomework/ShixunHomeworkPage.js      |  8 ++---
 .../src/modules/login/Trialapplicationysl.js  |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 704e4995b..102248e5e 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -900,9 +900,9 @@ class Listofworksstudentone extends Component {
 				},
 			],
 		}
-		console.log("902");
-		console.log("902");
-		console.log(this.props);
+		// console.log("902");
+		// console.log("902");
+		// console.log(this.props);
 
 	}
 	componentDidCatch(error, info){
@@ -916,15 +916,17 @@ class Listofworksstudentone extends Component {
 		console.log("+++++++++915");
 		console.log("+++++++++916");
 		console.log(nextProps);
+		console.log(this.props)
+
 	}
 	componentDidMount() {
 		console.log("componentDidMount");
 		if(this.props.isAdmin() === true){
 			this.tearchar();
-			console.log("909");
+			// console.log("909");
 		}else{
 			this.student();
-			console.log("911");
+			// console.log("911");
 
 		}
 	}
@@ -1165,8 +1167,8 @@ class Listofworksstudentone extends Component {
 			}
 
 		}
-		console.log("554");
-		console.log(columns2);
+		// console.log("554");
+		// console.log(columns2);
 
 
 		this.setState({
@@ -1621,8 +1623,8 @@ class Listofworksstudentone extends Component {
 					user_name: student_works[i].user_name,
 					user_login: student_works[i].user_login,
 				})
-				console.log(datalist);
-				console.log("1612");
+				// console.log(datalist);
+				// console.log("1612");
 
 			}
 
@@ -1719,9 +1721,9 @@ class Listofworksstudentone extends Component {
 
 		} else {
 		}
-
-		console.log(datalist);
-		console.log("1712");
+		//
+		// console.log(datalist);
+		// console.log("1712");
 		this.setState({
 			data: datalist,
 			columns: columns2,
@@ -2004,7 +2006,7 @@ class Listofworksstudentone extends Component {
 	}
 	//立即截止
 	homeworkends = () => {
-		console.log("1160");
+		// console.log("1160");
 		let homeworkid = this.props.match.params.homeworkid;
 		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
 
@@ -2209,10 +2211,10 @@ class Listofworksstudentone extends Component {
 
 		// console.log(this.state.data);
 		// console.log("841");
-		console.log(this.state.columns);
-		console.log(data);
-		console.log("2202");
-		console.log(this.props.isAdmin());
+		// console.log(this.state.columns);
+		// console.log(data);
+		// console.log("2202");
+		// console.log(this.props.isAdmin());
 
 		return (
 			this.props.isAdmin() === true ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 9e731f105..a969e1bec 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -279,10 +279,10 @@ class ShixunHomeworkPage extends Component {
 
 					/>
 
-					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>
-						:parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>
-							:parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
-								:parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
+					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
+					{parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}
+					{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
+					{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
 
 				</div>
 			</div>
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
index 2b369ef7f..d553693cf 100644
--- a/public/react/src/modules/login/Trialapplicationysl.js
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -289,11 +289,11 @@ class Trialapplicationysl extends Component {
 			if(result !== undefined){
 				this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
 				// if (this.state.showTrial === false) {
-				window.location.href = "/";
 				this.setState({
 					isRenders: false
 				})
 				this.Cancel();
+				window.location.href = "/";
 				// } else {
 				// 	this.setState({
 				// 		isRenders: false