From 2f851f3172b31d989351270c142af4b71ef1dc49 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Wed, 5 Jun 2024 15:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=AD=8C=E6=9B=B2=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MusicList.vue | 35 ++++++++++++++++++++++++++---------
 src/utils/index.ts           |  7 +++++--
 src/views/list/index.vue     |  7 +++----
 src/views/user/index.vue     | 14 ++++++++------
 4 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/components/MusicList.vue b/src/components/MusicList.vue
index 74a648e..825b3f4 100644
--- a/src/components/MusicList.vue
+++ b/src/components/MusicList.vue
@@ -9,16 +9,20 @@
       <i class="iconfont icon-icon_error music-close" @click="close"></i>
       <div class="music-title text-el">{{ name }}</div>
       <!-- 歌单歌曲列表 -->
-      <div class="music-list">
+      <div :show="loading" class="music-list">
         <n-scrollbar>
-          <div
-            v-for="(item, index) in songList"
-            :key="item.id"
-            :class="setAnimationClass('animate__bounceInUp')"
-            :style="setAnimationDelay(index, 50)"
-          >
-            <song-item :item="formatDetail(item)" @play="handlePlay" />
-          </div>
+          <n-spin :show="loading">
+            <div class="music-list-content">
+              <div
+                v-for="(item, index) in songList"
+                :key="item.id"
+                :class="setAnimationClass('animate__bounceInUp')"
+                :style="setAnimationDelay(index, 50)"
+              >
+                <song-item :item="formatDetail(item)" @play="handlePlay" />
+              </div>
+            </div>
+          </n-spin>
           <play-bottom />
         </n-scrollbar>
       </div>
@@ -34,6 +38,8 @@ import { isMobile, setAnimationClass, setAnimationDelay } from '@/utils';
 
 import PlayBottom from './common/PlayBottom.vue';
 
+const loading = ref(true);
+
 const store = useStore();
 
 const props = defineProps<{
@@ -43,6 +49,14 @@ const props = defineProps<{
 }>();
 const emit = defineEmits(['update:show']);
 
+watch(
+  () => props.songList,
+  (val) => {
+    loading.value = !(val && val.length);
+  },
+  { immediate: true },
+);
+
 const formatDetail = computed(() => (detail: any) => {
   const song = {
     artists: detail.ar,
@@ -81,6 +95,9 @@ const close = () => {
 
   &-list {
     height: calc(100% - 60px);
+    &-content {
+      min-height: 400px;
+    }
   }
 }
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 229f51a..9108968 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -60,8 +60,11 @@ export const getMusicProxyUrl = (url: string) => {
 
 export const getImgUrl = computed(() => (url: string | undefined, size: string = '') => {
   const bdUrl = 'https://image.baidu.com/search/down?url=';
-  const imgUrl = encodeURIComponent(`${url}?param=${size}`);
-  return `${bdUrl}${imgUrl}`;
+  const imgUrl = `${url}?param=${size}`;
+  if (!getIsMc()) {
+    return imgUrl;
+  }
+  return `${bdUrl}${encodeURIComponent(imgUrl)}`;
 });
 
 export const isMobile = computed(() => {
diff --git a/src/views/list/index.vue b/src/views/list/index.vue
index 19a2f61..cefeaed 100644
--- a/src/views/list/index.vue
+++ b/src/views/list/index.vue
@@ -20,8 +20,8 @@ const selectRecommendItem = async (item: IRecommendItem) => {
   recommendItem.value = null;
   listDetail.value = null;
   showMusic.value = true;
-  const { data } = await getListDetail(item.id);
   recommendItem.value = item;
+  const { data } = await getListDetail(item.id);
   listDetail.value = data;
 };
 
@@ -90,10 +90,9 @@ watch(
       </div>
     </n-scrollbar>
     <music-list
-      v-if="listDetail?.playlist"
       v-model:show="showMusic"
-      :name="listDetail?.playlist.name"
-      :song-list="listDetail?.playlist.tracks"
+      :name="recommendItem?.name || ''"
+      :song-list="listDetail?.playlist.tracks || []"
     />
   </div>
 </template>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 843fcf4..d87fcee 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { onBeforeRouteUpdate, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useStore } from 'vuex';
 
 import { getListDetail } from '@/api/list';
@@ -36,8 +36,9 @@ const loadPage = async () => {
   const { data: playlistData } = await getUserPlaylist(user.value.userId);
   playList.value = playlistData.playlist;
 
-  const { data: recordData } = await getUserRecord(user.value.userId);
-  recordList.value = recordData.allData;
+  getUserRecord(user.value.userId).then(({ data: recordData }) => {
+    recordList.value = recordData.allData;
+  });
 };
 
 onActivated(() => {
@@ -52,8 +53,9 @@ const isShowList = ref(false);
 const list = ref<Playlist>();
 // 展示歌单
 const showPlaylist = async (id: number) => {
-  const { data } = await getListDetail(id);
   isShowList.value = true;
+  list.value = {};
+  const { data } = await getListDetail(id);
   list.value = data.playlist;
 };
 
@@ -77,7 +79,7 @@ const handlePlay = () => {
 </script>
 
 <template>
-  <div class="user-page" @click.stop="isShowList = false">
+  <div class="user-page">
     <div
       v-if="userDetail"
       class="left"
@@ -138,7 +140,7 @@ const handlePlay = () => {
         </n-scrollbar>
       </div>
     </div>
-    <music-list v-if="list" v-model:show="isShowList" :name="list.name" :song-list="list.tracks" />
+    <music-list v-model:show="isShowList" :name="list?.name || ''" :song-list="list?.tracks || []" />
   </div>
 </template>