Authored by 周少峰

Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop

... ... @@ -135,6 +135,14 @@ $.jqtab = function(nav, posNav, main) {
newData();
}else if(activeTab == 'popularity'){
hotData();
} else if (activeTab == 'home-page') {
myScroll.scrollTo(0,0);
setTimeout(function () {
myScroll.refresh();
scH = $('#scroller').outerHeight();
console.log(scH)
}, 1000);
}
return false;
... ... @@ -167,7 +175,11 @@ function getPageGoods(info) {
myScroll.refresh();
scH = $('#scroller').outerHeight();
}, 1000);
$nav1.addClass('hide');
myScroll.scrollTo(0,0);
lazyLoad($('img.lazy'));
searching = false;
},
error: function() {
... ... @@ -213,7 +225,7 @@ function hotData() {
}
myScroll.on('scroll', function() {
var sTop = -this.y;
sTop = -this.y;
if (sTop + winH * 2 > scH) {
switch(viewType) {
... ... @@ -462,6 +474,12 @@ function search(opt) {
myScroll.refresh();
scH = $('#scroller').outerHeight();
}, 1000);
myScroll.refresh();
console.log(sTop)
if (sTop > imgH + nav1H + main1oH) {
myScroll.scrollTo(0,-(imgH + nav1H + main1oH));
}
},
error: function() {
tip.show('网络断开连接了~');
... ...
... ... @@ -429,12 +429,14 @@
padding-top: 30px;
overflow: hidden;
padding-left: 15px;
background: #fff;
}
.popularity {
padding-top: 30px;
overflow: hidden;
padding-left: 15px;
background: #fff;
}
.pos-list {
... ...