diff --git a/src/views/ballotpage/BallotPage.vue b/src/views/ballotpage/BallotPage.vue index 79a6042..fc6c5d6 100644 --- a/src/views/ballotpage/BallotPage.vue +++ b/src/views/ballotpage/BallotPage.vue @@ -218,21 +218,23 @@ let hour = ref(0); let minute = ref(0); let seconds = ref(0); let timer = setInterval(() => { - let endTime = parseInt(new Date(data.value.voteEndTime).getTime() / 1000); - let nowTime = parseInt(new Date().getTime() / 1000); - if (endTime > nowTime) { - hour.value = parseInt( - dayjs(data.value.voteEndTime).diff(dayjs(), "minute") / 60 - ); - minute.value = parseInt( - dayjs(data.value.voteEndTime).diff(dayjs(), "minute") % 60 - ); - seconds.value = parseInt( - dayjs(data.value.voteEndTime).diff(dayjs(), "seconds") - - (hour.value * 60 + minute.value) * 60 - ); - } else { - clearInterval(timer); + if (data && data.value && data.value.voteEndTime) { + let endTime = parseInt(new Date(data.value.voteEndTime).getTime() / 1000); + let nowTime = parseInt(new Date().getTime() / 1000); + if (endTime > nowTime) { + hour.value = parseInt( + dayjs(data.value.voteEndTime).diff(dayjs(), "minute") / 60 + ); + minute.value = parseInt( + dayjs(data.value.voteEndTime).diff(dayjs(), "minute") % 60 + ); + seconds.value = parseInt( + dayjs(data.value.voteEndTime).diff(dayjs(), "seconds") - + (hour.value * 60 + minute.value) * 60 + ); + } else { + clearInterval(timer); + } } }, 1000); diff --git a/src/views/homeworkpage/HomeworkPage.vue b/src/views/homeworkpage/HomeworkPage.vue index f0f2b7a..30c4e38 100644 --- a/src/views/homeworkpage/HomeworkPage.vue +++ b/src/views/homeworkpage/HomeworkPage.vue @@ -175,8 +175,8 @@ const state = reactive({ const { hour, minute, seconds } = toRefs(state); let timer = setInterval(() => { - console.log("endTime", data.value.submitEndTime); - if (data && data.value.submitEndTime) { + // console.log("endTime", data.value.submitEndTime); + if (data && data.value && data.value.submitEndTime) { let endTime = parseInt(new Date(data.value.submitEndTime).getTime() / 1000); let nowTime = parseInt(new Date().getTime() / 1000); console.log("endTime222", endTime, nowTime);