Authored by htoooth

调整登录的代码。

... ... @@ -309,8 +309,8 @@ const _processContentData = (list) => {
if (result[index]) {
data = _.assign(data, {
// link: `${config.siteUrl}/product/list/pro_${result[index].productId}_${data.productSkc}/${result[index].cnAlphabet}.html`,
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
result[index].cnAlphabet + '.html'
});
data = _.assign(data, result[index]);
... ...
... ... @@ -116,7 +116,7 @@ function validateAccountAsync() {
// 整合本地和异步验证信息
function validateAccount() {
function validate() {
(function() {
var defer = $.Deferred(); // eslint-disable-line
if (validateAccountLocal()) {
... ... @@ -132,9 +132,7 @@ function validateAccount() {
}
return defer.promise();
}
return validate().then(function() {
}()).then(function() {
hideTip($phoneNumInput);
ep.emit('phone', true);
}).fail(function() {
... ... @@ -178,16 +176,13 @@ function validateCaptchaLocal() {
errTip($imgCaptchaInput, '请输入验证码');
ep.emit('captcha', false);
return false;
break;
case 4:
ep.emit('captcha', true);
return true;
break;
default:
errTip($imgCaptchaInput, '请输入长度为4字符的验证码');
ep.emit('captcha', false);
return false;
break;
}
}
... ... @@ -254,7 +249,7 @@ function validate() {
return false;
}
}).then(function(res) {
var defer = $.Deferred();
var defer = $.Deferred(); // eslint-disable-line
if (!res) {
defer.reject(false);
... ... @@ -271,10 +266,10 @@ function validate() {
});
}
//全部的本地验证
// 全部的本地验证
function loginAsync() {
return validateAccount().then(function() {
var defer = $.Deferred();
var defer = $.Deferred(); // eslint-disable-line
if (validateCaptchaLocal() && validatePasswordLocal()) {
defer.resolve(true);
... ... @@ -285,7 +280,7 @@ function loginAsync() {
return defer.promise();
}).then(function() {
return login();
})
});
}
// 邮箱自动补全
... ...
... ... @@ -144,7 +144,7 @@ function validateImgCaptchaAsync() {
}
function validateImgCaptcha() {
function validate() {
(function() {
var defer = $.Deferred(); // eslint-disable-line
if (validateImgCaptchaLocal()) {
... ... @@ -160,9 +160,7 @@ function validateImgCaptcha() {
}
return defer.promise();
}
return validate().then(function() {
}()).then(function() {
hideTip($imgCaptchaInput);
ep.emit('captcha-img', true);
}).fail(function() {
... ... @@ -212,7 +210,7 @@ function validateSMSCaptchaAsync() {
}
function validateSMSCaptcha() {
function validate() {
(function() {
var defer = $.Deferred(); // eslint-disable-line
if (validateSMSCaptchaLocal()) {
... ... @@ -228,9 +226,7 @@ function validateSMSCaptcha() {
}
return defer.promise();
}
return validate().then(function() {
}()).then(function() {
hideTip($smsCaptchaInput);
ep.emit('captcha-sms', true);
}).fail(function() {
... ... @@ -266,7 +262,7 @@ function validatePhoneNumLocal() {
}
function validatePhoneNum() {
function validate() {
(function() {
var defer = $.Deferred(); // eslint-disable-line
if (validatePhoneNumLocal()) {
... ... @@ -282,9 +278,7 @@ function validatePhoneNum() {
}
return defer.promise();
}
return validate().then(function() {
}()).then(function() {
hideTip($phone);
ep.emit('phone-num', true);
}).fail(function() {
... ... @@ -312,7 +306,7 @@ function validatePasswordLocal() {
// 验证密码合法性
function validatePassword() {
function validate() {
(function() {
var defer = $.Deferred(); // eslint-disable-line
if (validatePasswordLocal()) {
... ... @@ -321,9 +315,7 @@ function validatePassword() {
defer.reject(false);
}
return defer.promise();
}
return validate().then(function() {
}()).then(function() {
hideTip($passwordInput);
ep.emit('password', true);
}).fail(function() {
... ... @@ -338,7 +330,7 @@ function validateAgreeLocal() {
// 验证同意异步调用
function validateAgree() {
var defer = $.Deferred();
var defer = $.Deferred(); // eslint-disable-line
if (validateAgreeLocal()) {
defer.resolve(true);
... ... @@ -444,7 +436,7 @@ function registerAsync() {
function register() {
return validate().then(function() {
return registerAsync();
})
});
}
// 发送短信验证码
... ...