diff --git a/src/components/IndexHeader.vue b/src/components/IndexHeader.vue index 5311b17..a54a8a5 100644 --- a/src/components/IndexHeader.vue +++ b/src/components/IndexHeader.vue @@ -19,8 +19,8 @@ const routes = [ ] }, { name: '关于我们', children: [ - { name: '公司介绍', route: '' }, - { name: '画廊', route: '' }, + { name: '公司介绍', route: '/about' }, + { name: '画廊', route: '/about/gallery' }, { name: '师资团队', route: '' }, { name: '联系我们', route: '' } ] diff --git a/src/router/index.js b/src/router/index.js index 2fc6063..293a86d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,6 +33,20 @@ const router = createRouter({ component: () => import('@/views/course/VipOrder.vue') } ] + }, { + path: '/about', + name: 'about', + children: [ + { + path: '', + name: 'about-us', + component: () => import('@/views/about/AboutUs.vue') + }, { + path: 'gallery', + name: 'about-gallery', + component: () => import('@/views/about/Gallery.vue') + } + ] }, { path: '/login', name: 'login', diff --git a/src/utils/data.js b/src/utils/data.js index 6069006..68caf5b 100644 --- a/src/utils/data.js +++ b/src/utils/data.js @@ -17,4 +17,22 @@ export function formatTime(seconds) { // 返回格式化的时间字符串 return `${formattedHours}小时 ${formattedMinutes}分 ${formattedSeconds}秒`; +} + +export function useCurrentTime(dateStr) { + const startDate = new Date(dateStr); + const endDate = new Date() + const delta = endDate.getTime() - startDate.getTime() + + const unitDay = 24 * 60 * 60 * 1000 + const unitHour = 60 * 60 * 1000 + const unitMinute = 60 * 1000 + const unitSecond = 1000 + + const days = Math.floor(delta / unitDay) + const hours = Math.floor((delta % unitDay) / unitHour) + const minutes = Math.floor((delta % unitHour) / unitMinute) + const seconds = Math.floor((delta % unitMinute) / unitSecond) + + return { days, hours, minutes, seconds } } \ No newline at end of file diff --git a/src/views/Welcome.vue b/src/views/Welcome.vue index 095f3f7..39eac3d 100644 --- a/src/views/Welcome.vue +++ b/src/views/Welcome.vue @@ -1,5 +1,26 @@