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

@@ -10,6 +10,7 @@ var $ = require('jquery'),
     $mobileWrap = $('.mobile-wrap'),
     $overlay = $('.overlay'),
     $sideNav = $('.side-nav'),
+    $subNav = $('.sub-nav'),
     bannerSwiper,
     recommendSwiper,
     hotBrandsSwiper,
@@ -48,8 +49,7 @@ navHammer.on('tap', function(event) {
     return false;
 });
 
-mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
-mobileWrapHammer.on('tap', function(e) {
+function hideSideBar() {
     if ($mobileWrap.hasClass('menu-open')) {
         $mobileWrap.removeClass('menu-open');
         $overlay.css('opacity', 0);
@@ -62,28 +62,40 @@ mobileWrapHammer.on('tap', function(e) {
         setTimeout(function() {
             $('.overlay').hide();
         }, 300);
-        e.srcEvent.stopPropagation();
-        return false;
     }
+}
+
+mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
+mobileWrapHammer.on('tap', function(e) {
+    hideSideBar();
+    e.srcEvent.stopPropagation();
+    return false;
 });
 
 //点击一级导航，弹出二级导航
-$sideNav.on('touchend', 'li', function () {
+$sideNav.on('touchend', 'li', function (e) {
     if ($(this).find('.sub-nav').size() > 0) {
         $('.sub-nav').removeClass('show');
         $(this).find('.sub-nav').addClass('show');
     }
-    return false;
+    e.stopPropagation();
+    if (e.target.pathname === location.pathname) {
+        hideSideBar();
+        return false;
+    }
 });
 
 //返回一级导航，收起二级导航
-$('.sub-nav').each(function () {
+$subNav.each(function () {
     $(this).find('li').eq(0).on('touchend', function (e) {
         $('.sub-nav').removeClass('show');
+        e.stopPropagation();
         return false;
     });
-}).on('touchend', function() {
-    $('.sub-nav').find('li').removeClass('current');
+}).on('touchend', function(e) {
+    if (e.currentTarget !== e.target) {
+        $subNav.find('li').removeClass('current');
+    }
 });
 
 //头部banner轮播

 .side-nav {
-    display: table-cell;
+    display: block;
     background: #fff;
     position: fixed;
     top: 0;
     bottom: 0;
+    // left: 0;
     right: 640rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
     z-index: -1;
@@ -116,8 +117,9 @@
     bottom: 0;
     top: 0;
     left: 0;
-    width: 100%;
+    width: 540rem / $pxConvertRem;
     background: #fff !important;
+    overflow: hidden;
 
     @include transform(translateX(540rem / $pxConvertRem));
     @include transition(transform 0.3s);

 .search-page {
     .search-input {
         position: relative;
-        padding: 7px 46px 7px 15px;
+        padding: 7px 98px 7px 15px;
         background: #f8f8f8;
 
         .search-icon {
@@ -16,7 +16,7 @@
             height: 30px;
             width: 100%;
             border-radius: 15px;
-            text-indent: 26px;
+            padding: 0 26px;
             background: #fff;
             border: none;
         }