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

@@ -132,7 +132,7 @@ function search(opt) {
     }
     }
 
 
     //导航类别
     //导航类别
-    if ($pre === undefined || $pre.hasClass('new')) {
+    if ($pre.hasClass('new')) {
         navType = 'newest';
         navType = 'newest';
     } else if ($pre.hasClass('price')) {
     } else if ($pre.hasClass('price')) {
         navType = 'price';
         navType = 'price';
@@ -214,7 +214,7 @@ filter.registerCbFn(search);
 //3.筛选无active时点击展开筛选面板
 //3.筛选无active时点击展开筛选面板
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
 //5.当前active为筛选并且点击其他项时，隐藏筛选面板
-$listNav.delegate('li', 'touchstart', function() {
+$listNav.delegate('li', 'tap', function() {
     var $this = $(this),
     var $this = $(this),
         nav,
         nav,
         navType,
         navType,
@@ -308,6 +308,8 @@ $(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()) {
+        if ($pre != undefined) {
             search();
             search();
         }
         }
+    }
 });
 });

@@ -151,7 +151,7 @@ function search(opt) {
     }
     }
 
 
     //导航类别
     //导航类别
-    if ($pre === undefined || $pre.hasClass('today')) {
+    if ($pre.hasClass('today')) {
         navType = 'today';
         navType = 'today';
         dayLimit = 1;
         dayLimit = 1;
     } else if ($pre.hasClass('week')) {
     } else if ($pre.hasClass('week')) {
@@ -314,6 +314,8 @@ $(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()) {
+        if ($pre !== undefined) {
             search();
             search();
         }
         }
+    }
 });
 });