Authored by xuqi

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

... ... @@ -70,7 +70,7 @@ class NewSaleProcess
$tabItem = array();
$tabItem['title'] = $one;
$tabItem['dataId'] = $key;
if ($key === 1) {
if ($key === 0) {
$tabItem['focus'] = true;
}
$result['tabs'][] = $tabItem;
... ...
var $ = require('jquery'),
Hammer = require('yoho.hammer'),
Swiper = require('yoho.iswiper'),
lazyLoad = require('yoho.lazyload');
lazyLoad = require('yoho.lazyload')
loading = require('../../plugin/loading');;
var page = 1,
winH,
... ... @@ -13,6 +15,7 @@ var page = 1,
id = '';
function hotrank(page, sort, tabId, notab) {
loading.showLoadingMask();
$.ajax({
type: 'GET',
url: '/product/newsale/selectHotrank?' + sort,
... ... @@ -28,17 +31,20 @@ function hotrank(page, sort, tabId, notab) {
}
$('#hotRank').append(data);
lazyLoad($('img.lazy'));
$('#yoho-footer').css('position', 'static');
$('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top');
winH = $(window).height();
if ($('.rank-main').length !== 0) {
$('#yoho-footer').css('position', 'static');
listTop = $('.rank-main').find('ul').offset().top;
} else {
$('#yoho-footer').css('position', 'fixed');
}
navSwiper = new Swiper('.s-goods-nav', {
grabCursor: true,
slidesPerView: 'auto',
slideElement: 'li'
});
loading.hideLoadingMask();
}
});
}
... ... @@ -70,4 +76,4 @@ hotnav.on('tap', function (e) {
notab = 1;
hotrank(page, sort, id, notab);
}
})
});
... ...