From 4d3372839890c7787592fcd36a5a67fe7ed034dd Mon Sep 17 00:00:00 2001
From: algerkong <liuliujjjjasd@foxmail.com>
Date: Fri, 23 Jul 2021 10:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=93=E8=BE=91=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=20=20=E6=92=AD=E6=94=BE=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          | 11 +++--
 src/api/home.ts                      |  6 +++
 src/components/PlaylistType.vue      |  2 +-
 src/components/RecommendAlbum.vue    | 67 ++++++++++++++++++++++++++++
 src/components/RecommendSinger.vue   |  5 ++-
 src/components/RecommendSonglist.vue |  5 ++-
 src/layout/components/PlayBar.vue    | 12 +++--
 src/type/album.ts                    | 65 +++++++++++++++++++++++++++
 src/views/home/index.vue             |  3 ++
 9 files changed, 166 insertions(+), 10 deletions(-)
 create mode 100644 src/components/RecommendAlbum.vue
 create mode 100644 src/type/album.ts

diff --git a/src/App.vue b/src/App.vue
index d3abfbe..3ce9594 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,9 @@
 <template>
-  <n-config-provider :theme="darkTheme">
-    <router-view></router-view>
-  </n-config-provider>
+  <div class="app">
+    <n-config-provider :theme="darkTheme">
+      <router-view></router-view>
+    </n-config-provider>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -14,4 +16,7 @@ import { darkTheme } from 'naive-ui'
 div {
   box-sizing: border-box;
 }
+.app {
+  user-select: none;
+}
 </style>
diff --git a/src/api/home.ts b/src/api/home.ts
index a45ec61..a426aa5 100644
--- a/src/api/home.ts
+++ b/src/api/home.ts
@@ -3,6 +3,7 @@ import { IHotSinger } from "@/type/singer";
 import { ISearchKeyword } from "@/type/search";
 import { IPlayListSort } from "@/type/playlist";
 import { IRecommendMusic } from "@/type/music";
+import { IAlbumNew } from "@/type/album";
 
 interface IHotSingerParams {
   offset: number;
@@ -32,3 +33,8 @@ export const getPlaylistCategory = () => {
 export const getRecommendMusic = (params: IRecommendMusicParams) => {
   return request.get<IRecommendMusic>("/personalized/newsong", { params });
 };
+
+// 获取最新专辑推荐
+export const getNewAlbum = () => {
+  return request.get<IAlbumNew>("/album/newest");
+};
diff --git a/src/components/PlaylistType.vue b/src/components/PlaylistType.vue
index 95c737c..4fb52fc 100644
--- a/src/components/PlaylistType.vue
+++ b/src/components/PlaylistType.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 歌单分类列表 -->
     <div class="play-list-type">
-        <div class="title animate__animated animate__fadeInLeft">歌单分类</div>
+        <div class="title" :class="setAnimationClass('animate__fadeInLeft')">歌单分类</div>
         <n-layout class="bg-black">
             <template v-for="(item, index) in playlistCategory?.sub" :key="item.name">
                 <span
diff --git a/src/components/RecommendAlbum.vue b/src/components/RecommendAlbum.vue
new file mode 100644
index 0000000..a1a68e6
--- /dev/null
+++ b/src/components/RecommendAlbum.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="recommend-album">
+        <div class="title" :class="setAnimationClass('animate__fadeInLeft')">最新专辑</div>
+        <div class="recommend-album-list">
+            <template v-for="(item,index) in albumData?.albums" :key="item.id">
+                <div
+                    v-if="index < 6"
+                    class="recommend-album-list-item"
+                    :class="setAnimationClass('animate__backInUp')"
+                    :style="setAnimationDelay(index, 100)"
+                >
+                    <img
+                        class="recommend-album-list-item-img"
+                        :src="item.blurPicUrl + '?param=200y200'"
+                    />
+                    <div class="recommend-album-list-item-content">{{ item.name }}</div>
+                </div>
+            </template>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { getNewAlbum } from "@/api/home"
+import { ref, onMounted } from "vue";
+import type { IAlbumNew } from "@/type/album"
+import { setAnimationClass, setAnimationDelay } from "@/utils";
+
+
+const albumData = ref<IAlbumNew>()
+const loadAlbumList = async () => {
+    const { data } = await getNewAlbum();
+    albumData.value = data
+}
+
+onMounted(() => {
+    loadAlbumList()
+})
+</script>
+
+<style lang="scss" scoped>
+.recommend-album {
+    @apply flex-1 mx-5;
+    .title {
+        @apply text-lg font-bold mb-4;
+    }
+
+    .recommend-album-list {
+        @apply grid grid-cols-2 grid-rows-3 gap-2;
+        &-item {
+            @apply rounded-xl overflow-hidden relative;
+            &-img {
+                @apply rounded-xl transition;
+            }
+            &:hover img {
+                filter: brightness(50%);
+            }
+            &-content {
+                @apply w-full h-full opacity-0 transition absolute z-10 top-0 left-0 p-4 text-xl;
+            }
+            &-content:hover {
+                opacity: 1;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/components/RecommendSinger.vue b/src/components/RecommendSinger.vue
index a99893a..53a1ebb 100644
--- a/src/components/RecommendSinger.vue
+++ b/src/components/RecommendSinger.vue
@@ -9,7 +9,10 @@
                 :style="setAnimationDelay(index, 100)"
                 :key="item.id"
             >
-                <div :style="setBackgroundImg(item.picUrl)" class="recommend-singer-item-bg"></div>
+                <div
+                    :style="setBackgroundImg(item.picUrl + '?param=500y500')"
+                    class="recommend-singer-item-bg"
+                ></div>
                 <div
                     class="recommend-singer-item-count p-2 text-base text-gray-200 z-10"
                 >{{ item.musicSize }}首</div>
diff --git a/src/components/RecommendSonglist.vue b/src/components/RecommendSonglist.vue
index b2eb44e..8a40c43 100644
--- a/src/components/RecommendSonglist.vue
+++ b/src/components/RecommendSonglist.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="recommend-music">
-        <div class="title animate__animated animate__fadeInLeft">本周最热音乐</div>
+        <div class="title" :class="setAnimationClass('animate__fadeInLeft')">本周最热音乐</div>
         <div
             class="recommend-music-list"
             :class="setAnimationClass('animate__bounceInUp')"
@@ -40,10 +40,11 @@ onMounted(() => {
     @apply text-lg font-bold mb-4;
 }
 .recommend-music {
+    @apply flex-auto;
+    // width: 530px;
     .text-ellipsis {
         width: 100%;
     }
-    @apply flex-1 mr-96;
     &-list {
         @apply rounded-3xl p-2 w-full border border-gray-700;
         background-color: #0d0d0d;
diff --git a/src/layout/components/PlayBar.vue b/src/layout/components/PlayBar.vue
index be3b514..f7cac7d 100644
--- a/src/layout/components/PlayBar.vue
+++ b/src/layout/components/PlayBar.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="music-play-bar">
+    <div class="music-play-bar" :class="setAnimationClass('animate__bounceInUp')">
         <img class="play-bar-img" :src="playMusic.picUrl" />
         <div class="music-content">
             <div class="music-content-title">
@@ -48,9 +48,9 @@
 <script lang="ts" setup>
 import type { SongResult } from "@/type/music";
 import { secondToMinute } from "@/utils";
-import { c } from "naive-ui";
-import { computed, onBeforeUpdate, onMounted, ref, watch } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { useStore } from 'vuex';
+import { setAnimationClass } from "@/utils";
 
 const store = useStore();
 
@@ -99,6 +99,8 @@ const timeSlider = computed({
     get: () => nowTime.value / allTime.value * 100,
     set: (value) => {
         audio.value.currentTime = value * allTime.value / 100
+        audio.value.play()
+        store.commit("setPlayMusic", true);
     }
 })
 
@@ -127,6 +129,10 @@ const onAudio = (audio: any) => {
         nowTime.value = audio.currentTime
         // 获取总时间
         allTime.value = audio.duration
+
+        if (audio.currentTime >= audio.duration) {
+            store.commit("setPlayMusic", false);
+        }
         // 获取音量
         audioVolume.value = audio.volume
 
diff --git a/src/type/album.ts b/src/type/album.ts
new file mode 100644
index 0000000..46c9e6a
--- /dev/null
+++ b/src/type/album.ts
@@ -0,0 +1,65 @@
+export interface IAlbumNew {
+  code: number;
+  albums: Album[];
+}
+
+interface Album {
+  name: string;
+  id: number;
+  type: string;
+  size: number;
+  picId: number;
+  blurPicUrl: string;
+  companyId: number;
+  pic: number;
+  picUrl: string;
+  publishTime: number;
+  description: string;
+  tags: string;
+  company: string;
+  briefDesc: string;
+  artist: Artist;
+  songs?: any;
+  alias: string[];
+  status: number;
+  copyrightId: number;
+  commentThreadId: string;
+  artists: Artist2[];
+  paid: boolean;
+  onSale: boolean;
+  picId_str: string;
+}
+
+interface Artist2 {
+  name: string;
+  id: number;
+  picId: number;
+  img1v1Id: number;
+  briefDesc: string;
+  picUrl: string;
+  img1v1Url: string;
+  albumSize: number;
+  alias: any[];
+  trans: string;
+  musicSize: number;
+  topicPerson: number;
+  img1v1Id_str: string;
+}
+
+interface Artist {
+  name: string;
+  id: number;
+  picId: number;
+  img1v1Id: number;
+  briefDesc: string;
+  picUrl: string;
+  img1v1Url: string;
+  albumSize: number;
+  alias: string[];
+  trans: string;
+  musicSize: number;
+  topicPerson: number;
+  picId_str?: string;
+  img1v1Id_str: string;
+  transNames?: string[];
+}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3794a1b..fc03521 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -8,6 +8,8 @@
         <playlist-type />
         <!-- 本周最热音乐 -->
         <recommend-songlist />
+        <!-- 推荐最新专辑 -->
+        <recommend-album />
       </div>
     </div>
   </n-layout>
@@ -17,6 +19,7 @@
 import RecommendSinger from "@/components/RecommendSinger.vue";
 import PlaylistType from "@/components/PlaylistType.vue";
 import RecommendSonglist from "@/components/RecommendSonglist.vue";
+import RecommendAlbum from "@/components/RecommendAlbum.vue";
 
 </script>