From d925f40303ac7e0b8400fdcd66ff966ab6e962e3 Mon Sep 17 00:00:00 2001
From: alger <algerkc@qq.com>
Date: Thu, 28 Nov 2024 08:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E4=BC=98=E5=8C=96=E6=AD=8C?=
 =?UTF-8?q?=E8=AF=8D=E8=BF=9B=E5=BA=A6=20=E6=B7=BB=E5=8A=A0=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=20=20=E4=BC=98=E5=8C=96=E6=92=AD=E6=94=BE=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                           |   2 +
 package.json                              |  11 ++-
 src/App.vue                               |  16 ++-
 src/components/common/InstallAppModal.vue | 114 ++++++++++++++++++++++
 src/components/common/SongItem.vue        |  64 ++++++++++--
 src/hooks/MusicListHook.ts                |   3 -
 src/layout/components/MusicFull.vue       |  18 ++--
 src/views/history/index.vue               |   6 +-
 tailwind.config.js                        |   7 +-
 9 files changed, 200 insertions(+), 41 deletions(-)
 create mode 100644 src/components/common/InstallAppModal.vue

diff --git a/components.d.ts b/components.d.ts
index 4fa0e0d..94678ab 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,6 +7,7 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
+    InstallAppModal: typeof import('./src/components/common/InstallAppModal.vue')['default']
     MPop: typeof import('./src/components/common/MPop.vue')['default']
     MusicList: typeof import('./src/components/MusicList.vue')['default']
     MvPlayer: typeof import('./src/components/MvPlayer.vue')['default']
@@ -21,6 +22,7 @@ declare module 'vue' {
     NInput: typeof import('naive-ui')['NInput']
     NLayout: typeof import('naive-ui')['NLayout']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
+    NModal: typeof import('naive-ui')['NModal']
     NPopover: typeof import('naive-ui')['NPopover']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSlider: typeof import('naive-ui')['NSlider']
diff --git a/package.json b/package.json
index 027a4e0..e49d227 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "b:win:x64": "cross-env NODE_ENV=production electron-builder --config ./build/win64.json",
     "b:win:x86": "cross-env NODE_ENV=production electron-builder --config ./build/win32.json",
     "b:win:arm": "cross-env NODE_ENV=production electron-builder --config ./build/winarm64.json",
-    "b:mac": "cross-env NODE_ENV=production electron-builder --config ./build/mac.json"
+    "b:mac": "cross-env NODE_ENV=production electron-builder --config ./build/mac.json",
+    "b:win": "cross-env NODE_ENV=production vite build && npm run b:win:x64 && npm run b:win:x86 && npm run b:win:arm"
   },
   "dependencies": {
     "electron-store": "^8.1.0"
@@ -30,6 +31,7 @@
     "@vueuse/electron": "^11.0.3",
     "autoprefixer": "^10.4.20",
     "axios": "^1.7.7",
+    "cross-env": "^7.0.3",
     "electron": "^32.0.1",
     "electron-builder": "^25.0.5",
     "eslint": "^8.56.0",
@@ -42,11 +44,11 @@
     "eslint-plugin-vue-scoped-css": "^2.7.2",
     "lodash": "^4.17.21",
     "naive-ui": "^2.39.0",
-    "postcss": "^8.4.44",
+    "postcss": "^8.4.49",
     "prettier": "^3.3.3",
     "remixicon": "^4.2.0",
     "sass": "^1.78.0",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4",
+    "tailwindcss": "^3.4.15",
     "typescript": "^5.5.4",
     "unplugin-auto-import": "^0.18.2",
     "unplugin-vue-components": "^0.27.4",
@@ -57,7 +59,6 @@
     "vue": "^3.5.0",
     "vue-router": "^4.4.3",
     "vue-tsc": "^2.1.4",
-    "vuex": "^4.1.0",
-    "cross-env": "^7.0.3"
+    "vuex": "^4.1.0"
   }
 }
diff --git a/src/App.vue b/src/App.vue
index caaa1c6..193dd54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,24 +1,22 @@
 <template>
-  <div class="app" :class="isMobile ? 'mobile' : ''">
-    <audio id="MusicAudio" ref="audioRef" :src="playMusicUrl" :autoplay="play"></audio>
+  <div class="app-container" :class="{ mobile: isMobile }">
     <n-config-provider :theme="darkTheme">
       <n-dialog-provider>
         <router-view></router-view>
       </n-dialog-provider>
+      <install-app-modal></install-app-modal>
     </n-config-provider>
   </div>
 </template>
 
-<script lang="ts" setup>
+<script setup lang="ts">
 import { darkTheme } from 'naive-ui';
 
+import InstallAppModal from '@/components/common/InstallAppModal.vue';
 import store from '@/store';
 
 import { isMobile } from './utils';
 
-const playMusicUrl = computed(() => store.state.playMusicUrl as string);
-// 是否播放
-const play = computed(() => store.state.play as boolean);
 const windowData = window as any;
 onMounted(() => {
   if (windowData.electron) {
@@ -29,10 +27,8 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-div {
-  box-sizing: border-box;
-}
-.app {
+.app-container {
+  @apply h-full w-full;
   user-select: none;
 }
 
diff --git a/src/components/common/InstallAppModal.vue b/src/components/common/InstallAppModal.vue
new file mode 100644
index 0000000..4c4c79e
--- /dev/null
+++ b/src/components/common/InstallAppModal.vue
@@ -0,0 +1,114 @@
+<template>
+  <n-modal v-model:show="showModal" preset="dialog" :show-icon="false" :mask-closable="true" class="install-app-modal">
+    <div class="modal-content">
+      <div class="modal-header">
+        <div class="app-icon">
+          <img src="@/assets/logo.png" alt="App Icon" />
+        </div>
+        <div class="app-info">
+          <h2 class="app-name">Alger Music</h2>
+          <p class="app-desc">在桌面安装应用，获得更好的体验</p>
+        </div>
+      </div>
+      <div class="modal-actions">
+        <n-button class="cancel-btn" @click="closeModal">暂不安装</n-button>
+        <n-button type="primary" class="install-btn" @click="handleInstall">立即安装</n-button>
+      </div>
+    </div>
+  </n-modal>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+
+const showModal = ref(false);
+const isElectron = ref((window as any).electron !== undefined);
+
+const closeModal = () => {
+  showModal.value = false;
+  localStorage.setItem('installPromptDismissed', 'true');
+};
+
+const handleInstall = async () => {
+  // 新页面打开
+  // 识别当前环境是 mac 还是 windows
+  const os = navigator.platform;
+  const isMac = os.includes('Mac');
+  const isWindows = os.includes('Win');
+  const urls = {
+    mac: 'http://file.alger.fun/d/ali/%E8%BD%AF%E4%BB%B6/AlgerMusic/AlgerMusic.dmg',
+    windows: 'http://file.alger.fun/d/ali/%E8%BD%AF%E4%BB%B6/AlgerMusic/AlgerMusic_2.1.0_Setup_x64.exe',
+  };
+  // 根据操作系统选择下载链接
+  let downloadUrl = '';
+  if (isMac) {
+    downloadUrl = urls.mac;
+  } else if (isWindows) {
+    downloadUrl = urls.windows;
+  }
+  if (downloadUrl) {
+    window.open(downloadUrl, '_blank');
+  }
+};
+
+onMounted(() => {
+  // 如果是 electron 环境，不显示安装提示
+  if (isElectron.value) {
+    return;
+  }
+
+  // 检查是否已经点击过"暂不安装"
+  const isDismissed = localStorage.getItem('installPromptDismissed') === 'true';
+  if (isDismissed) {
+    return;
+  }
+  showModal.value = true;
+});
+</script>
+
+<style lang="scss" scoped>
+.install-app-modal {
+  :deep(.n-modal) {
+    @apply max-w-sm;
+  }
+  .modal-content {
+    @apply p-4;
+    .modal-header {
+      @apply flex items-center mb-6;
+      .app-icon {
+        @apply w-16 h-16 mr-4 rounded-2xl overflow-hidden;
+        img {
+          @apply w-full h-full object-cover;
+        }
+      }
+      .app-info {
+        @apply flex-1;
+        .app-name {
+          @apply text-xl font-bold mb-1;
+        }
+        .app-desc {
+          @apply text-sm text-gray-400;
+        }
+      }
+    }
+    .modal-actions {
+      @apply flex gap-3;
+      .n-button {
+        @apply flex-1;
+      }
+      .cancel-btn {
+        @apply bg-gray-800 text-gray-300 border-none;
+        &:hover {
+          @apply bg-gray-700;
+        }
+      }
+      .install-btn {
+        @apply bg-green-600 border-none;
+        &:hover {
+          @apply bg-green-500;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/common/SongItem.vue b/src/components/common/SongItem.vue
index f7076b9..e0dd9ce 100644
--- a/src/components/common/SongItem.vue
+++ b/src/components/common/SongItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="song-item" :class="{ 'song-mini': mini }">
+  <div class="song-item" :class="{ 'song-mini': mini, 'song-list': list }">
     <n-image
       v-if="item.picUrl"
       ref="songImg"
@@ -12,18 +12,29 @@
       @load="imageLoad"
     />
     <div class="song-item-content">
-      <div class="song-item-content-title">
-        <n-ellipsis class="text-ellipsis" line-clamp="1">{{ item.name }}</n-ellipsis>
-      </div>
-      <div class="song-item-content-name">
-        <n-ellipsis class="text-ellipsis" line-clamp="1">
+      <div v-if="list" class="song-item-content-wrapper">
+        <n-ellipsis class="song-item-content-title text-ellipsis" line-clamp="1">{{ item.name }}</n-ellipsis>
+        <div class="song-item-content-divider">-</div>
+        <n-ellipsis class="song-item-content-name text-ellipsis" line-clamp="1">
           <span v-for="(artists, artistsindex) in item.ar || item.song.artists" :key="artistsindex"
             >{{ artists.name }}{{ artistsindex < (item.ar || item.song.artists).length - 1 ? ' / ' : '' }}</span
           >
         </n-ellipsis>
       </div>
+      <template v-else>
+        <div class="song-item-content-title">
+          <n-ellipsis class="text-ellipsis" line-clamp="1">{{ item.name }}</n-ellipsis>
+        </div>
+        <div class="song-item-content-name">
+          <n-ellipsis class="text-ellipsis" line-clamp="1">
+            <span v-for="(artists, artistsindex) in item.ar || item.song.artists" :key="artistsindex"
+              >{{ artists.name }}{{ artistsindex < (item.ar || item.song.artists).length - 1 ? ' / ' : '' }}</span
+            >
+          </n-ellipsis>
+        </div>
+      </template>
     </div>
-    <div class="song-item-operating">
+    <div class="song-item-operating" :class="{ 'song-item-operating-list': list }">
       <div class="song-item-operating-like">
         <i class="iconfont icon-likefill"></i>
       </div>
@@ -51,9 +62,11 @@ const props = withDefaults(
   defineProps<{
     item: SongResult;
     mini?: boolean;
+    list?: boolean;
   }>(),
   {
     mini: false,
+    list: false,
   },
 );
 
@@ -175,4 +188,41 @@ const playMusicEvent = async (item: SongResult) => {
     }
   }
 }
+
+.song-list {
+  @apply p-2 rounded-lg hover:bg-gray-800/50 border border-gray-800/50 mb-2;
+  .song-item-img {
+    @apply w-10 h-10 rounded-lg mr-3;
+  }
+  .song-item-content {
+    @apply flex items-center flex-1;
+    &-wrapper {
+      @apply flex items-center flex-1 text-sm;
+    }
+    &-title {
+      @apply text-white flex-shrink-0 max-w-[45%];
+    }
+    &-divider {
+      @apply mx-2 text-gray-400;
+    }
+    &-name {
+      @apply text-gray-400 flex-1 min-w-0;
+    }
+  }
+  .song-item-operating {
+    @apply flex items-center gap-2;
+    &-like {
+      @apply cursor-pointer hover:scale-110 transition-transform;
+      .iconfont {
+        @apply text-base text-gray-400 hover:text-red-500;
+      }
+    }
+    &-play {
+      @apply w-7 h-7 cursor-pointer hover:scale-110 transition-transform;
+      .iconfont {
+        @apply text-base;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/hooks/MusicListHook.ts b/src/hooks/MusicListHook.ts
index 0fb5567..214c156 100644
--- a/src/hooks/MusicListHook.ts
+++ b/src/hooks/MusicListHook.ts
@@ -23,9 +23,6 @@ const getSongUrl = async (id: number) => {
 };
 
 const getSongDetail = async (playMusic: SongResult) => {
-  if (playMusic.playMusicUrl) {
-    return playMusic;
-  }
   playMusic.playLoading = true;
   const playMusicUrl = await getSongUrl(playMusic.id);
   const { backgroundColor, primaryColor } =
diff --git a/src/layout/components/MusicFull.vue b/src/layout/components/MusicFull.vue
index 63c0a87..2b624cc 100644
--- a/src/layout/components/MusicFull.vue
+++ b/src/layout/components/MusicFull.vue
@@ -33,7 +33,7 @@
               :id="`music-lrc-text-${index}`"
               :key="index"
               class="music-lrc-text"
-              :class="{ 'now-text': index === nowIndex }"
+              :class="{ 'now-text': index === nowIndex, 'hover-text': item.text }"
               @click="setAudioTime(index, audio)"
             >
               <span :style="getLrcStyle(index)">{{ item.text }}</span>
@@ -259,11 +259,19 @@ defineExpose({
 
       span {
         padding-right: 100px;
-        display: inline-block;
+        // display: inline-block;
         background-clip: text !important;
         -webkit-background-clip: text !important;
       }
 
+      &-tr {
+        @apply font-normal;
+        opacity: 0.7;
+        color: var(--text-color-primary);
+      }
+    }
+
+    .hover-text {
       &:hover {
         @apply font-bold opacity-100 rounded-xl;
         background-color: var(--hover-bg-color);
@@ -272,12 +280,6 @@ defineExpose({
           color: var(--text-color-active) !important;
         }
       }
-
-      &-tr {
-        @apply font-normal;
-        opacity: 0.7;
-        color: var(--text-color-primary);
-      }
     }
   }
 }
diff --git a/src/views/history/index.vue b/src/views/history/index.vue
index fda495e..62c2f26 100644
--- a/src/views/history/index.vue
+++ b/src/views/history/index.vue
@@ -10,8 +10,8 @@
           :class="setAnimationClass('animate__bounceIn')"
           :style="setAnimationDelay(index, 30)"
         >
-          <song-item class="history-item-content" :item="item" @play="handlePlay" />
-          <div class="history-item-count">
+          <song-item class="history-item-content" :item="item" list @play="handlePlay" />
+          <div class="history-item-count min-w-[60px]">
             {{ item.count }}
           </div>
           <div class="history-item-delete">
@@ -56,7 +56,7 @@ const handlePlay = () => {
         @apply flex-1;
       }
       &-count {
-        @apply px-4 text-lg;
+        @apply px-4 text-lg text-center;
       }
       &-delete {
         @apply cursor-pointer rounded-full border-2 border-gray-400 w-8 h-8 flex justify-center items-center;
diff --git a/tailwind.config.js b/tailwind.config.js
index 860df56..82cd6a0 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,11 +1,8 @@
+/** @type {import('tailwindcss').Config} */
 module.exports = {
-  purge: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
-  darkMode: false, // or 'media' or 'class'
+  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
   theme: {
     extend: {},
   },
-  variants: {
-    extend: {},
-  },
   plugins: [],
 };