Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.com.portal.git

src/main/webapp/js/register.js

@@ -54,10 +54,13 @@ function phoneVal(){
	        }else{
	        	var hunPhone=/^1[3|4|5|7|8]\d{9}$/; 
	    		if(hunPhone.test(phone.trim())){
	    			$(".msgphone1").text("");
	    			phonePass = true;
	    			if($data.data==false){
	   		    	  $(".msgphone1").text("您的手机已被注册");
	   		    	  
	   		        }else{
	   		        	$(".msgphone1").text("");
		    			phonePass = true;
		    			addEvent(btn,"click",handler);//手机必须验证正确，才执行
	   		        }
	    		}else{
	    			phonePass = false;
@@ -167,7 +170,8 @@ function removeClass(obj, cls) {
        obj.className = obj.className.replace(reg, ' ');
    }
}
addEvent(btn,"click",handler);
//手机发送验证码结束
var state;