Authored by 郭成尧

Merge branch 'feature/growthdetail' into release/6.5.3

... ... @@ -121,7 +121,7 @@ class Grade {
if (vipNav[findex]) {
vipNav[findex].active = true;
} else {
} else if (vipNav[0]) {
vipNav[0].active = true;
}
... ... @@ -131,7 +131,7 @@ class Grade {
vipNav: droitUtil.droitHtml(vipNav),
width750: true,
title: '会员权益说明',
bgcolor: '#444444',
bgcolor: '#444',
localCss: true
});
}).catch(next);
... ...
... ... @@ -68,12 +68,8 @@ class GradeDetailPage extends Page {
this.view.levelStr.text(result.levelStr);
this.eGradeGraph.setOption(graphOptions(result.graphData));
this.view.loadingMask.addClass('hide');
} else if (result.code === 202) {
this.view.loadingLogoText.addClass('hide');
} else {
setTimeout(() => {
this.graphRender();
}, 2000);
this.view.loadingLogoText.addClass('hide');
}
});
}
... ...
... ... @@ -323,6 +323,10 @@ class FamilyIndex extends Page {
let isLogin = $this.data('login');
let isNoOpen = $this.data('noopen');
if (appType === 'yohobuy') {
return;
}
if (!this.vipInfo || !this.vipInfo[appType]) {
this.viewVipInfo();
return false;
... ...