diff --git a/src/components/Button/index.vue b/src/components/Button/index.vue index 3ff4c51..e34903d 100644 --- a/src/components/Button/index.vue +++ b/src/components/Button/index.vue @@ -74,6 +74,11 @@ const handleClick = () => { .button-icon + .button-text { margin-left: 4px; } + + .button-text { + // 不换行 + white-space: nowrap; + } } // 设置背景色 diff --git a/src/i18n/en.json b/src/i18n/en.json index cb24feb..163f298 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -20,5 +20,16 @@ "Keynote": "Keynote", "CompatibleApps": "Compatible Apps" } + }, + "settings": { + "title": "Settings", + "subtitle": "System settings items", + "menuList": { + "DeveloperProfile": "Developer Profile", + "Language": "Language", + "Environments": "Environments", + "About": "About", + "Reward": "Reward" + } } } diff --git a/src/i18n/zh.json b/src/i18n/zh.json index 45f6287..a7b76f3 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -20,5 +20,16 @@ "Keynote": "Keynote", "CompatibleApps": "兼容App" } + }, + "settings": { + "title": "设置", + "subtitle": "系统设置项", + "menuList": { + "DeveloperProfile": "开发者", + "Language": "语言", + "Environments": "环境", + "About": "关于", + "Reward": "赞助" + } } } diff --git a/src/router/index.ts b/src/router/index.ts index 124348b..aaf390b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -40,9 +40,9 @@ const router = createRouter({ component: () => import('@/views/settings/profile.vue') }, { - path: 'environment', - name: 'environment', - component: () => import('@/views/settings/environment.vue') + path: 'environments', + name: 'environments', + component: () => import('@/views/settings/environments.vue') } ] }, diff --git a/src/utils/getTime.ts b/src/utils/getTime.ts index df0bde5..62077a3 100644 --- a/src/utils/getTime.ts +++ b/src/utils/getTime.ts @@ -24,10 +24,10 @@ export function getLocalTime(zone: number) { */ export function formatDate(date: Date) { const year = date.getFullYear() - const month = date.getMonth() + 1 - const day = date.getDate() - const hour = date.getHours() - const minute = date.getMinutes() - const second = date.getSeconds() + const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + const hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + const minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + const second = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() return `${year}-${month}-${day} ${hour}:${minute}:${second}` } diff --git a/src/views/music/index.vue b/src/views/music/index.vue index 1aed0a6..f325c7b 100644 --- a/src/views/music/index.vue +++ b/src/views/music/index.vue @@ -144,9 +144,9 @@ defineOptions({ // 定义标签项 const tabs: Tab[] = [ { - icon: 'play_circle_line', - name: 'Play', - path: '/music', + icon: 'home_3_fill', + name: 'Home', + path: '/home', active: false }, { diff --git a/src/views/photos/index.vue b/src/views/photos/index.vue index c43a141..46c52ae 100644 --- a/src/views/photos/index.vue +++ b/src/views/photos/index.vue @@ -7,6 +7,17 @@
{{ album.name }}
+ + @@ -17,6 +28,8 @@ import { type Tab } from '@/types/tabBar' import Window from '@/components/Window/index.vue' import TabBar from '@/components/TabBar/index.vue' +import Ornaments from '@/components/Ornaments/index.vue' +import Button from '@/components/Button/index.vue' defineOptions({ name: 'PhotosView' @@ -174,4 +187,12 @@ const albums = [ } } } + +.button-group { + height: 100%; + display: flex; + justify-content: space-between; + align-items: center; + gap: 4px; +} diff --git a/src/views/safari/index.vue b/src/views/safari/index.vue index bc56f0a..f338cb9 100644 --- a/src/views/safari/index.vue +++ b/src/views/safari/index.vue @@ -51,7 +51,7 @@ defineOptions({ // 这里暂时将 inputValue 设置为字符串,因为 ref 值的变动会导致 iframe 重新加载过于频繁 // let inputValue = ref('https://barry-flynn.github.io/') -const inputValue = 'https://barry-flynn.github.io/' +let inputValue = 'https://barry-flynn.github.io/'