update

--Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
++Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -7,6 +7,9 @@ var $ = require('jquery'),
     Hammer = require('hammer'),
     Hammer = require('hammer'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
+    $mobileWrap = $('.mobile-wrap'),
+    $overlay = $('.overlay'),
+    $sideNav = $('.side-nav'),
     bannerSwiper,
     bannerSwiper,
     recommendSwiper,
     recommendSwiper,
     hotBrandsSwiper,
     hotBrandsSwiper,
@@ -28,27 +31,9 @@ require('./maybe-like');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
-//$('img:in-viewport').trigger('appear');
-
-//点击首页汉堡menu图标，滑出侧栏导航
-// $('.nav-btn').on('tap', function (event) {
-//     if (!$(this).hasClass('menu-open')) {
-//         $('.mobile-wrap').addClass('menu-open');
-//         $('.overlay').show().css('opacity', 0.3);
-//         $('.side-nav').addClass('on');
-
-//         //设置boy高宽，页面不能上下滑动
-//         $('body').css({
-//             height: $(window).height(),
-//             width: '100%',
-//             overflow: 'hidden'
-//         });
-//     }
-//     event.stopPropagation();
-// });
-
 navHammer = new Hammer($('.nav-btn')[0]);
 navHammer = new Hammer($('.nav-btn')[0]);
 navHammer.on('tap', function(event) {
 navHammer.on('tap', function(event) {
+<<<<<<< HEAD
     if (!$(this).hasClass('menu-open')) {
     if (!$(this).hasClass('menu-open')) {
         $('.mobile-wrap').addClass('menu-open');
         $('.mobile-wrap').addClass('menu-open');
         $('.overlay').show().css('opacity', 0.3);
         $('.overlay').show().css('opacity', 0.3);
@@ -61,33 +46,28 @@ navHammer.on('tap', function(event) {
             overflow: 'hidden'
             overflow: 'hidden'
         });
         });
     }
     }
+=======
+    $mobileWrap.addClass('menu-open');
+    $overlay.show().css('opacity', 0.3);
+    $sideNav.addClass('on');
+
+    //设置boy高宽，页面不能上下滑动
+    $('body').css({
+        height: $(window).height(),
+        width: '100%',
+        overflow: 'hidden'
+    });
+>>>>>>> 9ef15a28755af3762f68b90623fd5e6d1a27082e
     event.srcEvent.stopPropagation();
     event.srcEvent.stopPropagation();
 });
 });
 
 
-//点击页面主体，收起侧栏导航及二级导航
-// $('.mobile-wrap').on('tap', function () {
-//     if ($(this).hasClass('menu-open')) {
-//         $('.mobile-wrap').removeClass('menu-open');
-//         $('.overlay').css('opacity', 0);
-//         $('.sub-nav').removeClass('show');
-//         $('.side-nav').removeClass('on');
-//         $('body').css({
-//             height: 'auto',
-//             overflow: 'auto'
-//         });
-//         setTimeout(function() {
-//             $('.overlay').hide();
-//         }, 300);
-//     }
-// });
-
 mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
 mobileWrapHammer = new Hammer($('.mobile-wrap')[0]);
-mobileWrapHammer.on('tap', function(event) {
-    if ($(this).hasClass('menu-open')) {
-        $('.mobile-wrap').removeClass('menu-open');
-        $('.overlay').css('opacity', 0);
+mobileWrapHammer.on('tap', function(e) {
+    if ($mobileWrap.hasClass('menu-open')) {
+        $mobileWrap.removeClass('menu-open');
+        $overlay.css('opacity', 0);
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
-        $('.side-nav').removeClass('on');
+        $sideNav.removeClass('on');
         $('body').css({
         $('body').css({
             height: 'auto',
             height: 'auto',
             overflow: 'auto'
             overflow: 'auto'
@@ -95,11 +75,12 @@ mobileWrapHammer.on('tap', function(event) {
         setTimeout(function() {
         setTimeout(function() {
             $('.overlay').hide();
             $('.overlay').hide();
         }, 300);
         }, 300);
+        e.srcEvent.stopPropagation();
     }
     }
 });
 });
 
 
 //点击一级导航，弹出二级导航
 //点击一级导航，弹出二级导航
-$('.side-nav').on('touchstart', 'li', function () {
+$sideNav.on('touchstart', 'li', function () {
     if ($(this).find('.sub-nav').size() > 0) {
     if ($(this).find('.sub-nav').size() > 0) {
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
         $(this).find('.sub-nav').addClass('show');
         $(this).find('.sub-nav').addClass('show');
@@ -114,13 +95,6 @@ $('.sub-nav').each(function () {
     });
     });
 });
 });
 
 
-//二级导航样式控制
-$('.sub-nav').on('mouseenter', 'li', function () {
-    if ($(this).index() !== 0) {
-        $(this).addClass('current').siblings().removeClass('current');
-    }
-});
-
 //头部banner轮播
 //头部banner轮播
 if ($('.banner-swiper').find('li').size() > 1) {
 if ($('.banner-swiper').find('li').size() > 1) {
     bannerSwiper = new Swiper('.banner-swiper', {
     bannerSwiper = new Swiper('.banner-swiper', {

@@ -33,17 +33,17 @@
     line-height: 90rem / $pxConvertRem;
     line-height: 90rem / $pxConvertRem;
     @include background-image(linear-gradient(#323232, #414141));
     @include background-image(linear-gradient(#323232, #414141));
     position: relative;
     position: relative;
-    z-index: 100;
     .iconfont {
     .iconfont {
         color: #fff;
         color: #fff;
     }
     }
 
 
     .nav-btn {
     .nav-btn {
         position: absolute;
         position: absolute;
-        left: 32rem / $pxConvertRem;
+        left: 0;
         top: 0;
         top: 0;
         bottom: 0;
         bottom: 0;
         z-index: 2;
         z-index: 2;
+        padding: 0 32rem / $pxConvertRem;
     }
     }
 
 
     .logo {
     .logo {