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

@@ -143,6 +143,16 @@ function showPage() {
     $pageList.css('visibility', 'visible');
 }
 
+function bindTouchedEvent() {
+    var $boxs = $('.box');
+
+    $boxs.on('touchstart', function(e) {
+        $(this).addClass('bytouch');
+    }).on('touchend touchcancel', function() {
+        $boxs.removeClass('bytouch');
+    });
+}
+
 if (wxHammer) {
     wxHammer.on('tap', function() {
         callpay(theOrderCode);
@@ -154,9 +164,11 @@ function main() {
     loading.hideLoadingMask();
     showPage();
     loadIcon();
+    bindTouchedEvent();
 }
 
 loading.showLoadingMask();
 
 $(document).ready(main);
 
+

@@ -5,6 +5,10 @@
     visibility: hidden;
   }
 
+  .box.bytouch {
+    background-color:#eee;
+  }
+
   .box {
     border: 1px solid #eee;
     border-radius: 10rem / $pxConvertRem;
@@ -23,6 +27,7 @@
       @include flexbox((display: flex, align-items: center));
     }
 
+
     .icon {
       width: 15%;
 
@@ -38,7 +43,7 @@
         height: 60rem / $pxConvertRem;
         background-image: image-url("layout/pay-icon.png");
         background-size: 90%;
-        background-position-y: 8rem / $pxConvertRem;
+        background-position-y: 12rem / $pxConvertRem;
         background-position-x: center;
         background-repeat: no-repeat;
       }

@@ -614,6 +614,15 @@ handlebars.registerHelper('equalone', function(v1, options) {
     }
 });
 /**
+ * 时间戳
+ * @param  {[type]} v1       [description]
+ * @param  {[type]} options) {               if (v1 [description]
+ * @return {[type]}          [description]
+ */
+handlebars.registerHelper('timestamp', function() {
+    return new Date().getTime();
+});
+/**
  * 判断等级为3的helper
  * @param  {[type]} v1       [description]
  * @param  {[type]} options) {               if (v1 [description]
@@ -5720,18 +5729,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 {
 
@@ -5824,7 +5834,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');
                 }
             },