|
@@ -211,12 +211,15 @@
|
|
|
const getActivityList = () => {
|
|
const getActivityList = () => {
|
|
|
proxy.$api.get('/core/activity/page',queryParams.value).then(({data:res})=>{
|
|
proxy.$api.get('/core/activity/page',queryParams.value).then(({data:res})=>{
|
|
|
if(res.code!==0) return proxy.$showToast(res.msg)
|
|
if(res.code!==0) return proxy.$showToast(res.msg)
|
|
|
- activityList.value = [...activityList.value,...res.data.list];
|
|
|
|
|
- activityList.value.forEach(a=>{
|
|
|
|
|
|
|
+ // 只对本次新增项做格式化,避免 loadMore 时旧项(已格式化成 "yyyy.MM.dd hh:mm")
|
|
|
|
|
+ // 被再次 new Date() 解析为 Invalid Date 导致显示 NaN
|
|
|
|
|
+ const newItems = res.data.list.map(a=>{
|
|
|
let cc = calculateCountdown(a?.signupEndTime);
|
|
let cc = calculateCountdown(a?.signupEndTime);
|
|
|
a.endTimeText = cc===-1?a?.signupEndTime:(`还有${cc.days}天${cc.hours}小时${cc.minutes}分钟`)
|
|
a.endTimeText = cc===-1?a?.signupEndTime:(`还有${cc.days}天${cc.hours}小时${cc.minutes}分钟`)
|
|
|
a.signupEndTime = a.signupEndTime?new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm'):''
|
|
a.signupEndTime = a.signupEndTime?new Date(a.signupEndTime).Format('yyyy.MM.dd hh:mm'):''
|
|
|
|
|
+ return a
|
|
|
})
|
|
})
|
|
|
|
|
+ activityList.value = [...activityList.value, ...newItems];
|
|
|
queryParams.value.page++;
|
|
queryParams.value.page++;
|
|
|
if(res.data.list.length===0) isOver.value = true;
|
|
if(res.data.list.length===0) isOver.value = true;
|
|
|
})
|
|
})
|