Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
1 changed file
with
9 additions
and
3 deletions
1 | var $ = require('jquery'), | 1 | var $ = require('jquery'), |
2 | Hammer = require('yoho.hammer'), | 2 | Hammer = require('yoho.hammer'), |
3 | Swiper = require('yoho.iswiper'), | 3 | Swiper = require('yoho.iswiper'), |
4 | - lazyLoad = require('yoho.lazyload'); | 4 | + lazyLoad = require('yoho.lazyload') |
5 | + | ||
6 | +loading = require('../../plugin/loading');; | ||
5 | 7 | ||
6 | var page = 1, | 8 | var page = 1, |
7 | winH, | 9 | winH, |
@@ -13,6 +15,7 @@ var page = 1, | @@ -13,6 +15,7 @@ var page = 1, | ||
13 | id = ''; | 15 | id = ''; |
14 | 16 | ||
15 | function hotrank(page, sort, tabId, notab) { | 17 | function hotrank(page, sort, tabId, notab) { |
18 | + loading.showLoadingMask(); | ||
16 | $.ajax({ | 19 | $.ajax({ |
17 | type: 'GET', | 20 | type: 'GET', |
18 | url: '/product/newsale/selectHotrank?' + sort, | 21 | url: '/product/newsale/selectHotrank?' + sort, |
@@ -28,17 +31,20 @@ function hotrank(page, sort, tabId, notab) { | @@ -28,17 +31,20 @@ function hotrank(page, sort, tabId, notab) { | ||
28 | } | 31 | } |
29 | $('#hotRank').append(data); | 32 | $('#hotRank').append(data); |
30 | lazyLoad($('img.lazy')); | 33 | lazyLoad($('img.lazy')); |
31 | - $('#yoho-footer').css('position', 'static'); | ||
32 | $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top'); | 34 | $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top'); |
33 | winH = $(window).height(); | 35 | winH = $(window).height(); |
34 | if ($('.rank-main').length !== 0) { | 36 | if ($('.rank-main').length !== 0) { |
37 | + $('#yoho-footer').css('position', 'static'); | ||
35 | listTop = $('.rank-main').find('ul').offset().top; | 38 | listTop = $('.rank-main').find('ul').offset().top; |
39 | + } else { | ||
40 | + $('#yoho-footer').css('position', 'fixed'); | ||
36 | } | 41 | } |
37 | navSwiper = new Swiper('.s-goods-nav', { | 42 | navSwiper = new Swiper('.s-goods-nav', { |
38 | grabCursor: true, | 43 | grabCursor: true, |
39 | slidesPerView: 'auto', | 44 | slidesPerView: 'auto', |
40 | slideElement: 'li' | 45 | slideElement: 'li' |
41 | }); | 46 | }); |
47 | + loading.hideLoadingMask(); | ||
42 | } | 48 | } |
43 | }); | 49 | }); |
44 | } | 50 | } |
@@ -70,4 +76,4 @@ hotnav.on('tap', function (e) { | @@ -70,4 +76,4 @@ hotnav.on('tap', function (e) { | ||
70 | notab = 1; | 76 | notab = 1; |
71 | hotrank(page, sort, id, notab); | 77 | hotrank(page, sort, id, notab); |
72 | } | 78 | } |
73 | -}) | 79 | +}); |
-
Please register or login to post a comment