diff --git a/src/Root.vue b/src/Root.vue index 476bcfc..1683fb6 100644 --- a/src/Root.vue +++ b/src/Root.vue @@ -35,4 +35,13 @@ body, body { margin: 0; } + +.t-overlay { + transition-duration: 500ms !important; +} + +.t-popup { + animation-duration: 460ms; + animation-timing-function: var(--tui-bezier); +} diff --git a/src/api/file.ts b/src/api/file.ts index 9bac2aa..1e980a2 100644 --- a/src/api/file.ts +++ b/src/api/file.ts @@ -19,6 +19,20 @@ export async function listServerFiles(pathSegments: string[]): Promise !!segment); + const requestPath = segments.length ? `/${segments.map((segment) => encodeURIComponent(segment)).join("/")}` : ""; + const url = new URL(`${resolveBaseURL()}/system/file/${action}${requestPath}`); + const token = useSettingStore().connect.token.trim(); + + if (token) { + url.searchParams.set("token", token); + } + + return url.toString(); +} + export function resolveRequestErrorMessage(error: unknown): string { if (error instanceof AxiosError) { const message = resolveApiMessage(error.response?.data); diff --git a/src/layout/MainLayout.vue b/src/layout/MainLayout.vue index 99e500e..6f94a92 100644 --- a/src/layout/MainLayout.vue +++ b/src/layout/MainLayout.vue @@ -27,12 +27,18 @@ :disabled="!tabBarStore.isShowing" @change="onChangeTab" > + + + + @@ -40,11 +46,14 @@ import { useNavBarStore } from "@/store/navBarStore"; import { useTabBarStore } from "@/store/tabBarStore"; import PageTransition from "@/components/PageTransition.vue"; +import MusicPlayerPopup from "@/pages/system/MusicPlayerPopup.vue"; +import { useMusicPlayerStore } from "@/store/musicPlayerStore"; const route = useRoute(); const router = useRouter(); const navBarStore = useNavBarStore(); const tabBarStore = useTabBarStore(); +const musicPlayerStore = useMusicPlayerStore(); // ---------- 导航栏高度 ---------- @@ -118,6 +127,12 @@ watch( ); function onChangeTab(value: string): void { + if (value === "__music__") { + musicPlayerStore.setPopupVisible(true); + tabVal.value = resolveTabValue(route.path); + return; + } + router.push(value); } diff --git a/src/pages/file/FileExplorerList.vue b/src/pages/file/FileExplorerList.vue index e6a41cf..c2ed0d4 100644 --- a/src/pages/file/FileExplorerList.vue +++ b/src/pages/file/FileExplorerList.vue @@ -9,7 +9,7 @@