|
@@ -591,7 +591,6 @@ function handleActivityList() {
|
|
|
// 1=合成活动,2=置换活动,3=分解活动,4=兑换活动
|
|
// 1=合成活动,2=置换活动,3=分解活动,4=兑换活动
|
|
|
let activityType = reqData.activityType || 0;
|
|
let activityType = reqData.activityType || 0;
|
|
|
let page = reqData.page;
|
|
let page = reqData.page;
|
|
|
- let status = reqData.status;
|
|
|
|
|
let key = `${WuBianConstKey.ActivityListData}#${activityType}`;
|
|
let key = `${WuBianConstKey.ActivityListData}#${activityType}`;
|
|
|
let list = rspData.data.list;
|
|
let list = rspData.data.list;
|
|
|
|
|
|
|
@@ -600,24 +599,21 @@ function handleActivityList() {
|
|
|
for (let item of list) {
|
|
for (let item of list) {
|
|
|
// name
|
|
// name
|
|
|
// startTime
|
|
// startTime
|
|
|
- // endTiem
|
|
|
|
|
|
|
+ // endTime
|
|
|
// hashId
|
|
// hashId
|
|
|
// activityType
|
|
// activityType
|
|
|
// type 0=合成 1=兑换或置换
|
|
// type 0=合成 1=兑换或置换
|
|
|
|
|
+ // status -1=未开始 1=进行中 2=已结束
|
|
|
const hashId = item.hashId;
|
|
const hashId = item.hashId;
|
|
|
dataDict[hashId] = item;
|
|
dataDict[hashId] = item;
|
|
|
// item.startTime = Math.floor(Date.now() / 1000 - 3600);
|
|
// item.startTime = Math.floor(Date.now() / 1000 - 3600);
|
|
|
- // item.endTiem = Math.floor(Date.now() / 1000 + 3600);
|
|
|
|
|
- magicJS.logger.info(item.name, String(nowTime < item.endTiem + 24 * 3600));
|
|
|
|
|
- magicJS.logger.info(item.name, String(nowTime));
|
|
|
|
|
- magicJS.logger.info(item.name, String(item.endTiem + 24 * 3600));
|
|
|
|
|
- if (nowTime < item.endTiem + 24 * 3600) {
|
|
|
|
|
|
|
+ // item.endTime = Math.floor(Date.now() / 1000 + 3600);
|
|
|
|
|
+ if (nowTime < item.endTime + 24 * 3600) {
|
|
|
if (item.status == -1) {
|
|
if (item.status == -1) {
|
|
|
item.name = `${item.name}(未开始)`;
|
|
item.name = `${item.name}(未开始)`;
|
|
|
- item.status = 1;
|
|
|
|
|
} else if (item.status == 2) {
|
|
} else if (item.status == 2) {
|
|
|
item.name = `${item.name}(已结束)`;
|
|
item.name = `${item.name}(已结束)`;
|
|
|
- item.endTiem = item.endTiem + 24 * 3600;
|
|
|
|
|
|
|
+ item.endTime = item.endTime + 24 * 3600;
|
|
|
item.status = 1;
|
|
item.status = 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|