Authored by 周少峰

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list

... ... @@ -73,3 +73,9 @@ $action.on('touchend', '.del', function() {
$confim.fadeIn();
return false;
});
$action.on('touchstart', 'a,span', function() {
$(this).css('background', '#eee');
}).on('touchend touchcancel', 'a,span', function() {
$(this).css('background', 'transparent');
});
... ...
... ... @@ -16,12 +16,16 @@ function ajaxCurrencyDetail(page) {
});
}
$(window).scroll(function() {
if ($(window).scrollTop() + $(window).height() > $('body').height() - 1) {
function scrollHandler() {
if ($(window).scrollTop() + $(window).height() > $('body').height() - 100) {
page++;
ajaxCurrencyDetail(page);
return;
}
}
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
ajaxCurrencyDetail(page);
\ No newline at end of file
ajaxCurrencyDetail(page);
... ...
... ... @@ -56,7 +56,7 @@
}
.edit {
padding-right: pxToRem(20px);
margin-right: pxToRem(20px);
}
}
}
... ...