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

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

@@ -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 = new Hammer($('#right-bar .con').find('b').unbind()[0]);
 myHammer.on('tap', function(e) {
 myHammer.on('tap', function(e) {
     var index = $(this).index();
     var index = $(this).index();

@@ -61,8 +61,12 @@ navHammer.on('tap', function(event) {
             overflow: 'hidden'
             overflow: 'hidden'
         });
         });
     }
     }
+<<<<<<< HEAD
+    event.srcEvent.stopPropagation();
+=======
 
 
     // event.stopPropagation();
     // event.stopPropagation();
+>>>>>>> cbe96305668d79dee3cd5fb854d96098141e0f65
 });
 });
 
 
 //点击页面主体，收起侧栏导航及二级导航
 //点击页面主体，收起侧栏导航及二级导航

@@ -99,11 +99,12 @@ $(window).scroll(function () {
                     }
                     }
                     return;
                     return;
                 }
                 }
+
                 $goodList.append(data);
                 $goodList.append(data);
+                num = $goodList.find('.good-info').length;
 
 
                 //lazyLoad
                 //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;
                 loading = false;
                 page++;
                 page++;