Merge branch 'release/wap-optim' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-optim
Showing
2 changed files
with
2 additions
and
6 deletions
@@ -165,10 +165,6 @@ $('.coupon-message-op-rel').on('click', function() { | @@ -165,10 +165,6 @@ $('.coupon-message-op-rel').on('click', function() { | ||
165 | location.reload(); | 165 | location.reload(); |
166 | }); | 166 | }); |
167 | 167 | ||
168 | -$('.nav-home').on('touchstart', function() { | ||
169 | - $('.homebuttom').toggleClass('hide'); | ||
170 | -}); | ||
171 | - | ||
172 | if ($('#noData').length > 0) { | 168 | if ($('#noData').length > 0) { |
173 | if (location.href.indexOf('?openby:yohobuy=') <= 0) { | 169 | if (location.href.indexOf('?openby:yohobuy=') <= 0) { |
174 | tip.show('网络异常!'); | 170 | tip.show('网络异常!'); |
@@ -213,7 +213,7 @@ function getPageGoods(info) { | @@ -213,7 +213,7 @@ function getPageGoods(info) { | ||
213 | url: info.url, | 213 | url: info.url, |
214 | data: info.data, | 214 | data: info.data, |
215 | success: function(data) { | 215 | success: function(data) { |
216 | - if (data === '') { | 216 | + if (data === '' || (data.list && data.list.length <= 0)) { |
217 | nav.end = true; | 217 | nav.end = true; |
218 | } | 218 | } |
219 | 219 | ||
@@ -707,7 +707,7 @@ function search(opt) { | @@ -707,7 +707,7 @@ function search(opt) { | ||
707 | break; | 707 | break; |
708 | } | 708 | } |
709 | 709 | ||
710 | - if (data === '') { | 710 | + if (data === '' || (data.list && data.list.length <= 0)) { |
711 | nav.end = true; | 711 | nav.end = true; |
712 | 712 | ||
713 | if (nav.reload) { | 713 | if (nav.reload) { |
-
Please register or login to post a comment