From cd11db63ebe35a5caec54c519773b0702d474f85 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Thu, 21 Dec 2023 16:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=AE=8C=E5=96=84=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/AppLayout.vue          |  2 +-
 src/layout/components/PlayBar.vue |  3 +-
 src/store/index.ts                |  8 ++++
 src/views/search/index.vue        | 17 +++++---
 src/views/user/index.vue          | 71 +++++++++++++++++--------------
 5 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/src/layout/AppLayout.vue b/src/layout/AppLayout.vue
index cb258dd..425bf93 100644
--- a/src/layout/AppLayout.vue
+++ b/src/layout/AppLayout.vue
@@ -68,7 +68,7 @@ const menus = store.state.menus;
         height: 100vh;
         &-content {
             @apply rounded-2xl pb-28 box-border;
-            height: calc(100vh - 60px);
+            height: 100vh;
         }
         &-page {
             margin: 20px 0;
diff --git a/src/layout/components/PlayBar.vue b/src/layout/components/PlayBar.vue
index f268ec1..0396d36 100644
--- a/src/layout/components/PlayBar.vue
+++ b/src/layout/components/PlayBar.vue
@@ -82,11 +82,10 @@
 
 <script lang="ts" setup>
 import type { SongResult } from '@/type/music'
-import { secondToMinute, getImgUrl, getIsMc } from '@/utils'
+import { secondToMinute, getImgUrl } from '@/utils'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useStore } from 'vuex'
 import { setAnimationClass } from '@/utils'
-import { getParsingMusicUrl } from '@/api/music'
 import {
   loadLrc,
   nowTime,
diff --git a/src/store/index.ts b/src/store/index.ts
index d6cdac2..ebaa788 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -46,10 +46,18 @@ const mutations = {
     state.playList = playList
   },
   async nextPlay(state: State) {
+    if (state.playList.length === 0) {
+      state.play = true
+      return
+    }
     state.playListIndex = (state.playListIndex + 1) % state.playList.length
     await updatePlayMusic(state)
   },
   async prevPlay(state: State) {
+    if (state.playList.length === 0) {
+      state.play = true
+      return
+    }
     state.playListIndex =
       (state.playListIndex - 1 + state.playList.length) % state.playList.length
     await updatePlayMusic(state)
diff --git a/src/views/search/index.vue b/src/views/search/index.vue
index 817489a..eb78117 100644
--- a/src/views/search/index.vue
+++ b/src/views/search/index.vue
@@ -38,7 +38,7 @@
                     :class="setAnimationClass('animate__bounceInRight')"
                     :style="setAnimationDelay(index, 50)"
                 >
-                    <SongItem :item="item" />
+                    <SongItem :item="item" @play="handlePlay"/>
                 </div>
             </template>
             </div>
@@ -52,10 +52,9 @@ import type { IHotSearch } from "@/type/search";
 import { getHotSearch } from "@/api/home";
 import { useRoute, useRouter } from "vue-router";
 import { setAnimationClass, setAnimationDelay } from "@/utils";
-import type { ISearchDetail } from "@/type/search";
 import { onMounted, ref, watch } from "vue";
 import SongItem from "@/components/common/SongItem.vue";
-
+import { useStore } from "vuex";
 
 const route = useRoute();
 const router = useRouter();
@@ -85,10 +84,8 @@ const clickHotKeyword = (keyword: string) => {
     // isHotSearchList.value = false;
 };
 
-
-
-
 const loadSearch = async (keyword: any) => {
+    hotKeyword.value = keyword;
     searchDetail.value = undefined;
     if (!keyword) return;
     const { data } = await getSearch(keyword);
@@ -112,6 +109,14 @@ watch(
         loadSearch(newParams.keyword);
     }
 )
+
+const store = useStore()
+
+const handlePlay = (item: any) => {
+  const tracks = searchDetail.value?.result.songs || []
+  const musicIndex = (tracks.findIndex((music: any) => music.id == item.id) || 0)
+  store.commit('setPlayList', tracks.slice(musicIndex))
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 2920867..cba6093 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -9,6 +9,7 @@ import { getListDetail } from '@/api/list'
 import SongItem from "@/components/common/SongItem.vue";
 import MusicList from "@/components/MusicList.vue";
 import type { Playlist } from '@/type/listDetail';
+import PlayBottom from "@/components/common/PlayBottom.vue";
 
 
 const store = useStore()
@@ -99,40 +100,46 @@ const handlePlay = (item: any) => {
 
         <div class="play-list" :class="setAnimationClass('animate__fadeInLeft')">
           <div class="play-list-title">创建的歌单</div>
-          <div
-            class="play-list-item"
-            v-for="(item,index) in playList"
-            :key="index"
-            @click="showPlaylist(item.id)"
-          >
-            <n-image
-              :src="getImgUrl( item.coverImgUrl, '')"
-              class="play-list-item-img"
-              lazy
-              preview-disabled
-            />
-            <div class="play-list-item-info">
-              <div class="play-list-item-name">{{ item.name }}</div>
-              <div class="play-list-item-count">{{ item.trackCount }}首，播放{{ item.playCount }}次</div>
+          <n-scrollbar>
+            <div
+              class="play-list-item"
+              v-for="(item,index) in playList"
+              :key="index"
+              @click="showPlaylist(item.id)"
+            >
+              <n-image
+                :src="getImgUrl( item.coverImgUrl, '')"
+                class="play-list-item-img"
+                lazy
+                preview-disabled
+              />
+              <div class="play-list-item-info">
+                <div class="play-list-item-name">{{ item.name }}</div>
+                <div class="play-list-item-count">{{ item.trackCount }}首，播放{{ item.playCount }}次</div>
+              </div>
             </div>
-          </div>
+            <PlayBottom/>
+          </n-scrollbar>
         </div>
       </div>
     </div>
     <div class="right" :class="setAnimationClass('animate__fadeInRight')">
-      <n-layout class="record-list" :native-scrollbar="false">
-        <div class="title">听歌排行</div>
-        <div
-          class="record-item"
-          v-for="(item, index) in recordList"
-          :key="item.song.id"
-          :class="setAnimationClass('animate__bounceInUp')"
-          :style="setAnimationDelay(index, 50)"
-        >
-          <SongItem class="song-item" :item="formatDetail(item.song)" @play="handlePlay"/>
-          <div class="play-count">{{ item.playCount }}次</div>
-        </div>
-      </n-layout>
+      <div class="title">听歌排行</div>
+      <div class="record-list">
+        <n-scrollbar>
+          <div
+            class="record-item"
+            v-for="(item, index) in recordList"
+            :key="item.song.id"
+            :class="setAnimationClass('animate__bounceInUp')"
+            :style="setAnimationDelay(index, 50)"
+          >
+            <SongItem class="song-item" :item="formatDetail(item.song)" @play="handlePlay"/>
+            <div class="play-count">{{ item.playCount }}次</div>
+          </div>
+          <PlayBottom/>
+        </n-scrollbar>
+      </div>
     </div>
     <MusicList v-if="list" v-model:show="isShowList" :music-list="list" />
   </div>
@@ -152,9 +159,9 @@ const handlePlay = (item: any) => {
     max-width: 600px;
     background-color: #0d0d0d;
     background-size: 100%;
-    @apply flex-1 rounded-2xl  overflow-hidden relative bg-no-repeat;
+    @apply flex-1 rounded-2xl  overflow-hidden relative bg-no-repeat h-full;
     .page {
-      @apply p-4  w-full z-10;
+      @apply p-4  w-full z-10 flex flex-col h-full;
       background-color: #0d0d0d66;
     }
     .user-name {
@@ -199,7 +206,7 @@ const handlePlay = (item: any) => {
 }
 
 .play-list {
-  @apply mt-4 py-4 px-2 rounded-xl;
+  @apply mt-4 py-4 px-2 rounded-xl flex-1 overflow-hidden;
   background-color: #000000;
   &-title {
     @apply text-lg text-white opacity-70;