店铺翻页 判断是否返回为空

@@ -239,7 +239,7 @@ function search(opt) {
                 SORT_TYPE: setting.dayLimit
                 SORT_TYPE: setting.dayLimit
             };
             };
 
 
-            if (data === ' ' || data === '' || data.list) {
+            if (data === '' || (data.list && data.list.length <= 0)) {
                 nav.end = true;
                 nav.end = true;
                 if (nav.reload) {
                 if (nav.reload) {
                     $container.html(noResult);
                     $container.html(noResult);

@@ -279,7 +279,7 @@ function search(opt, params, isScroll) {
                 $container.removeClass('hide');
                 $container.removeClass('hide');
             }
             }
 
 
-            if (data === '') {
+            if (data === '' || (data.list && data.list.length <= 0)) {
                 nav.end = true;
                 nav.end = true;
 
 
                 if (nav.reload) {
                 if (nav.reload) {

@@ -18,8 +18,7 @@ var bannerSwiper,
     scH,
     scH,
     $nav1 = $('#pos-nav'),
     $nav1 = $('#pos-nav'),
     $nav2 = $('#pos-list'),
     $nav2 = $('#pos-list'),
-    sTop,
-    toTop = false;
+    sTop;
 
 
 var tip = require('../plugin/tip'),
 var tip = require('../plugin/tip'),
     filter = require('../plugin/filter'),
     filter = require('../plugin/filter'),
@@ -240,8 +239,7 @@ function getPageGoods(info) {
     nav = navInfo[navType];
     nav = navInfo[navType];
 
 
     // 不需要重新加载并且数据请求结束
     // 不需要重新加载并且数据请求结束
-    if (nav.end && toTop) {
-        toTop = false;
+    if (nav.end) {
         return;
         return;
     }
     }
 
 
@@ -255,7 +253,9 @@ function getPageGoods(info) {
         url: info.url,
         url: info.url,
         data: info.data,
         data: info.data,
         success: function(data) {
         success: function(data) {
-            nav.end = true;
+            if (data === '' || (data.list && data.list.length <= 0)) {
+                nav.end = true;
+            }
             info.callBack(data);
             info.callBack(data);
         },
         },
         error: function() {
         error: function() {
@@ -364,11 +364,9 @@ function tabChange(dom, index) {
         $(main).hide();
         $(main).hide();
         $('#' + activeTab).fadeIn();
         $('#' + activeTab).fadeIn();
         if (activeTab === 'new-arrival') {
         if (activeTab === 'new-arrival') {
-            toTop = true;
             newData(isPos ? scrollToNav1 : function() {});
             newData(isPos ? scrollToNav1 : function() {});
             viewType = 2;
             viewType = 2;
         } else if (activeTab === 'popularity') {
         } else if (activeTab === 'popularity') {
-            toTop = true;
             hotData(isPos ? scrollToNav1 : function() {});
             hotData(isPos ? scrollToNav1 : function() {});
             viewType = 3;
             viewType = 3;
         } else if (activeTab === 'home-page') {
         } else if (activeTab === 'home-page') {

@@ -199,7 +199,6 @@ function getPageGoods(info) {
 
 
     // 不需要重新加载并且数据请求结束
     // 不需要重新加载并且数据请求结束
     if (nav.end) {
     if (nav.end) {
-
         return;
         return;
     }
     }