Showing
2 changed files
with
11 additions
and
7 deletions
@@ -48,13 +48,15 @@ require('yoho.placeholder'); | @@ -48,13 +48,15 @@ require('yoho.placeholder'); | ||
48 | function validateAccount() { | 48 | function validateAccount() { |
49 | var pass = false, | 49 | var pass = false, |
50 | account = $.trim($account.val()), | 50 | account = $.trim($account.val()), |
51 | + countryCode = $countryCodeHide.val(), | ||
51 | err; | 52 | err; |
52 | 53 | ||
53 | if (account !== '') { | 54 | if (account !== '') { |
54 | if (/^[0-9]+$/.test(account)) { | 55 | if (/^[0-9]+$/.test(account)) { |
55 | 56 | ||
56 | //如果是纯数字,则作为手机号码处理 | 57 | //如果是纯数字,则作为手机号码处理 |
57 | - if (mailPhoneRegx.phoneRegx[$countryCodeHide.val()].test(account)) { | 58 | + if (countryCode !== '+86' || |
59 | + mailPhoneRegx.phoneRegx[countryCode].test(account)) { | ||
58 | pass = true; | 60 | pass = true; |
59 | } else { | 61 | } else { |
60 | pass = false; | 62 | pass = false; |
@@ -268,13 +268,15 @@ function validateRule(page, $element, callback) { | @@ -268,13 +268,15 @@ function validateRule(page, $element, callback) { | ||
268 | validateResult[0].status = false; | 268 | validateResult[0].status = false; |
269 | callback(); | 269 | callback(); |
270 | 270 | ||
271 | - } else if (!regValidate.phoneRegx[regionCode].test(val)) { | ||
272 | - validateResult[0].message = '手机号码格式不正确,请重新输入'; | ||
273 | - validateResult[0].status = false; | ||
274 | - callback(); | ||
275 | - | ||
276 | } else { | 271 | } else { |
277 | - phoneAjaxFn(page, callback); | 272 | + if (!/^[0-9]+$/.test(val) || |
273 | + (regionCode === '+86' && !regValidate.phoneRegx[regionCode].test(val))) { | ||
274 | + validateResult[0].message = '手机号码格式不正确,请重新输入'; | ||
275 | + validateResult[0].status = false; | ||
276 | + callback(); | ||
277 | + } else { | ||
278 | + phoneAjaxFn(page, callback); | ||
279 | + } | ||
278 | } | 280 | } |
279 | 281 | ||
280 | //图形验证码校验 | 282 | //图形验证码校验 |
-
Please register or login to post a comment