bug解决

@@ -83,7 +83,7 @@ InfiniteLoad.prototype.stop = function() {
 InfiniteLoad.prototype.__directionCalculation = function() {
 InfiniteLoad.prototype.__directionCalculation = function() {
     var p = this.options;
     var p = this.options;
 
 
-    if (p.offset.height && p.offset.height() > 0 && $(window).scrollTop() + $(window).height() >= p.offset.height()) {
+    if (p.offset.height && p.offset.height() > 0 && $(window).scrollTop() + window.innerHeight >= p.offset.height()) {
         return true;
         return true;
     }
     }
     return false;
     return false;
@@ -93,31 +93,19 @@ module.exports = function(data) {
     var $container = $('#newarrivals .goods-container');
     var $container = $('#newarrivals .goods-container');
     var $load = $('.loading a');
     var $load = $('.loading a');
     var load = new InfiniteLoad({
     var load = new InfiniteLoad({
+        index: 1,
         offset: {
         offset: {
             height: function() {
             height: function() {
                 return parseFloat($container.offset().top) + parseFloat($container.height()) - 200;
                 return parseFloat($container.offset().top) + parseFloat($container.height()) - 200;
             }
             }
         }
         }
     });
     });
-    var options;
+    var loadAjax;
     var url = data.url;
     var url = data.url;
-    var firstCount = data.firstCount;
-    var pageCount = data.pageCount;
 
 
     delete data.url;
     delete data.url;
-    delete data.firstCount;
-    delete data.pageCount;
-
-
-
-    load.on('after', function(p) {
-
-        data = $.extend({}, data, {
-            pageIndex: p.index
-        });
-
-        data.pageCount = (data.pageIndex === 1) ? firstCount : pageCount;
 
 
+    var loadAjax=function(url,data,count){
         options = {
         options = {
             type: 'POST',
             type: 'POST',
             url: url,
             url: url,
@@ -127,7 +115,10 @@ module.exports = function(data) {
                 var myTemplate;
                 var myTemplate;
 
 
                 if (code === 200) {
                 if (code === 200) {
-
+                    var len = data.goods.length%count;
+                    var pos = data.goods.length-len-1;
+                    data.goods.splice(pos,len);
+                    
                     myTemplate = Handlebars.compile(load.tpl);
                     myTemplate = Handlebars.compile(load.tpl);
 
 
                     $container.append(myTemplate(data.goods));
                     $container.append(myTemplate(data.goods));
@@ -150,23 +141,22 @@ module.exports = function(data) {
         };
         };
 
 
         $.ajax(options);
         $.ajax(options);
+    }
+
+
+    load.on('after', function(p) {
+        data = $.extend({}, data, {
+            pageIndex: p.index
+        });
+        
+
+        data.pageCount = data.count*data.rows[1];
+
+        loadAjax(url,data);
     });
     });
 
 
-    load.on('before', function() {
-
-        //请求模板
-        // load.tpl = '{{#each this}}';
-        // load.tpl += '<li>';
-        // load.tpl += '   <a href="{{url}}"><div class="commodity-img">';
-        // load.tpl += '       {{# tip}}';
-        // load.tpl += '       <i class="commodity-tag">{{.}}</i>';
-        // load.tpl += '       {{/ tip}}';
-        // load.tpl += '       <img class="lazy" data-original="{{img}}" src="{{img}}"/></div>';
-        // load.tpl += '       <p class="commodity-name">{{name}}</p>';
-        // load.tpl += '       <p class="commodity-price"><span>¥{{price}}</span></p>';
-        // load.tpl += '   </a>';
-        // load.tpl += '</li>';
-        // load.tpl += '{{/each}}';
+    load.on('before', function(p) {
+
 
 
         load.tpl = '{{#each this}}';
         load.tpl = '{{#each this}}';
         load.tpl += '<div class="good-info" data-skn="{{skn}}">';
         load.tpl += '<div class="good-info" data-skn="{{skn}}">';
@@ -221,6 +211,14 @@ module.exports = function(data) {
         load.tpl += '</div>';
         load.tpl += '</div>';
         load.tpl += '{{/each}}';
         load.tpl += '{{/each}}';
 
 
+        data = $.extend({}, data, {
+            pageIndex: p.index
+        });
+        
+
+        data.pageCount = data.count*data.rows[0];
+
+        loadAjax(url,data,data.count);
 
 
         load.emit();
         load.emit();
     });
     });

@@ -24,8 +24,8 @@ if ($.inArray(homePage, ['boys','girls','kids','lifestyle']) > -1) {
     require('../common/new-arrivls')({
     require('../common/new-arrivls')({
         type: homePage,
         type: homePage,
         url: '/common/getNewArrival',
         url: '/common/getNewArrival',
-        firstCount: homePage === ('boys' || 'lifestyle') ? '25' : '20',
-        pageCount: homePage === ('boys' || 'lifestyle') ? '15' : '12'
+        count:(homePage === 'boys') || (homePage === 'lifestyle') ? 5 : 4,
+        rows:[5,3]
     });
     });
     window.setCookie('_Channel', homePage, {
     window.setCookie('_Channel', homePage, {
         domain: '.yohobuy.com',
         domain: '.yohobuy.com',

@@ -413,7 +413,7 @@
         .singlehot{
         .singlehot{
             li a{
             li a{
                 width: 185px;
                 width: 185px;
-                height: 284px;
+                height: 248px;
             }
             }
             .impo1,.impo9{
             .impo1,.impo9{
                 width: 378px;
                 width: 378px;