From e2952ced522f8bf05d4230e9bb985026a9d5a9bf 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 13:24:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/FindPasswordComponent.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 5edc7b0b4..d87bb6a4a 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -405,6 +405,7 @@ class LoginRegisterComponent extends Component {
 	}
 
 	inputOnBlurzhuche = (e)=>{
+		if(this.state.pciphone===false) {
 		if(this.state.login===""||this.state.login.length===0){
 			this.setState({
 				Phonenumberisnotco: "账号不能为空",
@@ -419,10 +420,12 @@ class LoginRegisterComponent extends Component {
 		})
 		this.Emailphonenumberverification(e.target.value)
 	}
+
+	}
 	//是否验证通过
 	dragOkCallback = () => {
 		console.log(this.state.login);
-		if(this.state.pciphone===false) {
+
 
 			if (this.state.login === "" || this.state.login.length === 0) {
 				this.setState({
@@ -438,7 +441,6 @@ class LoginRegisterComponent extends Component {
 			})
 			this.Emailphonenumberverification(this.state.login)
 
-		}
 
 	}
 	//邮箱手机号验证

From 171012369f68d6e0fe96c84391c96f153b7197d7 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 13:31:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/Listofworksstudentone.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index f6b606605..5a2c89154 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2328,7 +2328,7 @@ class Listofworksstudentone extends Component {
 										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
 										</div>:""):
-										teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+										teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
 											(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 													计算成绩
 												</div>:"")
@@ -2619,7 +2619,7 @@ class Listofworksstudentone extends Component {
 															</div>
 															:"")
 														:
-														(teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+														(teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
 															this.props.isNotMember()===false?
 																<div className={"computeTimes font-13"}>
 																	计算成绩
@@ -2784,7 +2784,7 @@ class Listofworksstudentone extends Component {
 														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 															计算成绩
 														</div>:""):
-														teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+														teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
 															(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 																计算成绩
 															</div>:"")