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

@@ -112,7 +112,7 @@ class NewsaleData
 
 
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
 
 
-        return Yohobuy::get(Yohobuy::API_URL, $param, 600); // 缓存10分钟
+        return Yohobuy::get(Yohobuy::API_URL, $param, 1800); // 缓存30分钟
     }
     }
 
 
     /**
     /**

@@ -15,8 +15,7 @@ var $loadMoreInfo = $('#load-more-info');
 var $loading = $(''),
 var $loading = $(''),
     $noMore = $('');
     $noMore = $('');
 
 
-var winH = $(window).height(),
-    loadMoreH = $loadMoreInfo.height();
+var winH = $(window).height();
 
 
 var $infoList = $('#info-list'),
 var $infoList = $('#info-list'),
     $infos = $infoList.children('.info-list'),
     $infos = $infoList.children('.info-list'),
@@ -107,7 +106,9 @@ navHammer.on('tap', function(e) {
 });
 });
 
 
 $(document).scroll(function() {
 $(document).scroll(function() {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
-        loadMore($infos.not('.hide'), state[curType]);
+    var $c = $infos.not('.hide');
+
+    if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $c.height()) {
+        loadMore($c, state[curType]);
     }
     }
 });
 });

@@ -9,8 +9,7 @@ var $ = require('jquery');
 var info = require('./info'),
 var info = require('./info'),
     loadMore = info.loadMore;
     loadMore = info.loadMore;
 
 
-var winH = $(window).height(),
-    loadMoreH = $('#load-more').height();
+var winH = $(window).height();
 
 
 var $author = $('#author-infos');
 var $author = $('#author-infos');
 var $tag = $('#tag');
 var $tag = $('#tag');
@@ -41,9 +40,7 @@ if ($tag.length > 0) {
 }
 }
 
 
 $(document).scroll(function() {
 $(document).scroll(function() {
-
-    //设置50px阈值
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
+    if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $infos.height()) {
         loadMore($infos, setting);
         loadMore($infos, setting);
     }
     }
 });
 });

@@ -27,16 +27,4 @@
         var s = document.getElementsByTagName("script")[0];
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
         s.parentNode.insertBefore(hm, s);
     })();
     })();
-</script>
-
-<script type="text/javascript">
-    (function(w,d,s,j,f){
-        w['YohoAcquisitionObject']=f;
-        w[f]=function(){w[f].p=arguments;};
-        var a=d.createElement(s);
-        var m=d.getElementsByTagName(s)[0];
-        a.async=1;
-        a.src=j;
-        m.parentNode.insertBefore(a,m);
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
 </script>
 </script>

@@ -20,7 +20,20 @@
 <script>seajs.config({base: 'http://localhost:8000/'});</script>
 <script>seajs.config({base: 'http://localhost:8000/'});</script>
 {{/if}}
 {{/if}}
 
 
-{{> layout/analysis}}
+<script type="text/javascript">
+    (function(w,d,s,j,f){
+        w['YohoAcquisitionObject']=f;
+        w[f]=function(){w[f].p=arguments;};
+        var a=d.createElement(s);
+        var m=d.getElementsByTagName(s)[0];
+        a.async=1;
+        a.src=j;
+        m.parentNode.insertBefore(a,m);
+    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
+</script>
+
 {{> layout/use}}
 {{> layout/use}}
+
+{{> layout/analysis}}
 </body>
 </body>
 </html>
 </html>

@@ -55,7 +55,7 @@ class SearchModel
             }
             }
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
             else {
-                Cache::set($key, $result, 600); // 缓存10分钟
+                Cache::set($key, $result, 1800); // 缓存30分钟
             }
             }
         }
         }