diff --git a/src/hooks/MusicHistoryHook.ts b/src/hooks/MusicHistoryHook.ts index 52376e3..3572284 100644 --- a/src/hooks/MusicHistoryHook.ts +++ b/src/hooks/MusicHistoryHook.ts @@ -1,12 +1,12 @@ // musicHistoryHooks import { useLocalStorage } from '@vueuse/core'; -import type { Song } from '@/type/music'; +import type { SongResult } from '@/type/music'; export const useMusicHistory = () => { - const musicHistory = useLocalStorage('musicHistory', []); + const musicHistory = useLocalStorage('musicHistory', []); - const addMusic = (music: Song) => { + const addMusic = (music: SongResult) => { const index = musicHistory.value.findIndex((item) => item.id === music.id); if (index !== -1) { musicHistory.value[index].count = (musicHistory.value[index].count || 0) + 1; @@ -16,7 +16,7 @@ export const useMusicHistory = () => { } }; - const delMusic = (music: Song) => { + const delMusic = (music: SongResult) => { const index = musicHistory.value.findIndex((item) => item.id === music.id); if (index !== -1) { musicHistory.value.splice(index, 1); diff --git a/src/store/index.ts b/src/store/index.ts index 99ba99d..aac3854 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -3,17 +3,17 @@ import { createStore } from 'vuex'; import { getMusicUrl, getParsingMusicUrl } from '@/api/music'; import { useMusicHistory } from '@/hooks/MusicHistoryHook'; import homeRouter from '@/router/home'; -import type { Song } from '@/type/music'; +import type { SongResult } from '@/type/music'; import { getMusicProxyUrl } from '@/utils'; interface State { menus: any[]; play: boolean; isPlay: boolean; - playMusic: Song; + playMusic: SongResult; playMusicUrl: string; user: any; - playList: Song[]; + playList: SongResult[]; playListIndex: number; setData: any; lyric: any; @@ -26,7 +26,7 @@ const state: State = { menus: homeRouter, play: false, isPlay: false, - playMusic: {} as Song, + playMusic: {} as SongResult, playMusicUrl: '', user: localStorage.getItem('user') ? JSON.parse(localStorage.getItem('user') as string) : null, playList: [], @@ -46,7 +46,7 @@ const mutations = { setMenus(state: State, menus: any[]) { state.menus = menus; }, - async setPlay(state: State, playMusic: Song) { + async setPlay(state: State, playMusic: SongResult) { state.playMusic = { ...playMusic, playLoading: true }; state.playMusicUrl = await getSongUrl(playMusic.id); state.play = true; @@ -59,7 +59,7 @@ const mutations = { setPlayMusic(state: State, play: boolean) { state.play = play; }, - setPlayList(state: State, playList: Song[]) { + setPlayList(state: State, playList: SongResult[]) { state.playListIndex = playList.findIndex((item) => item.id === state.playMusic.id); state.playList = playList; },