From a59351adf72111dec583eea364c67987d3a095a1 Mon Sep 17 00:00:00 2001
From: algerkong <algerkc@qq.com>
Date: Tue, 2 Jan 2024 22:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                     |  1 -
 src/components/MusicList.vue        |  2 +-
 src/layout/AppLayout.vue            | 53 +++++++++++++++++++----------
 src/layout/components/AppMenu.vue   |  4 +--
 src/layout/components/PlayBar.vue   |  3 +-
 src/layout/components/SearchBar.vue |  4 ++-
 src/layout/components/TitleBar.vue  |  6 +---
 src/router/home.ts                  | 32 +++++------------
 src/views/home/index.vue            |  4 +--
 src/views/list/index.vue            |  4 +--
 src/views/login/index.vue           |  2 +-
 src/views/mv/index.vue              |  4 +--
 src/views/search/index.vue          |  4 +--
 src/views/test/test.vue             | 21 ------------
 src/views/user/index.vue            |  7 ----
 15 files changed, 60 insertions(+), 91 deletions(-)
 delete mode 100644 src/views/test/test.vue

diff --git a/components.d.ts b/components.d.ts
index b6817ad..48d0a2b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -23,7 +23,6 @@ declare module 'vue' {
     NPopover: typeof import('naive-ui')['NPopover']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSlider: typeof import('naive-ui')['NSlider']
-    NSwitch: typeof import('naive-ui')['NSwitch']
     NTooltip: typeof import('naive-ui')['NTooltip']
     PlayBottom: typeof import('./src/components/common/PlayBottom.vue')['default']
     PlayListsItem: typeof import('./src/components/common/PlayListsItem.vue')['default']
diff --git a/src/components/MusicList.vue b/src/components/MusicList.vue
index d6f62b5..5dcf378 100644
--- a/src/components/MusicList.vue
+++ b/src/components/MusicList.vue
@@ -1,5 +1,5 @@
 <template>
-  <n-drawer v-model:show="show" height="70vh" placement="bottom" :drawer-style="{ backgroundColor: 'transparent' }">
+  <n-drawer :show="show" height="70vh" placement="bottom" :drawer-style="{ backgroundColor: 'transparent' }">
     <div class="music-page">
       <i class="iconfont icon-icon_error music-close" @click="close"></i>
       <div class="music-title">{{ name }}</div>
diff --git a/src/layout/AppLayout.vue b/src/layout/AppLayout.vue
index 1eb9dea..67e56fe 100644
--- a/src/layout/AppLayout.vue
+++ b/src/layout/AppLayout.vue
@@ -1,23 +1,31 @@
 <template>
     <div class="layout-page">
         <div class="layout-main">
-            <title-bar />
-            <div class="flex">
+            <title-bar v-if="isElectron" />
+            <div class="layout-main-page" :class="isElectron ? '' : 'pt-6'">
                 <!-- 侧边菜单栏 -->
                 <app-menu class="menu" :menus="menus" />
                 <div class="main">
                     <!-- 搜索栏 -->
                     <search-bar />
                     <!-- 主页面路由 -->
-                    <div class="main-content bg-black" :native-scrollbar="false">
+                    <div class="main-content bg-black pb-" :native-scrollbar="false" :class="isPlay ? 'pb-20' : ''">
                         <n-message-provider>
-                            <router-view class="main-page" v-slot="{ Component }">
-                                <keep-alive>
-                                    <component :is="Component" />
+                            <router-view class="main-page" v-slot="{ Component }" :class="route.meta.noScroll? 'pr-3' : ''">
+                              <template v-if="route.meta.noScroll">
+                                <keep-alive v-if="!route.meta.noKeepAlive">
+                                  <component :is="Component" />
                                 </keep-alive>
-                                <!-- <component :is="Component" v-if="!$route.meta.keepAlive" />
-
-                                <component :is="Component" /> -->
+                                <component v-else :is="Component"/>
+                              </template>
+                              <template v-else>
+                                <n-scrollbar>
+                                  <keep-alive v-if="!route.meta.noKeepAlive">
+                                      <component :is="Component" />
+                                  </keep-alive>
+                                  <component v-else :is="Component"/>
+                                </n-scrollbar>
+                              </template>
                             </router-view>
                         </n-message-provider>
                     </div>
@@ -30,7 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { SongResult } from '@/type/music';
+import { useRoute } from 'vue-router';
 import { useStore } from 'vuex';
 const AppMenu = defineAsyncComponent(() => import('./components/AppMenu.vue'));
 const PlayBar = defineAsyncComponent(() => import('./components/PlayBar.vue'));
@@ -44,10 +52,17 @@ const isPlay = computed(() => store.state.isPlay as boolean)
 const menus = store.state.menus;
 const play = computed(() => store.state.play as boolean)
 
+const route = useRoute()
+
 const audio = {
   value: document.querySelector('#MusicAudio') as HTMLAudioElement
 }
 
+const windowData = window as any
+const isElectron = computed(() => {
+  return !!windowData.electronAPI
+})
+
 onMounted(() => {
   // 监听音乐是否播放
   watch(
@@ -105,23 +120,25 @@ const playMusicEvent = async () => {
 }
 
 .layout-main {
-    @apply bg-black rounded-lg  text-white shadow-xl flex-col relative;
+    @apply bg-black  text-white shadow-xl flex flex-col relative;
     height: 100%;
     width: 100%;
     overflow: hidden;
+    &-page{
+      @apply flex flex-1 overflow-hidden;
+    }
     .menu {
         width: 90px;
     }
     .main {
-        @apply pr-6 flex-1 box-border;
-        height: 100vh;
+        @apply flex-1 box-border flex flex-col;
+        height: 100%;
         &-content {
-            @apply rounded-2xl pb-28 box-border;
-            height: 100vh;
-        }
-        &-page {
-            margin: 20px 0;
+            @apply box-border flex-1 overflow-hidden;
         }
     }
+    :deep(.n-scrollbar-content){
+      @apply pr-3;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/layout/components/AppMenu.vue b/src/layout/components/AppMenu.vue
index d62ac24..54889a9 100644
--- a/src/layout/components/AppMenu.vue
+++ b/src/layout/components/AppMenu.vue
@@ -13,9 +13,9 @@
             <i
               class="iconfont app-menu-item-icon"
               :style="iconStyle(index)"
-              :class="item.mate.icon"
+              :class="item.meta.icon"
             ></i>
-            <span v-if="isText" class="app-menu-item-text ml-3">{{ item.mate.title }}</span>
+            <span v-if="isText" class="app-menu-item-text ml-3">{{ item.meta.title }}</span>
           </router-link>
         </div>
       </div>
diff --git a/src/layout/components/PlayBar.vue b/src/layout/components/PlayBar.vue
index 8c5b8e8..ab5614b 100644
--- a/src/layout/components/PlayBar.vue
+++ b/src/layout/components/PlayBar.vue
@@ -242,8 +242,7 @@ const setMusicFull = () => {
 .music-play-bar {
   @apply h-20 w-full absolute bottom-0 left-0 flex items-center rounded-t-2xl overflow-hidden box-border px-6 py-2;
   z-index: 9999;
-  backdrop-filter: blur(20px);
-  box-shadow: 0px 0px 8px 0px rgba(203, 203, 203, 0.238);
+  box-shadow: 0px 0px 10px 2px rgba(203, 203, 203, 0.034);
   background-color: rgba(0, 0, 0, 0.747);  .music-content {
     width: 140px;
     @apply ml-4;
diff --git a/src/layout/components/SearchBar.vue b/src/layout/components/SearchBar.vue
index ddfb21e..12cdea9 100644
--- a/src/layout/components/SearchBar.vue
+++ b/src/layout/components/SearchBar.vue
@@ -225,7 +225,9 @@ const selectItem = async (key: any) => {
     @apply ml-4 flex text-lg justify-center items-center rounded-full pl-3 border border-gray-600;
     background: #1a1a1a;
 }
-
+.search-box{
+    @apply pb-4 pr-4;
+}
 .search-box-input {
     @apply relative;
 }
diff --git a/src/layout/components/TitleBar.vue b/src/layout/components/TitleBar.vue
index 013a410..de7f3ca 100644
--- a/src/layout/components/TitleBar.vue
+++ b/src/layout/components/TitleBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="title-bar" @mousedown="drag" v-if="isElectron">
+  <div id="title-bar" @mousedown="drag">
     <div id="title">Alger Music</div>
     <div id="buttons">
       <button @click="minimize">
@@ -21,10 +21,6 @@ import { useDialog } from 'naive-ui'
 const dialog = useDialog()
 const windowData = window as any
 
-const isElectron = computed(() => {
-  return !!windowData.electronAPI.minimize
-})
-
 const minimize = () => {
   windowData.electronAPI.minimize()
 }
diff --git a/src/router/home.ts b/src/router/home.ts
index c7b62ad..c362e0a 100644
--- a/src/router/home.ts
+++ b/src/router/home.ts
@@ -2,8 +2,7 @@ const layoutRouter = [
   {
     path: '/',
     name: 'home',
-    mate: {
-      keepAlive: true,
+    meta: {
       title: '首页',
       icon: 'icon-Home',
     },
@@ -12,9 +11,10 @@ const layoutRouter = [
   {
     path: '/search',
     name: 'search',
-    mate: {
+    meta: {
       title: '搜索',
-      keepAlive: true,
+      noScroll: true,
+      noKeepAlive: true,
       icon: 'icon-Search',
     },
     component: () => import('@/views/search/index.vue'),
@@ -22,9 +22,8 @@ const layoutRouter = [
   {
     path: '/list',
     name: 'list',
-    mate: {
+    meta: {
       title: '歌单',
-      keepAlive: true,
       icon: 'icon-Paper',
     },
     component: () => import('@/views/list/index.vue'),
@@ -32,9 +31,8 @@ const layoutRouter = [
   {
     path: '/mv',
     name: 'mv',
-    mate: {
+    meta: {
       title: 'MV',
-      keepAlive: true,
       icon: 'icon-recordfill',
     },
     component: () => import('@/views/mv/index.vue'),
@@ -42,9 +40,8 @@ const layoutRouter = [
   {
     path: '/history',
     name: 'history',
-    mate: {
+    meta: {
       title: '历史',
-      keepAlive: true,
       icon: 'icon-a-TicketStar',
     },
     component: () => import('@/views/history/index.vue'),
@@ -52,23 +49,12 @@ const layoutRouter = [
   {
     path: '/user',
     name: 'user',
-    mate: {
+    meta: {
       title: '用户',
-      keepAlive: true,
+      noKeepAlive: true,
       icon: 'icon-Profile',
     },
     component: () => import('@/views/user/index.vue'),
   },
-  // {
-  //   path: "/test",
-  //   name: "test",
-  //   mate: {
-  //     title: "用户",
-  //     keepAlive: true,
-  //     icon: "icon-Profile",
-  //   },
-  //   component: () => import("@/views/test/test.vue"),
-  // },
 ]
-
 export default layoutRouter;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 2a4452a..bb96fd3 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="main-page">
-    <n-scrollbar>
       <!-- 推荐歌手 -->
       <recommend-singer />
       <div class="main-content">
@@ -11,7 +10,6 @@
         <!-- 推荐最新专辑 -->
         <recommend-album />
       </div>
-    </n-scrollbar>
   </div>
 </template>
 
@@ -24,7 +22,7 @@ const RecommendAlbum = defineAsyncComponent(() => import("@/components/Recommend
 
 <style lang="scss" scoped>
 .main-page{
-  @apply pt-4 h-full w-full;
+  @apply h-full w-full;
 }
 .main-content {
   @apply mt-6 flex pb-28;
diff --git a/src/views/list/index.vue b/src/views/list/index.vue
index 9d4fc9f..5906c9e 100644
--- a/src/views/list/index.vue
+++ b/src/views/list/index.vue
@@ -97,7 +97,7 @@ watch(
 
 <style lang="scss" scoped>
 .list-page {
-  @apply relative h-full w-full pt-2;
+  @apply relative h-full w-full;
 }
 
 .recommend {
@@ -107,7 +107,7 @@ watch(
   }
 
   &-list {
-    @apply grid gap-6 pb-28 pr-3;
+    @apply grid gap-6 pb-28;
     grid-template-columns: repeat(auto-fill, minmax(13%, 1fr));
   }
   &-item {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1ae0a92..245961a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -104,7 +104,7 @@ const loginPhone = async () => {
 
 <style lang="scss" scoped>
 .login-page {
-  @apply flex flex-col items-center justify-center p-20;
+  @apply flex flex-col items-center justify-center p-20 pt-20;
 }
 
 .login-title {
diff --git a/src/views/mv/index.vue b/src/views/mv/index.vue
index 29e0947..8171cf2 100644
--- a/src/views/mv/index.vue
+++ b/src/views/mv/index.vue
@@ -72,14 +72,14 @@ const close = () => {
 
 <style scoped lang="scss">
 .mv-list {
-  @apply relative h-full w-full pt-2;
+  @apply relative h-full w-full;
 
   &-title {
     @apply text-xl font-bold;
   }
 
   &-content {
-    @apply grid gap-6 pb-28 pr-3 mt-2;
+    @apply grid gap-6 pb-4 mt-2;
     grid-template-columns: repeat(auto-fill, minmax(14%, 1fr));
   }
 
diff --git a/src/views/search/index.vue b/src/views/search/index.vue
index c0763f5..5203db0 100644
--- a/src/views/search/index.vue
+++ b/src/views/search/index.vue
@@ -148,7 +148,7 @@ const handlePlay = (item: any) => {
     @apply flex h-full;
 }
 .hot-search {
-    @apply mt-3 mr-4 rounded-xl  flex-1 overflow-hidden;
+    @apply mr-4 rounded-xl  flex-1 overflow-hidden;
     background-color: #0d0d0d;
     animation-duration: 0.2s;
     min-width: 400px;
@@ -168,7 +168,7 @@ const handlePlay = (item: any) => {
 }
 
 .search-list {
-    @apply mt-3 flex-1 rounded-xl;
+    @apply flex-1 rounded-xl;
     background-color: #0d0d0d;
     height: 100%;
     &-box{
diff --git a/src/views/test/test.vue b/src/views/test/test.vue
deleted file mode 100644
index c5be76e..0000000
--- a/src/views/test/test.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div class="p-4">
-    <div class="box"></div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-
-</script>
-
-
-
-<style lang="scss" scoped>
-.box{
-  width: 100px;
-  height: 100px;
-  background-image: url(http://p2.music.126.net/w_vuv9hBWq2hlJxJcmJrjg==/109951166115915081.jpg?param=500y500);
-  background-size: 100%;
-  background-repeat: no-repeat;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 16e6ea6..c22cfa6 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -149,13 +149,6 @@ const handlePlay = (item: any) => {
 </template>
 
 <style lang="scss" scoped>
-.musicPage-enter-active {
-  animation: fadeInUp 0.8s ease-in-out;
-}
-
-.musicPage-leave-active {
-  animation: fadeOutDown 0.8s ease-in-out;
-}
 .user-page {
   @apply flex h-full;
   .left {