Authored by ccbikai

Merge branch 'hotfix/star' of git.yoho.cn:fe/yohobuywap-node into hotfix/star

... ... @@ -186,26 +186,25 @@ getIndexHtml = function() {
$.ajax({
url: '/guang/star/getIndexHtml',
dataType: 'html',
success: function(data) {
stopLoading = false;
if (data) {
if (avatarSwiperClone) {
avatarSwiperClone.destroy(true, true);
avatarSwiperClone = '';
}
$mainContent.html(data);
initAction();
})
.done(function(data) {
if (data) {
if (avatarSwiperClone) {
avatarSwiperClone.destroy(true, true);
avatarSwiperClone = '';
}
loading.hideLoadingMask();
},
error: function() {
loading.hideLoadingMask();
tip.show('网络断开连接了~');
$mainContent.html(data);
initAction();
}
})
.fail(function() {
tip.show('网络断开连接了~');
})
.always(function() {
stopLoading = false;
loading.hideLoadingMask();
});
};
... ... @@ -229,7 +228,9 @@ starIScroll.iScroll.on('scrollStart', function() {
starIScroll.iScroll.on('scroll', function() {
if (this.directionY !== -1) {
// starIScroll.iScroll.refresh();
setTimeout(function() {
starIScroll.iScroll.refresh();
}, 0);
}
console.log(this);
... ...