From 19140cd680c35f6e55b3bec6f7e393ff9a7a5e51 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Wed, 20 Dec 2023 16:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/MusicHook.ts            | 12 ------------
 src/layout/components/PlayBar.vue |  6 ------
 src/store/index.ts                | 12 +++++++-----
 src/utils/index.ts                | 11 +++++++++++
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/hooks/MusicHook.ts b/src/hooks/MusicHook.ts
index ae48417..ea0a98c 100644
--- a/src/hooks/MusicHook.ts
+++ b/src/hooks/MusicHook.ts
@@ -90,17 +90,6 @@ const setAudioTime = (index: any, audio: HTMLAudioElement) => {
   audio.play()
 }
 
-const ProxyUrl =
-  import.meta.env.VITE_API_PROXY + '' || 'http://110.42.251.190:9856'
-
-const getMusicProxyUrl = (url: string) => {
-  if (!getIsMc()) {
-    return url
-  }
-  const PUrl = url.split('').join('+')
-  return `${ProxyUrl}/mc?url=${PUrl}`
-}
-
 export {
   lrcData,
   lrcArray,
@@ -113,5 +102,4 @@ export {
   setAudioTime,
   nowTime,
   allTime,
-  getMusicProxyUrl,
 }
diff --git a/src/layout/components/PlayBar.vue b/src/layout/components/PlayBar.vue
index 37d7e20..b35ea65 100644
--- a/src/layout/components/PlayBar.vue
+++ b/src/layout/components/PlayBar.vue
@@ -237,12 +237,6 @@ const setMusicFull = () => {
   musicFull.value = !musicFull.value
 }
 
-// 解析音乐
-const parsingMusic = async () => {
-  const { data } = await getParsingMusicUrl(playMusic.value.id)
-  store.state.playMusicUrl = data.data.url
-}
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/index.ts b/src/store/index.ts
index af79ed7..caf4b51 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -2,7 +2,7 @@ import { createStore } from "vuex";
 import { SongResult } from "@/type/music";
 import { getMusicUrl, getParsingMusicUrl } from '@/api/music'
 import homeRouter from '@/router/home'
-import { getMusicProxyUrl } from '@/hooks/MusicHook'
+import { getMusicProxyUrl } from '@/utils'
 
 interface State {
   menus: any[]
@@ -58,24 +58,26 @@ const mutations = {
 
 const getSongUrl = async (id: number) => {
   const { data } = await getMusicUrl(id)
+  let url = ''
   try {
     if (data.data[0].freeTrialInfo) {
       const res = await getParsingMusicUrl(id)
-      return res.data.data.url
+      url = res.data.data.url
     }
   } catch (error) {
     console.error('error', error)
   }
-  return data.data[0].url
+  url = data.data[0].url
+  return getMusicProxyUrl(url)
 }
 
 const updatePlayMusic = async (state: State) => {
   state.playMusic = state.playList[state.playListIndex]
-  const playMusicUrl = await getSongUrl(state.playMusic.id)
-  state.playMusicUrl = getMusicProxyUrl(playMusicUrl)
+  state.playMusicUrl = await getSongUrl(state.playMusic.id)
   state.play = true
 }
 
+
 const store = createStore({
   state: state,
   mutations: mutations,
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 8946e38..5cdc2cd 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -30,6 +30,17 @@ export const secondToMinute = (s: number) => {
 export const getIsMc = () => {
   return true
 }
+const ProxyUrl =
+  import.meta.env.VITE_API_PROXY + '' || 'http://110.42.251.190:9856'
+
+export const getMusicProxyUrl = (url: string) => {
+  if (!getIsMc()) {
+    return url
+  }
+  const PUrl = url.split('').join('+')
+  return `${ProxyUrl}/mc?url=${PUrl}`
+}
+
 
 export const getImgUrl = computed(() => (url: string, size: string = '') => {
   const bdUrl = 'https://image.baidu.com/search/down?url='