|
@@ -179,18 +179,19 @@ $account.on('keyup', function() { |
|
@@ -179,18 +179,19 @@ $account.on('keyup', function() { |
179
|
|
179
|
|
180
|
//数字邮箱补全
|
180
|
//数字邮箱补全
|
181
|
postfix = mailPostfix.num;
|
181
|
postfix = mailPostfix.num;
|
|
|
182
|
+ matchStr = accountMatch[1];
|
182
|
} else {
|
183
|
} else {
|
183
|
postfix = mailPostfix.other;
|
184
|
postfix = mailPostfix.other;
|
|
|
185
|
+ matchStr = account.match(/@(.*)/)[1];
|
184
|
}
|
186
|
}
|
185
|
|
187
|
|
186
|
- matchStr = accountMatch[1];
|
|
|
187
|
for (i = 0; i < postfix.length; i++) {
|
188
|
for (i = 0; i < postfix.length; i++) {
|
188
|
if (postfix[i].indexOf(matchStr) > -1) {
|
189
|
if (postfix[i].indexOf(matchStr) > -1) {
|
189
|
html += '<li>' + account.slice(0, account.indexOf('@')) + '@' + postfix[i] + '</li>';
|
190
|
html += '<li>' + account.slice(0, account.indexOf('@')) + '@' + postfix[i] + '</li>';
|
190
|
}
|
191
|
}
|
191
|
}
|
192
|
}
|
192
|
|
193
|
|
193
|
- if (html !== '') {
|
194
|
+ if (html !== '' && /.com$/.test(account) === false) {
|
194
|
$emailAutoComplete.html(html).removeClass('hide');
|
195
|
$emailAutoComplete.html(html).removeClass('hide');
|
195
|
} else {
|
196
|
} else {
|
196
|
|
197
|
|
|
@@ -283,7 +284,7 @@ $('#login-btn').on('click', function() { |
|
@@ -283,7 +284,7 @@ $('#login-btn').on('click', function() { |
283
|
location.href = data.data.session;
|
284
|
location.href = data.data.session;
|
284
|
}
|
285
|
}
|
285
|
} else {
|
286
|
} else {
|
286
|
- $passwordTip.removeClass('hide').children('em').text(data.message);
|
287
|
+ $passwordTip.removeClass('hide').children('em').html(data.message);
|
287
|
$password.addClass('error');
|
288
|
$password.addClass('error');
|
288
|
}
|
289
|
}
|
289
|
},
|
290
|
},
|