Merge remote-tracking branch 'origin/master'

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>:"")

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)
 
-		}
 
 	}
 	//邮箱手机号验证