diff --git a/shared/domain/activityField/monthlyFundField.ts b/shared/domain/activityField/monthlyFundField.ts index 3c1e649f2..d4843f671 100644 --- a/shared/domain/activityField/monthlyFundField.ts +++ b/shared/domain/activityField/monthlyFundField.ts @@ -86,7 +86,7 @@ class MonthlyFundPage { return !this.rewards.find(cur => !cur.hasReceived); } - public getShowResult() { + public canShow() { if(this.buyEndTime < Date.now() && !this.hasBought) return null; if(this.hasReceivedAll()) return null return this; @@ -129,9 +129,15 @@ export class MonthlyFundData extends ActivityBase { } public getShowResult() { + let canShow = false; + for(let list of this.list) { + if(list.canShow()) canShow = true; + } + if(!canShow) return null; + return { ...this.getBaseKeys(), - list: this.list.map(data => data.getShowResult()).filter(cur => cur) + list: this.list } } } \ No newline at end of file