Merge remote-tracking branch 'remotes/origin/hotfix/login'

@@ -8,7 +8,8 @@ var $ = require('jquery');
 var trim = $.trim;
 
 //邮箱验证规则
-var emailRegx = /^([a-zA-Z0-9]+[_|\_|\.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+var emailRegx =
+/^([a-zA-Z0-9]+[_|\_|\.|-]?)*[a-zA-Z0-9]+[_|\_|\.|-]?@([a-zA-Z0-9]+[_|\_|\.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
 
 //手机号码验证规则
 var phoneRegx = {
@@ -132,4 +133,4 @@ module.exports = {
     bindClearEvt: bindClearEvt,
     pwdValidate: pwdValidate,
     selectCssHack: selectCssHack
-};
\ No newline at end of file
+};