update

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

@@ -61,7 +61,7 @@ $('#maybe-like-nav').delegate('li', 'tap', function() {
 
 
 //srcoll to load more
 //srcoll to load more
 $(window).scroll(function () {
 $(window).scroll(function () {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH) {
+    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
         if (loading) {
         if (loading) {
             return;
             return;
         }
         }

@@ -345,7 +345,7 @@ $(window).scroll(function() {
 
 
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     if ($(window).scrollTop() + winH >
     if ($(window).scrollTop() + winH >
-        $(document).height() - 0.25 * $goodsContainer.height()) {
+        $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         if ($pre !== undefined) {
         if ($pre !== undefined) {
             search();
             search();
         }
         }

@@ -356,7 +356,7 @@ $(window).scroll(function() {
 
 
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     //当scroll到1/4$goodsContainer高度后继续请求下一页数据
     if ($(window).scrollTop() + winH >
     if ($(window).scrollTop() + winH >
-        $(document).height() - 0.25 * $goodsContainer.height()) {
+        $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         if ($pre !== undefined) {
         if ($pre !== undefined) {
             search();
             search();
         }
         }