Эх сурвалжийг харах

企业注册号、手机号适配台湾地区和其他地区

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1041 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 жил өмнө
parent
commit
d411b4c35a

+ 3 - 3
src/main/webapp/resources/js/register/registerApp.js

@@ -47,7 +47,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		};
 		
 		$scope.$watch('enterprise.enBussinessCode', function(){
-			var patt = new RegExp(/^[\d]+[\d-]{10,}$/);
+			var patt = new RegExp(/^[\d-]{8,}$/);
 			if(patt.test($scope.enterprise.enBussinessCode)) {
 				$http.get('signup/codeEnable', {
 					params: {
@@ -75,7 +75,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		});
 		
 		$scope.$watch('enterprise.enAdminTel', function(){
-			var patt = new RegExp(/^(13[0-9]|15[0-9]|18[0-9])\d{8}$/);
+			var patt = new RegExp(/^[\d-]{8,}$/);
 			if(patt.test($scope.enterprise.enAdminTel)) {
 				$http.get('signup/telEnable', {
 					params: {
@@ -95,7 +95,7 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 				});
 			} else {
 				$scope.myForm.enAdminTel.$setValidity('available', false);
-				$scope.telErrorInfo = '格式错误';
+//				$scope.telErrorInfo = '格式错误';
 			}
 		});
 		$scope.$watch('enterprise.enAdminEmail', function(){

+ 2 - 2
src/main/webapp/resources/tpl/register/step1.html

@@ -57,7 +57,7 @@
 		    	<label for="enBusinessCode" class="col-md-3 col-sm-4 control-label">营业执照注册号:</label>
 			    <div class="col-md-5 col-sm-6">
 			      	<input required ng-model="enterprise.enBussinessCode" type="text" class="form-control" id="enBusinessCode" name="enBussinessCode"
-			      		ng-pattern="/^[\d-]{10,}$/" placeholder="请输入企业的营业执照注册号(注册证号)">
+			      		ng-pattern="/^[\d-]{8,}$/" placeholder="请输入企业的营业执照注册号(注册证号)">
 			    </div>
 			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
 			    	<span ng-show="!myForm.enBussinessCode.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span>恭喜您,执照号可用</span>
@@ -104,7 +104,7 @@
 		    	<label for="enAdminTel" class="col-md-3 col-sm-4 control-label">管理员手机号:</label>
 			    <div class="col-md-5 col-sm-6">
 			      	<input required ng-model="enterprise.enAdminTel" ng-length="11" type="text" class="form-control" id="enAdminTel" name="enAdminTel"
-			      		ng-parttern="/^(13[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$/" placeholder="请输入系统管理员手机号">
+			      		ng-parttern="/^[\d-]{8,}$/" placeholder="请输入系统管理员手机号">
 			    </div>
 			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
 			    	<span ng-show="!myForm.enAdminTel.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span>恭喜您,手机号可用</span>