Authored by hf

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

@@ -112,7 +112,9 @@ $page.on('touchstart', '.del-icon', function() { @@ -112,7 +112,9 @@ $page.on('touchstart', '.del-icon', function() {
112 autoHide: true, 112 autoHide: true,
113 fast: true 113 fast: true
114 }); 114 });
115 - setTimeout(function(){window.history.go(0);},1000); 115 + setTimeout(function() {
  116 + window.history.go(0);
  117 + }, 1000);
116 } 118 }
117 }, 119 },
118 complete: function() { 120 complete: function() {
@@ -26,10 +26,11 @@ function hotrank(page, sort, tabId, notab) { @@ -26,10 +26,11 @@ function hotrank(page, sort, tabId, notab) {
26 notab: notab 26 notab: notab
27 }, 27 },
28 success: function(data) { 28 success: function(data) {
  29 + console.log(data);
29 if (page === 1) { 30 if (page === 1) {
30 $('.rank-main').remove(); 31 $('.rank-main').remove();
31 } 32 }
32 - if (data === ' ') { 33 + if (data === ' ' && $('.rank-main ul li').length < 1) {
33 $('#hotRank').html(noResult); 34 $('#hotRank').html(noResult);
34 } else { 35 } else {
35 $('#hotRank').append(data); 36 $('#hotRank').append(data);