From c52c756b81ec62ef84e3642d9b656b14a332ef65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 21 Nov 2019 16:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=AE=A2=E6=9D=BE=E6=9D=83=E9=99=90?=
 =?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/osshackathon/Osshackathon.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js
index c48b4b656..67c81381c 100644
--- a/public/react/src/modules/osshackathon/Osshackathon.js
+++ b/public/react/src/modules/osshackathon/Osshackathon.js
@@ -119,14 +119,11 @@ class Osshackathon extends Component {
 		}
 		//判断是否绑定邮箱
  
-	  if(this.props.user.email===null){
-			this.props.showhideAccountPhoneemailDialog()
-			return
-		}
-		if(this.props.user.phone===null){
+	  if(this.props.user.email===null&&this.props.user.phone===null){
 			this.props.showhideAccountPhoneemailDialog()
 			return
 		}
+
 		this.props.confirm({
 			content: `是否确认报名?`,
 			onOk: () => {