diff --git a/src/components/Home/Anniversary/AnniversaryCard.vue b/src/components/Home/Anniversary/AnniversaryCard.vue index 20afae4..f42268c 100644 --- a/src/components/Home/Anniversary/AnniversaryCard.vue +++ b/src/components/Home/Anniversary/AnniversaryCard.vue @@ -29,7 +29,6 @@ import { defineProps, PropType } from 'vue' import { useRouter } from 'vue-router' import { useAnniversaryStore } from '@/store/anniversary.ts' import { IAnniversary } from '@/types/anniversary.ts' -import { isMobile } from 'vue3-common/utils/layoutUtil' import { getAnniversaryRemainDays } from '@/utils/home/anniversaryUtil' const router = useRouter() @@ -45,7 +44,7 @@ const props = defineProps({ const selectDateCardClick = async () => { anniversaryStore.anniversaryApiType = 'UPDATE' - if (isMobile() && props.dateItem?.category !== '节假日') { + if (props.dateItem?.category !== '节假日') { anniversaryStore.currentAnniversary = props.dateItem as IAnniversary const { id } = anniversaryStore.currentAnniversary await router.push({ name: 'MobileHomeAnniversaryDetailId', params: { id } }) diff --git a/src/components/Home/Anniversary/AnniversaryList.vue b/src/components/Home/Anniversary/AnniversaryList.vue deleted file mode 100644 index b2638ee..0000000 --- a/src/components/Home/Anniversary/AnniversaryList.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/src/components/Home/Anniversary/CategoryCard.vue b/src/components/Home/Anniversary/CategoryCard.vue index 624db6c..ab126e9 100644 --- a/src/components/Home/Anniversary/CategoryCard.vue +++ b/src/components/Home/Anniversary/CategoryCard.vue @@ -10,7 +10,6 @@ diff --git a/src/components/Home/Bill/BillChart.vue b/src/components/Home/Bill/BillChart.vue index a661aef..3725339 100644 --- a/src/components/Home/Bill/BillChart.vue +++ b/src/components/Home/Bill/BillChart.vue @@ -91,6 +91,9 @@ const updateChart = () => { label: { color: '#FFFFFF' } + }, + label: { + show: false } }] }) diff --git a/src/utils/home/anniversaryUtil.ts b/src/utils/home/anniversaryUtil.ts index c51dda6..50f8635 100644 --- a/src/utils/home/anniversaryUtil.ts +++ b/src/utils/home/anniversaryUtil.ts @@ -27,9 +27,9 @@ export const getAnniversaryRemainDays = (dateItem: IAnniversary): number => { return getDateDifference(dateItem.date, formatDate(new Date()), 'days') } else if (dateItem.recurring) { 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()))) { - thisYear.add(1, 'year') + thisYear = thisYear.add(1, 'year') } return Math.abs(getDateDifference(thisYear, formatDate(new Date()), 'days')) } else { diff --git a/src/views/mobile-home/profile/index.vue b/src/views/mobile-home/profile/index.vue index 9a6042f..d4ad242 100644 --- a/src/views/mobile-home/profile/index.vue +++ b/src/views/mobile-home/profile/index.vue @@ -55,24 +55,35 @@ 基本资料 + + + + + + +