Authored by 周少峰

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

... ... @@ -79,8 +79,10 @@ var $listNav = $('#list-nav'),
$pre = $listNav.find('.active'), //纪录进入筛选前的active项,初始为选中项
searching;
var viewType = 1; // 1-首页,2-上新,3-人气
var viewType = 1;// 1-首页,2-上新,3-人气
lazyLoad($('img.lazy'));
//焦点效果
if ($('.banner-swiper').find('li').size() > 1) {
bannerSwiper = new Swiper('.banner-swiper', {
... ... @@ -140,7 +142,8 @@ function newData(callback) {
$('#new-arrival').append(data);
navInfo.new.page++;
myScroll.refresh();
lazyLoad($('#new-arrival .lazy'));
// lazyLoad($('#new-arrival .lazy'));
lazyLoad($('#new-arrival').find('.lazy'));
scH = $('#scroller').outerHeight();
searching = false;
callback && $.isFunction(callback) && callback();
... ... @@ -216,6 +219,7 @@ $.jqtab = function(nav, posNav, main) {
};
$.jqtab('#nav', '#pos-nav', '.main');
$('#wrapper').addClass('scroll-wrapper');
// lazyLoad($('img.lazy'));
myScroll = new IScroll('#wrapper', {
... ... @@ -247,6 +251,7 @@ myScroll.on('scroll', function() {
break;
}
}
if (sTop < imgH) {
if (!$nav1.hasClass('hide')) {
$nav1.addClass('hide');
... ... @@ -399,7 +404,6 @@ function search(opt) {
$.extend(defaultOpt, ext); //扩展筛选项
}
//导航类别
if ($pre.hasClass('new')) {
navType = 'newest';
... ... @@ -412,6 +416,7 @@ function search(opt) {
nav = navInfo[navType];
page = nav.page + 1;
if (nav.reload) {
page = 1;
} else if (nav.end) {
... ... @@ -660,7 +665,7 @@ $listNav.on('touchstart', 'li', function(e) {
}).on('touchend touchcancel', function() {
$listNav.find('li').removeClass('bytouch');
myScroll.refresh();
});
});
$posList.on('touchstart', 'li', function(e) {
$(this).addClass('bytouch');
... ...