Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -179,18 +179,19 @@ $account.on('keyup', function() {
 
             //数字邮箱补全
             postfix = mailPostfix.num;
+            matchStr = accountMatch[1];
         } else {
             postfix = mailPostfix.other;
+            matchStr = account.match(/@(.*)/)[1];
         }
 
-        matchStr = accountMatch[1];
         for (i = 0; i < postfix.length; i++) {
             if (postfix[i].indexOf(matchStr) > -1) {
                 html += '<li>' + account.slice(0, account.indexOf('@')) + '@' + postfix[i] + '</li>';
             }
         }
 
-        if (html !== '') {
+        if (html !== '' && /.com$/.test(account) === false) {
             $emailAutoComplete.html(html).removeClass('hide');
         } else {
 
@@ -283,7 +284,7 @@ $('#login-btn').on('click', function() {
                         location.href = data.data.session;
                     }
                 } else {
-                    $passwordTip.removeClass('hide').children('em').text(data.message);
+                    $passwordTip.removeClass('hide').children('em').html(data.message);
                     $password.addClass('error');
                 }
             },

@@ -169,6 +169,11 @@ $tip: sprite-map("passport/tip/*.png", $spacing: 10px);
             background: sprite($tip, error) no-repeat;
             margin-right: 5px;
         }
+
+        a {
+            text-decoration: underline;
+            color: f00;
+        }
     }
 
     /*完善信息提示框*/