update

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

@@ -105,7 +105,7 @@ $(window).scroll(function () {
 
                 //lazyLoad
                 lazyLoad($goodList.children('.good-info:gt(' + (num - 1) + ')').find('img.lazy'));
-                
+
                 loading = false;
                 page++;
             },