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

@@ -52,14 +52,6 @@ if ($brandList.length > 0) {
     });
 }
 
-// $('#right-bar .con').find('b').unbind().on('tap', function() {
-//     var index = $(this).index();
-
-//     if ($('.bar-' + index).size() > 0) {
-//         document.body.scrollTop = parseInt($('.bar-' + index)[0].offsetTop) - parseInt(brandSwipe - 1);
-//     }
-// });
-
 myHammer = new Hammer($('#right-bar .con').find('b').unbind()[0]);
 myHammer.on('tap', function(e) {
     var index = $(this).index();

@@ -7,6 +7,9 @@ var $ = require('jquery'),
     Hammer = require('hammer'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload'),
+    $mobileWrap = $('.mobile-wrap'),
+    $overlay = $('.overlay'),
+    $sideNav = $('.side-nav'),
     bannerSwiper,
     recommendSwiper,
     hotBrandsSwiper,
@@ -28,31 +31,11 @@ require('./maybe-like');
 
 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.on('tap', function(event) {
-    if (!$(this).hasClass('menu-open')) {
-        $('.mobile-wrap').addClass('menu-open');
-        $('.overlay').show().css('opacity', 0.3);
-        $('.side-nav').addClass('on');
+    $mobileWrap.addClass('menu-open');
+    $overlay.show().css('opacity', 0.3);
+    $sideNav.addClass('on');
 
     //设置boy高宽，页面不能上下滑动
     $('body').css({
@@ -60,35 +43,16 @@ navHammer.on('tap', function(event) {
         width: '100%',
         overflow: 'hidden'
     });
-    }
-
-    // event.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.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');
-        $('.side-nav').removeClass('on');
+        $sideNav.removeClass('on');
         $('body').css({
             height: 'auto',
             overflow: 'auto'
@@ -96,11 +60,12 @@ mobileWrapHammer.on('tap', function(event) {
         setTimeout(function() {
             $('.overlay').hide();
         }, 300);
+        e.srcEvent.stopPropagation();
     }
 });
 
 //点击一级导航，弹出二级导航
-$('.side-nav').on('touchstart', 'li', function () {
+$sideNav.on('touchstart', 'li', function () {
     if ($(this).find('.sub-nav').size() > 0) {
         $('.sub-nav').removeClass('show');
         $(this).find('.sub-nav').addClass('show');
@@ -115,13 +80,6 @@ $('.sub-nav').each(function () {
     });
 });
 
-//二级导航样式控制
-$('.sub-nav').on('mouseenter', 'li', function () {
-    if ($(this).index() !== 0) {
-        $(this).addClass('current').siblings().removeClass('current');
-    }
-});
-
 //头部banner轮播
 if ($('.banner-swiper').find('li').size() > 1) {
     bannerSwiper = new Swiper('.banner-swiper', {

@@ -99,11 +99,12 @@ $(window).scroll(function () {
                     }
                     return;
                 }
+
                 $goodList.append(data);
+                num = $goodList.find('.good-info').length;
 
                 //lazyLoad
-                //lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
-                lazyLoad($('.good-info').find('img.lazy'));
+                lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
 
                 loading = false;
                 page++;

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