feat:修复纪念日问题
This commit is contained in:
@@ -29,7 +29,6 @@ import { defineProps, PropType } from 'vue'
|
|||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { useAnniversaryStore } from '@/store/anniversary.ts'
|
import { useAnniversaryStore } from '@/store/anniversary.ts'
|
||||||
import { IAnniversary } from '@/types/anniversary.ts'
|
import { IAnniversary } from '@/types/anniversary.ts'
|
||||||
import { isMobile } from 'vue3-common/utils/layoutUtil'
|
|
||||||
import { getAnniversaryRemainDays } from '@/utils/home/anniversaryUtil'
|
import { getAnniversaryRemainDays } from '@/utils/home/anniversaryUtil'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -45,7 +44,7 @@ const props = defineProps({
|
|||||||
const selectDateCardClick = async () => {
|
const selectDateCardClick = async () => {
|
||||||
anniversaryStore.anniversaryApiType = 'UPDATE'
|
anniversaryStore.anniversaryApiType = 'UPDATE'
|
||||||
|
|
||||||
if (isMobile() && props.dateItem?.category !== '节假日') {
|
if (props.dateItem?.category !== '节假日') {
|
||||||
anniversaryStore.currentAnniversary = props.dateItem as IAnniversary
|
anniversaryStore.currentAnniversary = props.dateItem as IAnniversary
|
||||||
const { id } = anniversaryStore.currentAnniversary
|
const { id } = anniversaryStore.currentAnniversary
|
||||||
await router.push({ name: 'MobileHomeAnniversaryDetailId', params: { id } })
|
await router.push({ name: 'MobileHomeAnniversaryDetailId', params: { id } })
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="date-list">
|
|
||||||
<!-- <el-empty v-if="planStore.planList.length === 0" />-->
|
|
||||||
|
|
||||||
<el-scrollbar>
|
|
||||||
<date-card v-for="(item, index) in 4"
|
|
||||||
:key="index" :plan="item">
|
|
||||||
</date-card>
|
|
||||||
</el-scrollbar>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts" setup>
|
|
||||||
import DateCard from '@/components/Home/Anniversary/AnniversaryCard.vue'
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
@use "@/styles/home.variable.module.scss";
|
|
||||||
|
|
||||||
.date-list {
|
|
||||||
height: calc(100vh - 120px);
|
|
||||||
|
|
||||||
.el-scrollbar {
|
|
||||||
.el-scrollbar__view {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 2vh;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -10,7 +10,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { defineProps, PropType } from 'vue'
|
import { defineProps, PropType } from 'vue'
|
||||||
import { IAnniversaryCategory } from '@/types/anniversary'
|
import { IAnniversaryCategory } from '@/types/anniversary'
|
||||||
import { isMobile } from 'vue3-common/utils/layoutUtil'
|
|
||||||
import { useAnniversaryStore } from '@/store/anniversary'
|
import { useAnniversaryStore } from '@/store/anniversary'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
|
|
||||||
@@ -29,11 +28,9 @@ const router = useRouter()
|
|||||||
const anniversaryStore = useAnniversaryStore()
|
const anniversaryStore = useAnniversaryStore()
|
||||||
|
|
||||||
const selectCategoryClick = () => {
|
const selectCategoryClick = () => {
|
||||||
if (isMobile()) {
|
|
||||||
anniversaryStore.queryInfo.category = props.categoryItem?.name as string
|
anniversaryStore.queryInfo.category = props.categoryItem?.name as string
|
||||||
router.push({ name: 'MobileHomeAnniversaryList' })
|
router.push({ name: 'MobileHomeAnniversaryList' })
|
||||||
}
|
}
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
|||||||
@@ -91,6 +91,9 @@ const updateChart = () => {
|
|||||||
label: {
|
label: {
|
||||||
color: '#FFFFFF'
|
color: '#FFFFFF'
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
label: {
|
||||||
|
show: false
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ export const getAnniversaryRemainDays = (dateItem: IAnniversary): number => {
|
|||||||
return getDateDifference(dateItem.date, formatDate(new Date()), 'days')
|
return getDateDifference(dateItem.date, formatDate(new Date()), 'days')
|
||||||
} else if (dateItem.recurring) {
|
} else if (dateItem.recurring) {
|
||||||
const currentYear = new Date().getFullYear()
|
const currentYear = new Date().getFullYear()
|
||||||
const thisYear = dayjs(`${currentYear}-${dateItem.date.slice(5)}`)
|
let thisYear = dayjs(`${currentYear}-${dateItem.date.slice(5)}`)
|
||||||
if (isBeforeDate(thisYear, formatDate(new Date()))) {
|
if (isBeforeDate(thisYear, formatDate(new Date()))) {
|
||||||
thisYear.add(1, 'year')
|
thisYear = thisYear.add(1, 'year')
|
||||||
}
|
}
|
||||||
return Math.abs(getDateDifference(thisYear, formatDate(new Date()), 'days'))
|
return Math.abs(getDateDifference(thisYear, formatDate(new Date()), 'days'))
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -55,24 +55,35 @@
|
|||||||
<span>基本资料</span>
|
<span>基本资料</span>
|
||||||
<i class="fas fa-chevron-right"></i>
|
<i class="fas fa-chevron-right"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="menu-divider"></div>
|
<div class="menu-divider"></div>
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<i class="fas fa-file-alt"></i>
|
<i class="fas fa-file-alt"></i>
|
||||||
<span>个人简历</span>
|
<span>个人简历</span>
|
||||||
<i class="fas fa-chevron-right"></i>
|
<i class="fas fa-chevron-right"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="menu-divider"></div>
|
<div class="menu-divider"></div>
|
||||||
<div class="menu-item">
|
<div class="menu-item">
|
||||||
<i class="fas fa-cog"></i>
|
<i class="fas fa-cog"></i>
|
||||||
<span>账户设置</span>
|
<span>账户设置</span>
|
||||||
<i class="fas fa-chevron-right"></i>
|
<i class="fas fa-chevron-right"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="menu-divider"></div>
|
<div class="menu-divider"></div>
|
||||||
<div class="menu-item" @click="passwordClick">
|
<div class="menu-item" @click="passwordClick">
|
||||||
<i class="fas fa-key"></i>
|
<i class="fas fa-key"></i>
|
||||||
<span>更改密码</span>
|
<span>更改密码</span>
|
||||||
<i class="fas fa-chevron-right"></i>
|
<i class="fas fa-chevron-right"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="menu-divider"></div>
|
||||||
|
<div class="menu-item" @click="refreshClick">
|
||||||
|
<i class="fa-solid fa-arrows-rotate"></i>
|
||||||
|
<span>检查更新</span>
|
||||||
|
<i class="fas fa-chevron-right"></i>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="menu-divider"></div>
|
<div class="menu-divider"></div>
|
||||||
<div class="menu-item" @click="logoutClick">
|
<div class="menu-item" @click="logoutClick">
|
||||||
<i class="fas fa-sign-out-alt"></i>
|
<i class="fas fa-sign-out-alt"></i>
|
||||||
@@ -111,6 +122,11 @@ const passwordClick = () => {
|
|||||||
// router.push('/mobile-home/profile/password')
|
// router.push('/mobile-home/profile/password')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const refreshClick = async () => {
|
||||||
|
await router.push('/')
|
||||||
|
location.reload()
|
||||||
|
}
|
||||||
|
|
||||||
const logoutClick = () => {
|
const logoutClick = () => {
|
||||||
commonElMessageBox('请确认是否退出系统?').then(() => {
|
commonElMessageBox('请确认是否退出系统?').then(() => {
|
||||||
userStore.removeAll()
|
userStore.removeAll()
|
||||||
|
|||||||
Reference in New Issue
Block a user