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

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

@@ -43,6 +43,7 @@ navHammer.on('tap', function(event) {
         width: '100%',
         width: '100%',
         overflow: 'hidden'
         overflow: 'hidden'
     });
     });
+
     event.srcEvent.stopPropagation();
     event.srcEvent.stopPropagation();
 });
 });
 
 

@@ -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();
         }
         }

@@ -33,7 +33,6 @@
     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;
     }
     }