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

public/react/src/modules/osshackathon/Osshackathon.js

@@ -118,10 +118,15 @@ class Osshackathon extends Component {
 			return
 		}
 		//判断是否绑定邮箱
-	  if(!this.props.user.email===true||!this.props.user.phone===true){
+
+	  if(this.props.user.email===null){
 			this.props.showhideAccountPhoneemailDialog()
+			return
+		}
+		if(this.props.user.phone===null){
+			this.props.showhideAccountPhoneemailDialog()
+			return
 		}
-
 		this.props.confirm({
 			content: `是否确认报名?`,
 			onOk: () => {