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

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

@@ -118,7 +118,7 @@ class Osshackathon extends Component {
 			return
 		}
 		//判断是否绑定邮箱
-
+ 
 	  if(this.props.user.email===null){
 			this.props.showhideAccountPhoneemailDialog()
 			return

public/react/src/modules/user/AccountPhoneemail.js

@@ -67,8 +67,8 @@ class AccountPhoneemail extends Component {
 				<div className="task-popup-content">
 					<p className="task-popup-text-center font-16"> 您需要完成手机号码和邮箱的绑定，才能使用此功能</p>
 					<div className="clearfix mt30 edu-txt-center">
-						<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后完善</a>
-						<a className="task-btn task-btn-orange"  href={ "/account/secure" }> {'立即完善'}</a>
+						<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后绑定</a>
+						<a className="task-btn task-btn-orange"  href={ "/account/secure" }> {'立即绑定'}</a>
 					</div>
 				</div>
 			</Modal>