|
@@ -760,7 +760,7 @@ define(['app/app'], function(app) {
|
|
|
$scope.emailEnable = function (newUserEmail) {
|
|
$scope.emailEnable = function (newUserEmail) {
|
|
|
//邮箱不可用
|
|
//邮箱不可用
|
|
|
if ((newUserEmail == null || newUserEmail.length > 30)
|
|
if ((newUserEmail == null || newUserEmail.length > 30)
|
|
|
- || !/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(
|
|
|
|
|
|
|
+ || !(/^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g).test(
|
|
|
newUserEmail)) {
|
|
newUserEmail)) {
|
|
|
$scope.checkSuccess1 = false;
|
|
$scope.checkSuccess1 = false;
|
|
|
$scope.checkFailed1 = true;
|
|
$scope.checkFailed1 = true;
|
|
@@ -819,8 +819,8 @@ define(['app/app'], function(app) {
|
|
|
//校验验证码
|
|
//校验验证码
|
|
|
$scope.validCheckCode = function (checkCode) {
|
|
$scope.validCheckCode = function (checkCode) {
|
|
|
if(!checkCode){
|
|
if(!checkCode){
|
|
|
- $scope.checkSuccess2 = false;
|
|
|
|
|
- $scope.checkFailed2 = true;
|
|
|
|
|
|
|
+ // $scope.checkSuccess2 = false;
|
|
|
|
|
+ // $scope.checkFailed2 = true;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
User.validCheckCode({checkCode: checkCode,newUserEmail:$scope.user.newUserEmail}, function (data) {
|
|
User.validCheckCode({checkCode: checkCode,newUserEmail:$scope.user.newUserEmail}, function (data) {
|
|
@@ -989,8 +989,8 @@ define(['app/app'], function(app) {
|
|
|
//校验验证码
|
|
//校验验证码
|
|
|
$scope.validTelCheckCode = function (telCheckCode) {
|
|
$scope.validTelCheckCode = function (telCheckCode) {
|
|
|
if(!telCheckCode){
|
|
if(!telCheckCode){
|
|
|
- $scope.checkSuccess2 = false;
|
|
|
|
|
- $scope.checkFailed2 = true;
|
|
|
|
|
|
|
+ // $scope.checkSuccess2 = false;
|
|
|
|
|
+ // $scope.checkFailed2 = true;
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},
|
|
User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},
|