diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index 2a28669b0..c6ff1f2fc 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(至尊) RECHARGEMONEY = 21, // 累计充值RMB活动 + DAILY_DISCOUNT_GIFT = 22, // 七天乐活动,每日特惠礼包 } /** diff --git a/shared/domain/activityField/dailyGiftsField.ts b/shared/domain/activityField/dailyGiftsField.ts index 2d7e2f49e..aa53ba274 100644 --- a/shared/domain/activityField/dailyGiftsField.ts +++ b/shared/domain/activityField/dailyGiftsField.ts @@ -15,7 +15,8 @@ export class DailyGiftItem { name: string; // 名称 consume: string; // 购买的资源数据; 格式:type:id:count, type:ACTIVITY_RESOURCES_TYPE;RMB时id无效 reward: string; // 任务奖励,格式:1&3&1(类型&id&数量) 类型定义:1.英雄,2.物品 - maxCount: number = 0; //最大可购买次数 + maxCount: number = 1; //最大可购买次数 + discount: number = 0;// 商品显示的折扣 buyCount: number = 0; //购买次数 @@ -25,7 +26,7 @@ export class DailyGiftItem { this.name = data.name; this.consume = data.consume; this.reward = data.reward; - this.maxCount = data.maxCount; + this.discount = data.discount; } //消耗的资源 @@ -81,7 +82,10 @@ export class DailyGiftsData extends ActivityBase { } public initData(data: string) { - let arr = JSON.parse(data); + let dataObj = JSON.parse(data); + + let arr = dataObj; + for (let obj of arr) { this.list.push(new DailyGiftItem(obj)) } diff --git a/shared/domain/activityField/rechargeMoneyField.ts b/shared/domain/activityField/rechargeMoneyField.ts index 08dc98c97..8fbb08dea 100644 --- a/shared/domain/activityField/rechargeMoneyField.ts +++ b/shared/domain/activityField/rechargeMoneyField.ts @@ -42,7 +42,6 @@ export class RechargeMoneyData extends ActivityBase { if (items.length == 0) { return null; } - console.log('ddddddddddd', JSON.stringify(items), items.length) let index = random(items.length - 1); return items[index]; } diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index c15a2a0cd..83d1916f1 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -79,7 +79,6 @@ export class SignInData extends ActivityBase { this.price = dataObj.price; this.productID = dataObj.productID; this.roundIndex = moment().diff(moment(this.beginTime).startOf('months'), 'months') + 1; - console.log('dddddddddddd', this.roundIndex); this.todayIndex = moment(Date.now()).date(); let arr = dataObj.data