diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index d2cbe9bb0..93658023c 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -26,6 +26,7 @@ export enum ACTIVITY_TYPE { MONTHLY_TICKET_1 = 19, // 月卡1(普通) MONTHLY_TICKET_2 = 20, // 月卡2(至尊) RECHARGE_MONEY = 21, // 累计充值RMB活动 + DAILY_RMB_GIFTS = 22, // 每日特惠RMB购买,一次性购买7天礼包 } /** diff --git a/shared/domain/activityField/dailyRMBGiftsField.ts b/shared/domain/activityField/dailyRMBGiftsField.ts index f640a0596..e4fce95b2 100644 --- a/shared/domain/activityField/dailyRMBGiftsField.ts +++ b/shared/domain/activityField/dailyRMBGiftsField.ts @@ -9,8 +9,8 @@ export class DailyRMBGiftsItem { id: number; // 第几个,从1开始 productID: string; // 商品id支付时使用 name: string; // 名字 - price: number; //消费点数 - reward: string; //任务奖励,格式:1&3&1(类型&id&数量) 类型定义:1.英雄,2.物品 + price: number; //价格 + reward: string; //奖励,格式:1&3&1(类型&id&数量) 类型定义:1.英雄,2.物品 isBuy: boolean = false; //是否已经购买 isReceive: boolean = false; //是否领取过奖励 diff --git a/shared/domain/activityField/growthField.ts b/shared/domain/activityField/growthField.ts index 3abe9fc9e..8760c4e69 100644 --- a/shared/domain/activityField/growthField.ts +++ b/shared/domain/activityField/growthField.ts @@ -143,12 +143,17 @@ export class GrowthData extends ActivityBase { if (index != -1) { obj.totalCount = data[index].totalCount; obj.receiveRewardCount = data[index].receiveRewardCount; - obj.addPointCount = data[index].addPointCount; - obj.getPointReward = data[index].getPointReward; - this.totalPoint += data[index].addPointCount; + obj.addPointCount = data[index].addPointCount ? data[index].addPointCount : 0; + obj.getPointReward = data[index].getPointReward ? data[index].getPointReward : false; + this.totalPoint += obj.addPointCount; if (data[index].getPointReward) { - this.totalConsumePoint += data[index].addPointCount; + this.totalConsumePoint += obj.addPointCount; } + } else { + obj.totalCount = 0; + obj.receiveRewardCount = 0; + obj.addPointCount = 0; + obj.getPointReward = false; } } }