diff --git a/static/js/category/brand.js b/static/js/category/brand.js index 7b0526b..08e187a 100644 --- a/static/js/category/brand.js +++ b/static/js/category/brand.js @@ -18,8 +18,6 @@ var searchH = $('.newbrand-search').outerHeight(), var myHammer, searchBtnHammer, clearTextHammer; -var $rightBarCon = $('#right-bar .con').find('b').unbind(); - swiper = new Swiper('.swiper-container', { lazyLoading: true, loop: true, @@ -54,17 +52,14 @@ if ($brandList.length > 0) { }); } -if ($rightBarCon[0]) { - myHammer = new Hammer($rightBarCon[0]); - myHammer.on('tap', function(e) { - var index = $rightBarCon.index(); +$('#right-bar .con').find('b').unbind().on('touchstart', function() { + var index = $(this).index(); - if ($('.bar-' + index).size() > 0) { - document.body.scrollTop = parseInt($('.bar-' + index)[0].offsetTop) - parseInt(brandSwipe - 1); - } - e.srcEvent.stopPropagation(); - }); -} + if ($('.bar-' + index).size() > 0) { + document.body.scrollTop = parseInt($('.bar-' + index)[0].offsetTop) - parseInt(brandSwipe - 1); + } + e.stopPropagation(); +}); function searchResult(type) { var keyword = $('#keyword').val(), diff --git a/static/js/home/maybe-like.js b/static/js/home/maybe-like.js index 84486e6..674e356 100644 --- a/static/js/home/maybe-like.js +++ b/static/js/home/maybe-like.js @@ -80,7 +80,7 @@ function search() { }, success: function(data) { if (data === ' ') { - loading = true; + loading = false; if (gender) { if (gender === '1,3') { url = '/boys/bottomBanner'; diff --git a/static/js/product/newsale/discount.js b/static/js/product/newsale/discount.js index 1f88c53..f1abf4d 100644 --- a/static/js/product/newsale/discount.js +++ b/static/js/product/newsale/discount.js @@ -194,6 +194,7 @@ function search(opt) { } if (data === ' ') { + searching = false; nav.end = true; if (nav.reload) { diff --git a/static/js/product/newsale/newarrival.js b/static/js/product/newsale/newarrival.js index 15fe76b..b5c1959 100644 --- a/static/js/product/newsale/newarrival.js +++ b/static/js/product/newsale/newarrival.js @@ -223,8 +223,8 @@ function search(opt) { } if (data === ' ') { + searching = false; nav.end = true; - if (nav.reload) { $container.html(noResult); }