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

@@ -139,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) {
 
 
 //srcoll to load more
 //srcoll to load more
 $(window).scroll(function () {
 $(window).scroll(function () {
-    if ($(window).scrollTop() + winH >= $(document).height()) {
+    if ($(window).scrollTop() + winH >= $(document).height() - 50) {
         search();
         search();
     }
     }
 });
 });

@@ -41,7 +41,7 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) {
         e.srcEvent.stopPropagation();
         e.srcEvent.stopPropagation();
     });
     });
 
 
-    if (!window.cookie('_float-layer-app')) {
+    if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) {
         $('#float-layer-app').show();
         $('#float-layer-app').show();
     } else {
     } else {
         $('#float-layer-app').hide();
         $('#float-layer-app').hide();

@@ -77,7 +77,7 @@
     img {
     img {
         display: block;
         display: block;
         width: 100%;
         width: 100%;
-        max-height: 368rem / $pxConvertRem;
+        height: 368rem / $pxConvertRem;
     }
     }
 
 
     .few-tag {
     .few-tag {