Compare commits

...

36 Commits
2.1.0 ... 2.4.0

Author SHA1 Message Date
alger
7365daf700 🐞 fix: 修复播放暂停控制问题 后续优化为参数监听 2024-12-12 22:36:07 +08:00
alger
cebf313075 feat: 优化播放 修改为howler 修复搜索导致播放无限卡顿问题(#15)
- 优化了整个项目的播放
- 去除audio
- 优化歌词页 歌词同步时间

fixes #15
2024-12-12 22:18:52 +08:00
alger
bb99049991 feat: 优化页面效果 2024-12-09 22:58:57 +08:00
alger
df74dafbc5 feat: 优化歌单列表页面 2024-12-09 22:39:33 +08:00
alger
721d2a9704 feat: 添加搜藏功能 与页面 2024-12-09 21:55:08 +08:00
alger
1e60fa9a95 feat: 添加展开收起歌词的提示 2024-12-09 20:51:40 +08:00
alger
f24e8232f8 feat: 修复布局问题 2024-12-09 20:39:32 +08:00
alger
a1b1d861ac feat: 修改下载地址 2024-12-09 18:43:05 +08:00
alger
f24263b416 🐞 fix: 修复滚动问题 2024-12-08 21:57:34 +08:00
alger
17795e5da2 feat: 添加动画速度调整功能 优化页面自适应效果 2024-12-08 21:50:58 +08:00
alger
f1030d3a78 feat: seo 优化 2024-12-08 21:35:15 +08:00
alger
b979ce250f feat: 添加 Coffee 2024-12-07 23:20:31 +08:00
alger
d0d8966875 feat: 优化移动端 歌词与歌单页面显示 2024-12-07 22:54:45 +08:00
alger
d39ba65263 📃 docs: 修改文档 2024-12-07 22:38:56 +08:00
alger
62d400827e 📃 docs: 修改文档 2024-12-07 22:33:36 +08:00
alger
75b99c46b5 📃 docs: 修改文档 2024-12-07 22:32:06 +08:00
alger
e7ae79144c feat: 修改登录背景 2024-12-07 21:50:18 +08:00
alger
04d6cbe7f3 🐞 fix: 修复二维码登录 重复触发请求问题 修改为手机号优先 2024-12-07 21:37:10 +08:00
alger
bea1e5751f feat: 优化cpu占用过高问题 2024-12-07 14:30:20 +08:00
alger
f2ebb04fab 📃 docs: 修改文档 2024-12-07 12:02:54 +08:00
alger
42048764d5 📃 docs: 修改文档 2024-12-07 11:38:56 +08:00
alger
e326253fd8 feat: 优化打包命令 2024-12-06 23:52:08 +08:00
alger
edf5c77ea0 feat: 优化桌面歌词功能 添加歌词进度 优化歌词页面样式 2024-12-06 23:50:44 +08:00
alger
8870390770 feat: 修复下载提示弹出问题 2024-12-06 20:57:33 +08:00
alger
c9514e6e19 feat: 在页面显示 github地址 2024-12-05 21:57:14 +08:00
alger
08fa160de4 🐞 fix: 修复搜索下 mv和歌曲同时播放问题 2024-12-05 21:35:20 +08:00
alger
5d4c4922fd feat: 修复搜索播放 bug 优化搜索 mv播放器 2024-12-05 21:29:13 +08:00
alger
c5e7c87658 feat: 优化列表渲染 2024-12-04 20:38:26 +08:00
alger
f6923b4c47 🐞 fix: 修复调整窗口大小 歌单列表重新加载问题 2024-12-01 16:41:23 +08:00
alger
4cf7598a7d 📃 docs: 更新 docs 2024-12-01 16:28:26 +08:00
alger
81b09bef0d feat: 修复无法播放的问题 2024-12-01 15:55:09 +08:00
alger
b21df3de25 feat: 修改下载地址 2024-11-29 08:49:32 +08:00
alger
c49d814182 feat: 优化滚动条 位置 2024-11-28 23:45:44 +08:00
alger
1cb3c72ab7 feat: 优化歌单列表数量 2024-11-28 23:39:56 +08:00
alger
f03372de6a feat: 优化歌单列表 添加加载更多 优化自动布局 优化歌单 mv 歌单类型的动画效果 2024-11-28 23:33:38 +08:00
alger
d925f40303 feat: 优化歌词进度 添加下载 优化播放 优化历史记录 2024-11-28 08:12:37 +08:00
51 changed files with 2370 additions and 678 deletions

View File

@@ -1,3 +1,12 @@
VITE_API = /api
VITE_API_MUSIC = /music
VITE_API_PROXY = http://110.42.251.190:9856
# 你的接口地址 (必填)
VITE_API_LOCAL = ***
# 音乐破解接口地址
VITE_API_MUSIC = ***
# 代理地址
VITE_API_PROXY = ***
# 本地运行代理地址
VITE_API_PROXY = /api
VITE_API_MUSIC_PROXY = /music
VITE_API_PROXY_MUSIC = /music_proxy

View File

@@ -1,3 +0,0 @@
VITE_API = http://110.42.251.190:9898
VITE_API_MUSIC = http://110.42.251.190:4100
VITE_API_PROXY = http://110.42.251.190:9856

2
.gitignore vendored
View File

@@ -16,3 +16,5 @@ dist.zip
.vscode
bun.lockb
.env.*.local

2
.npmrc Normal file
View File

@@ -0,0 +1,2 @@
electron_mirror=https://npmmirror.com/mirrors/electron/
electron_builder_binaries_mirror=https://npmmirror.com/mirrors/electron-builder-binaries/

View File

@@ -1,4 +1,4 @@
# 一个基于 electron typescript vue3 的桌面音乐播放器 适配 web端 桌面端 web移动端
# Alger Music Player
主要功能如下
- 音乐推荐
@@ -7,6 +7,42 @@
- 播放历史
- 桌面歌词
- 歌单 mv 搜索 专辑等功能
- 识别无法播放歌曲 并代理播放
- 可听周杰伦(搜索专辑)
## 项目简介
一个基于 electron typescript vue3 的桌面音乐播放器 适配 web端 桌面端 web移动端
## 预览地址
[http://mc.alger.fun/](http://mc.alger.fun/)
## 软件截图
![首页](./docs/img/image-7.png)
![歌词](./docs/img/image-6.png)
![搜索](./docs/img/image-8.png)
## 技术栈
### 主要框架
- Vue 3 - 渐进式 JavaScript 框架
- TypeScript - JavaScript 的超集,添加了类型系统
- Electron - 跨平台桌面应用开发框架
- Vite - 下一代前端构建工具
### UI 框架
- Naive UI - 基于 Vue 3 的组件库
### 项目特点
- 完整的类型支持TypeScript
- 模块化设计
- 自动化组件和 API 导入
- 多平台支持Web、Desktop、Mobile Web
- 构建优化(代码分割、压缩)
## 咖啡☕️
| 微信 | 支付宝 |
| :--------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------: |
| <img src="https://github.com/algerkong/algerkong/blob/main/wechat.jpg?raw=true" alt="WeChat QRcode" width=200> | <img src="https://github.com/algerkong/algerkong/blob/main/alipay.jpg?raw=true" alt="Wechat QRcode" width=200> |
## 项目运行
```bash
@@ -26,16 +62,37 @@
npm run win ...
# 具体看 package.json
```
#### 注意
- 本地运行需要配置 .env.development 文件
- 打包需要配置 .env.production 文件
```bash
# .env.development
VITE_API_LOCAL = /api
VITE_API_MUSIC_PROXY = /music
VITE_API_PROXY_MUSIC = /music_proxy
# 你的接口地址 (必填)
VITE_API = ***
# 音乐po接口地址
VITE_API_MUSIC = ***
VITE_API_PROXY = ***
# .env.production
# 你的接口地址 (必填)
VITE_API = ***
# 音乐po接口地址
VITE_API_MUSIC = ***
# 代理地址
VITE_API_PROXY = ***
```
## Stargazers over time
[![Stargazers over time](https://starchart.cc/algerkong/AlgerMusicPlayer.svg?variant=adaptive)](https://starchart.cc/algerkong/AlgerMusicPlayer)
## 软件截图
![首页](./docs/img/image.png)
![歌单](./docs/img/image-1.png)
![搜索](./docs/img/image-2.png)
![mv](./docs/img/image-3.png)
![历史](./docs/img/image-4.png)
![我的](./docs/img/image-5.png)
## 欢迎提Issues

7
app.js
View File

@@ -3,6 +3,7 @@ const path = require('path');
const Store = require('electron-store');
const setJson = require('./electron/set.json');
const { loadLyricWindow } = require('./electron/lyric');
const config = require('./electron/config');
let mainWin = null;
function createWindow() {
@@ -11,8 +12,8 @@ function createWindow() {
height: 780,
frame: false,
webPreferences: {
nodeIntegration: true,
// contextIsolation: false,
nodeIntegration: false,
contextIsolation: true,
preload: path.join(__dirname, '/electron/preload.js'),
},
});
@@ -20,7 +21,7 @@ function createWindow() {
win.setMinimumSize(1200, 780);
if (process.env.NODE_ENV === 'development') {
win.webContents.openDevTools({ mode: 'detach' });
win.loadURL('http://localhost:4488/');
win.loadURL(`http://localhost:${config.development.mainPort}/`);
} else {
win.loadURL(`file://${__dirname}/dist/index.html`);
}

7
components.d.ts vendored
View File

@@ -7,20 +7,27 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
Coffee: typeof import('./src/components/Coffee.vue')['default']
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']
NAvatar: typeof import('naive-ui')['NAvatar']
NButton: typeof import('naive-ui')['NButton']
NButtonGroup: typeof import('naive-ui')['NButtonGroup']
NCheckbox: typeof import('naive-ui')['NCheckbox']
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
NDialogProvider: typeof import('naive-ui')['NDialogProvider']
NDrawer: typeof import('naive-ui')['NDrawer']
NDropdown: typeof import('naive-ui')['NDropdown']
NEllipsis: typeof import('naive-ui')['NEllipsis']
NEmpty: typeof import('naive-ui')['NEmpty']
NImage: typeof import('naive-ui')['NImage']
NInput: typeof import('naive-ui')['NInput']
NLayout: typeof import('naive-ui')['NLayout']
NMessageProvider: typeof import('naive-ui')['NMessageProvider']
NModal: typeof import('naive-ui')['NModal']
NPagination: typeof import('naive-ui')['NPagination']
NPopover: typeof import('naive-ui')['NPopover']
NScrollbar: typeof import('naive-ui')['NScrollbar']
NSlider: typeof import('naive-ui')['NSlider']

BIN
docs/img/image-6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
docs/img/image-7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
docs/img/image-8.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

11
electron/config.js Normal file
View File

@@ -0,0 +1,11 @@
module.exports = {
// 开发环境配置
development: {
mainPort: 4488,
lyricPort: 4488,
},
// 生产环境配置
production: {
distPath: '../dist',
},
};

View File

@@ -1,5 +1,6 @@
const { BrowserWindow } = require('electron');
const path = require('path');
const config = require('./config');
let lyricWindow = null;
@@ -10,13 +11,16 @@ const createWin = () => {
frame: false,
show: false,
transparent: true,
hasShadow: false,
webPreferences: {
nodeIntegration: true,
nodeIntegration: false,
contextIsolation: true,
preload: `${__dirname}/preload.js`,
contextIsolation: false,
webSecurity: false,
},
});
};
const loadLyricWindow = (ipcMain) => {
ipcMain.on('open-lyric', () => {
if (lyricWindow) {
@@ -28,9 +32,9 @@ const loadLyricWindow = (ipcMain) => {
createWin();
if (process.env.NODE_ENV === 'development') {
lyricWindow.webContents.openDevTools({ mode: 'detach' });
lyricWindow.loadURL('http://localhost:4678/#/lyric');
lyricWindow.loadURL(`http://localhost:${config.development.lyricPort}/#/lyric`);
} else {
const distPath = path.resolve(__dirname, '../dist');
const distPath = path.resolve(__dirname, config.production.distPath);
lyricWindow.loadURL(`file://${distPath}/index.html#/lyric`);
}

View File

@@ -1,5 +1,6 @@
const { contextBridge, ipcRenderer, app } = require('electron');
const { contextBridge, ipcRenderer } = require('electron');
// 主进程通信
contextBridge.exposeInMainWorld('electronAPI', {
minimize: () => ipcRenderer.send('minimize-window'),
maximize: () => ipcRenderer.send('maximize-window'),
@@ -11,18 +12,19 @@ contextBridge.exposeInMainWorld('electronAPI', {
sendLyric: (data) => ipcRenderer.send('send-lyric', data),
});
const electronHandler = {
// 存储相关
contextBridge.exposeInMainWorld('electron', {
ipcRenderer: {
setStoreValue: (key, value) => {
ipcRenderer.send('setStore', key, value);
setStoreValue: (key, value) => ipcRenderer.send('setStore', key, value),
getStoreValue: (key) => ipcRenderer.sendSync('getStore', key),
on: (channel, func) => {
ipcRenderer.on(channel, (event, ...args) => func(...args));
},
getStoreValue(key) {
const resp = ipcRenderer.sendSync('getStore', key);
return resp;
once: (channel, func) => {
ipcRenderer.once(channel, (event, ...args) => func(...args));
},
send: (channel, data) => {
ipcRenderer.send(channel, data);
},
},
app,
};
contextBridge.exposeInMainWorld('electron', electronHandler);
});

View File

@@ -1,5 +1,7 @@
{
"version": "1.5.1",
"isProxy": false,
"author": "alger"
"noAnimate": false,
"animationSpeed": 1,
"author": "Alger",
"authorUrl": "https://github.com/algerkong"
}

69
electron/update.js Normal file
View File

@@ -0,0 +1,69 @@
const { app, BrowserWindow } = require('electron');
const axios = require('axios');
const fs = require('fs');
const path = require('path');
const AdmZip = require('adm-zip');
class Updater {
constructor(mainWindow) {
this.mainWindow = mainWindow;
this.updateUrl = 'http://your-server.com/update'; // 更新服务器地址
this.version = app.getVersion();
}
// 检查更新
async checkForUpdates() {
try {
const response = await axios.get(`${this.updateUrl}/check`, {
params: {
version: this.version,
},
});
if (response.data.hasUpdate) {
await this.downloadUpdate(response.data.downloadUrl);
}
} catch (error) {
console.error('检查更新失败:', error);
}
}
// 下载更新
async downloadUpdate(downloadUrl) {
try {
const response = await axios({
url: downloadUrl,
method: 'GET',
responseType: 'arraybuffer',
});
const tempPath = path.join(app.getPath('temp'), 'update.zip');
fs.writeFileSync(tempPath, response.data);
await this.extractUpdate(tempPath);
} catch (error) {
console.error('下载更新失败:', error);
}
}
// 解压更新
async extractUpdate(zipPath) {
try {
const zip = new AdmZip(zipPath);
const targetPath = path.join(__dirname, '../dist'); // 前端文件目录
// 解压文件
zip.extractAllTo(targetPath, true);
// 删除临时文件
fs.unlinkSync(zipPath);
// 刷新页面
this.mainWindow.webContents.reload();
} catch (error) {
console.error('解压更新失败:', error);
}
}
}
module.exports = Updater;

View File

@@ -1,15 +1,40 @@
<!DOCTYPE html>
<html lang="zh">
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>网抑云 | algerkong</title>
<link rel="manifest" href="./public/manifest.json" />
<link rel="stylesheet" href="./public/icon/iconfont.css" />
<link rel="stylesheet" href="./public/css/animate.css" />
<link rel="stylesheet" href="./public/css/base.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<!-- SEO 元数据 -->
<title>网抑云音乐 | AlgerKong AlgerMusicPlayer</title>
<meta name="description" content="AlgerMusicPlayer 网抑云音乐 基于 网易云音乐API 的一款免费的在线音乐播放器,支持在线播放、歌词显示、音乐下载等功能。提供海量音乐资源,让您随时随地享受音乐。" />
<meta name="keywords" content="AlgerMusic, AlgerMusicPlayer, 网抑云, 音乐播放器, 在线音乐, 免费音乐, 歌词显示, 音乐下载, AlgerKong, 网易云音乐" />
<!-- 作者信息 -->
<meta name="author" content="AlgerKong" />
<meta name="author-url" content="https://github.com/algerkong" />
<!-- PWA 相关 -->
<link rel="manifest" href="/manifest.json" />
<meta name="theme-color" content="#000000" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="apple-mobile-web-app-title" content="网抑云音乐" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
<!-- 资源预加载 -->
<link rel="preload" href="/icon/iconfont.css" as="style" />
<link rel="preload" href="/css/animate.css" as="style" />
<link rel="preload" href="/css/base.css" as="style" />
<!-- 样式表 -->
<link rel="stylesheet" href="/icon/iconfont.css" />
<link rel="stylesheet" href="/css/animate.css" />
<link rel="stylesheet" href="/css/base.css" />
<script defer src="https://cn.vercount.one/js"></script>
<!-- 动画配置 -->
<style>
:root {
--animate-delay: 0.5s;
@@ -19,7 +44,38 @@
<body>
<div id="app"></div>
<div style="display: none;">
Total Page View <span id="vercount_value_page_pv">Loading</span>
Total Visits <span id="vercount_value_site_pv">Loading</span>
Site Total Visitors <span id="vercount_value_site_uv">Loading</span>
</div>
<!-- 收款码图片预加载 -->
<link rel="preload" as="image" href="https://github.com/algerkong/algerkong/blob/main/alipay.jpg?raw=true" />
<link rel="preload" as="image" href="https://github.com/algerkong/algerkong/blob/main/wechat.jpg?raw=true" />
<script type="module" src="/src/main.ts"></script>
<!-- 结构化数据 -->
<script type="application/ld+json">
{
"@context": "https://schema.org",
"@type": "WebApplication",
"name": "网抑云音乐",
"applicationCategory": "MultimediaApplication",
"operatingSystem": "Web, Windows, MacOS",
"author": {
"@type": "Person",
"name": "AlgerKong",
"url": "https://github.com/algerkong"
},
"description": "一款免费的在线音乐播放器,支持在线播放、歌词显示、音乐下载等功能。",
"offers": {
"@type": "Offer",
"price": "0",
"priceCurrency": "CNY"
}
}
</script>
</body>
</html>

View File

@@ -13,10 +13,13 @@
"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 npm run build && electron-builder --config ./build/mac.json",
"b:win": "cross-env NODE_ENV=production npm run build && npm run b:win:x64 && npm run b:win:x86 && npm run b:win:arm"
},
"dependencies": {
"electron-store": "^8.1.0"
"@types/howler": "^2.2.12",
"electron-store": "^8.1.0",
"howler": "^2.2.4"
},
"devDependencies": {
"@tailwindcss/postcss7-compat": "^2.2.4",
@@ -30,7 +33,8 @@
"@vueuse/electron": "^11.0.3",
"autoprefixer": "^10.4.20",
"axios": "^1.7.7",
"electron": "^32.0.1",
"cross-env": "^7.0.3",
"electron": "^32.2.7",
"electron-builder": "^25.0.5",
"eslint": "^8.56.0",
"eslint-config-airbnb-base": "^15.0.0",
@@ -42,11 +46,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",
"sass": "^1.82.0",
"tailwindcss": "^3.4.15",
"typescript": "^5.5.4",
"unplugin-auto-import": "^0.18.2",
"unplugin-vue-components": "^0.27.4",
@@ -57,7 +61,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"
}
}

View File

@@ -1,6 +1,5 @@
<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>
@@ -9,30 +8,22 @@
</div>
</template>
<script lang="ts" setup>
<script setup lang="ts">
import { darkTheme } from 'naive-ui';
import { onMounted } from '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) {
const setData = windowData.electron.ipcRenderer.getStoreValue('set');
store.commit('setSetData', setData);
}
store.dispatch('initializeSettings');
});
</script>
<style lang="scss" scoped>
div {
box-sizing: border-box;
}
.app {
.app-container {
@apply h-full w-full;
user-select: none;
}

44
src/components/Coffee.vue Normal file
View File

@@ -0,0 +1,44 @@
<template>
<div class="relative inline-block">
<n-popover trigger="hover" placement="top" :show-arrow="true" :raw="true" :delay="100">
<template #trigger>
<slot>
<n-button
quaternary
class="inline-flex items-center gap-2 px-4 py-2 transition-all duration-300 hover:-translate-y-0.5"
>
请我喝咖啡
</n-button>
</slot>
</template>
<div class="p-6 bg-black rounded-lg shadow-lg">
<div class="flex gap-6">
<div class="flex flex-col items-center gap-2">
<n-image :src="alipayQR" alt="支付宝收款码" class="w-32 h-32 rounded-lg" preview-disabled />
<span class="text-sm text-gray-100">支付宝</span>
</div>
<div class="flex flex-col items-center gap-2">
<n-image :src="wechatQR" alt="微信收款码" class="w-32 h-32 rounded-lg" preview-disabled />
<span class="text-sm text-gray-100">微信支付</span>
</div>
</div>
</div>
</n-popover>
</div>
</template>
<script setup>
import { NButton, NImage, NPopover } from 'naive-ui';
defineProps({
alipayQR: {
type: String,
required: true,
},
wechatQR: {
type: String,
required: true,
},
});
</script>

View File

@@ -1,7 +1,7 @@
<template>
<n-drawer
:show="show"
:height="isMobile ? '100vh' : '70vh'"
:height="isMobile ? '100vh' : '80vh'"
placement="bottom"
block-scroll
mask-closable
@@ -9,41 +9,62 @@
@mask-click="close"
>
<div class="music-page">
<div class="music-close">
<i class="icon ri-layout-column-line" @click="doubleDisply = !doubleDisply"></i>
<i class="icon iconfont icon-icon_error" @click="close"></i>
<div class="music-header h-12 flex items-center justify-between">
<n-ellipsis :line-clamp="1">
<div class="music-title">
{{ name }}
</div>
</n-ellipsis>
<div class="music-close">
<i class="icon iconfont icon-icon_error" @click="close"></i>
</div>
</div>
<div class="music-title text-el">{{ name }}</div>
<!-- 歌单歌曲列表 -->
<div class="music-list">
<n-scrollbar @scroll="handleScroll">
<div
v-loading="loading || !songList.length"
class="music-list-content"
:class="{ 'double-list': doubleDisply }"
>
<div
v-for="(item, index) in displayedSongs"
:key="item.id"
class="double-item"
:class="setAnimationClass('animate__bounceInUp')"
:style="setAnimationDelay(index, 5)"
>
<song-item :item="formatDetail(item)" @play="handlePlay" />
<div class="music-content">
<!-- 左侧歌单信息 -->
<div class="music-info">
<div class="music-cover">
<n-image
:src="getImgUrl(listInfo?.coverImgUrl, '300y300')"
class="cover-img"
preview-disabled
:class="setAnimationClass('animate__fadeIn')"
object-fit="cover"
/>
</div>
<div class="music-detail">
<div v-if="listInfo?.creator" class="creator-info">
<n-avatar round :size="24" :src="getImgUrl(listInfo.creator.avatarUrl, '50y50')" />
<span class="creator-name">{{ listInfo.creator.nickname }}</span>
</div>
<div v-if="isLoadingMore" class="loading-more">加载更多...</div>
<div v-if="listInfo?.description" class="music-desc">
<n-ellipsis :line-clamp="isMobile ? 3 : 10">
{{ listInfo.description }}
</n-ellipsis>
</div>
</div>
</div>
<!-- 右侧歌曲列表 -->
<div class="music-list-container">
<div v-loading="loading" class="music-list">
<n-scrollbar @scroll="handleScroll">
<div v-loading="loading || !songList.length" class="music-list-content">
<div
v-for="(item, index) in displayedSongs"
:key="item.id"
class="double-item"
:class="setAnimationClass('animate__bounceInUp')"
:style="getItemAnimationDelay(index)"
>
<song-item :item="formatDetail(item)" @play="handlePlay" />
</div>
<div v-if="isLoadingMore" class="loading-more">加载更多...</div>
<play-bottom />
</div>
</n-scrollbar>
</div>
<play-bottom />
</n-scrollbar>
<!-- <n-virtual-list :item-size="42" :items="displayedSongs" item-resizable @scroll="handleScroll">
<template #default="{ item, index }">
<div :key="item.id" class="double-item">
<song-item :item="formatDetail(item)" @play="handlePlay" />
</div>
</template>
</n-virtual-list>
<play-bottom /> -->
</div>
</div>
</div>
</n-drawer>
@@ -54,33 +75,36 @@ import { useStore } from 'vuex';
import { getMusicDetail } from '@/api/music';
import SongItem from '@/components/common/SongItem.vue';
import { isMobile, setAnimationClass, setAnimationDelay } from '@/utils';
import { getImgUrl, isMobile, setAnimationClass, setAnimationDelay } from '@/utils';
import PlayBottom from './common/PlayBottom.vue';
const store = useStore();
const {
songList,
loading = false,
listInfo,
} = defineProps<{
const props = defineProps<{
show: boolean;
name: string;
songList: any[];
loading?: boolean;
listInfo?: any;
listInfo?: {
trackIds: { id: number }[];
[key: string]: any;
};
}>();
const emit = defineEmits(['update:show', 'update:loading']);
const page = ref(0);
const pageSize = 20;
const total = ref(0);
const isLoadingMore = ref(false);
const displayedSongs = ref<any[]>([]);
// 双排显示开关
const doubleDisply = ref(false);
// 计算总数
const total = computed(() => {
if (props.listInfo?.trackIds) {
return props.listInfo.trackIds.length;
}
return props.songList.length;
});
const formatDetail = computed(() => (detail: any) => {
const song = {
@@ -95,7 +119,7 @@ const formatDetail = computed(() => (detail: any) => {
});
const handlePlay = () => {
const tracks = songList || [];
const tracks = props.songList || [];
store.commit(
'setPlayList',
tracks.map((item) => ({
@@ -112,65 +136,128 @@ const close = () => {
emit('update:show', false);
};
// 优化加载更多歌曲的函数
const loadMoreSongs = async () => {
if (displayedSongs.value.length >= total.value) return;
if (isLoadingMore.value || displayedSongs.value.length >= total.value) return;
isLoadingMore.value = true;
try {
const trackIds = listInfo.trackIds
.slice(page.value * pageSize, (page.value + 1) * pageSize)
.map((item: any) => item.id);
const reslist = await getMusicDetail(trackIds);
// displayedSongs.value = displayedSongs.value.concat(reslist.data.songs);
displayedSongs.value = JSON.parse(JSON.stringify([...displayedSongs.value, ...reslist.data.songs]));
page.value++;
if (props.listInfo?.trackIds) {
// 如果有 trackIds需要分批请求歌曲详情
const start = page.value * pageSize;
const end = Math.min((page.value + 1) * pageSize, total.value);
const trackIds = props.listInfo.trackIds.slice(start, end).map((item) => item.id);
if (trackIds.length > 0) {
const { data } = await getMusicDetail(trackIds);
displayedSongs.value = [...displayedSongs.value, ...data.songs];
page.value++;
}
} else {
// 如果没有 trackIds直接使用 songList 分页
const start = page.value * pageSize;
const end = Math.min((page.value + 1) * pageSize, props.songList.length);
const newSongs = props.songList.slice(start, end);
displayedSongs.value = [...displayedSongs.value, ...newSongs];
page.value++;
}
} catch (error) {
console.error('error', error);
console.error('加载歌曲失败:', error);
} finally {
isLoadingMore.value = false;
}
};
const handleScroll = (e: any) => {
const { scrollTop, scrollHeight, clientHeight } = e.target;
if (scrollTop + clientHeight >= scrollHeight - 50 && !isLoadingMore.value) {
const getItemAnimationDelay = (index: number) => {
const currentPageIndex = index % pageSize;
return setAnimationDelay(currentPageIndex, 20);
};
// 修改滚动处理函数
const handleScroll = (e: Event) => {
const target = e.target as HTMLElement;
if (!target) return;
const { scrollTop, scrollHeight, clientHeight } = target;
if (scrollHeight - scrollTop - clientHeight < 100 && !isLoadingMore.value) {
loadMoreSongs();
}
};
// 监听 songList 变化,重置分页状态
watch(
() => songList,
() => props.songList,
(newSongs) => {
displayedSongs.value = JSON.parse(JSON.stringify(newSongs));
total.value = listInfo ? listInfo.trackIds.length : displayedSongs.value.length;
page.value = 0;
displayedSongs.value = newSongs.slice(0, pageSize);
if (newSongs.length > pageSize) {
page.value = 1;
}
},
{ deep: true, immediate: true },
{ immediate: true },
);
</script>
<style scoped lang="scss">
.music {
&-title {
@apply text-xl font-bold text-white;
}
&-page {
@apply px-8 w-full h-full bg-black bg-opacity-75 rounded-t-2xl;
backdrop-filter: blur(20px);
}
&-title {
@apply text-lg font-bold text-white p-4;
}
&-close {
@apply absolute top-4 right-8 cursor-pointer text-white flex gap-2 items-center;
@apply cursor-pointer text-white flex gap-2 items-center;
.icon {
@apply text-3xl;
}
}
&-list {
height: calc(100% - 60px);
&-content {
@apply flex h-[calc(100%-60px)];
}
&-content {
min-height: 400px;
&-info {
@apply w-[25%] flex-shrink-0 pr-8 flex flex-col;
.music-cover {
@apply w-full aspect-square rounded-lg overflow-hidden mb-4;
.cover-img {
@apply w-full h-full object-cover;
}
}
.music-detail {
@apply flex flex-col flex-grow;
.creator-info {
@apply flex items-center mb-4;
.creator-name {
@apply ml-2 text-sm text-gray-300;
}
}
.music-desc {
@apply text-sm text-gray-400;
}
}
}
&-list-container {
@apply flex-grow min-h-0 flex flex-col relative;
}
&-list {
@apply flex-grow min-h-0;
:deep(.n-virtual-list__scroll) {
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
}
}
@@ -179,6 +266,21 @@ watch(
.music-page {
@apply px-4;
}
.music-content {
@apply flex-col;
}
.music-info {
@apply w-full pr-0 mb-2 flex flex-row;
.music-cover {
@apply w-[100px] h-[100px] rounded-lg overflow-hidden mb-4;
}
.music-detail {
@apply flex-1 ml-4;
}
}
}
.loading-more {
@@ -186,10 +288,8 @@ watch(
}
.double-list {
@apply flex flex-wrap gap-5;
.double-item {
width: calc(50% - 10px);
width: 100%;
}
.song-item {

View File

@@ -44,9 +44,9 @@
<div class="controls-main">
<div class="left-controls">
<n-tooltip placement="top">
<n-tooltip v-if="!props.noList" placement="top">
<template #trigger>
<n-button quaternary circle :disabled="isPrevDisabled" @click="handlePrev">
<n-button quaternary circle @click="handlePrev">
<template #icon>
<n-icon size="24">
<n-spin v-if="prevLoading" size="small" />
@@ -72,7 +72,7 @@
{{ isPlaying ? '暂停' : '播放' }}
</n-tooltip>
<n-tooltip placement="top">
<n-tooltip v-if="!props.noList" placement="top">
<template #trigger>
<n-button quaternary circle @click="handleNext">
<template #icon>
@@ -90,7 +90,7 @@
</div>
<div class="right-controls">
<div class="volume-control custom-slider">
<div v-if="!isMobile" class="volume-control custom-slider">
<n-tooltip placement="top">
<template #trigger>
<n-button quaternary circle @click="toggleMute">
@@ -106,7 +106,7 @@
<n-slider v-model:value="volume" :min="0" :max="100" :tooltip="false" class="volume-slider" />
</div>
<n-tooltip placement="top">
<n-tooltip v-if="!props.noList" placement="top">
<template #trigger>
<n-button quaternary circle class="play-mode-btn" @click="togglePlayMode">
<template #icon>
@@ -171,8 +171,8 @@
</template>
<script setup lang="ts">
import { NButton, NIcon, NSlider, NTooltip, useMessage } from 'naive-ui';
import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
import { NButton, NIcon, NSlider, NTooltip } from 'naive-ui';
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
import { useStore } from 'vuex';
import { getMvUrl } from '@/api/mv';
@@ -184,10 +184,18 @@ const PLAY_MODE = {
Auto: 'auto' as PlayMode,
} as const;
const props = defineProps<{
show: boolean;
currentMv?: IMvItem;
}>();
const props = withDefaults(
defineProps<{
show: boolean;
currentMv?: IMvItem;
noList?: boolean;
}>(),
{
show: false,
currentMv: undefined,
noList: false,
},
);
const emit = defineEmits<{
(e: 'update:show', value: boolean): void;
@@ -292,6 +300,7 @@ onUnmounted(() => {
if (cursorTimer) {
clearTimeout(cursorTimer);
}
unlockScreenOrientation();
});
// 监听 currentMv 的变化
@@ -345,7 +354,9 @@ const handleEnded = () => {
}
} else {
// 自动播放模式,触发下一个
emit('next');
emit('next', (value: boolean) => {
nextLoading.value = value;
});
}
};
@@ -369,9 +380,9 @@ const checkFullscreenAPI = () => {
return {
requestFullscreen:
videoContainerRef.value?.requestFullscreen ||
videoContainerRef.value?.webkitRequestFullscreen ||
videoContainerRef.value?.mozRequestFullScreen ||
videoContainerRef.value?.msRequestFullscreen,
(videoContainerRef.value as any)?.webkitRequestFullscreen ||
(videoContainerRef.value as any)?.mozRequestFullScreen ||
(videoContainerRef.value as any)?.msRequestFullscreen,
exitFullscreen: doc.exitFullscreen || doc.webkitExitFullscreen || doc.mozCancelFullScreen || doc.msExitFullscreen,
fullscreenElement:
doc.fullscreenElement || doc.webkitFullscreenElement || doc.mozFullScreenElement || doc.msFullscreenElement,
@@ -380,7 +391,28 @@ const checkFullscreenAPI = () => {
};
};
// 切换全屏状态
// 添加横屏锁定功能
const lockScreenOrientation = async () => {
try {
if ('orientation' in screen) {
await (screen as any).orientation.lock('landscape');
}
} catch (error) {
console.warn('无法锁定屏幕方向:', error);
}
};
const unlockScreenOrientation = () => {
try {
if ('orientation' in screen) {
(screen as any).orientation.unlock();
}
} catch (error) {
console.warn('无法解锁屏幕方向:', error);
}
};
// 修改切换全屏状态的方法
const toggleFullscreen = async () => {
const api = checkFullscreenAPI();
@@ -393,9 +425,17 @@ const toggleFullscreen = async () => {
if (!api.fullscreenElement) {
await videoContainerRef.value?.requestFullscreen();
isFullscreen.value = true;
// 在移动端进入全屏时锁定横屏
if (window.innerWidth <= 768) {
await lockScreenOrientation();
}
} else {
await document.exitFullscreen();
isFullscreen.value = false;
// 退出全屏时解锁屏幕方向
if (window.innerWidth <= 768) {
unlockScreenOrientation();
}
}
} catch (error) {
console.error('切换全屏失败:', error);
@@ -441,9 +481,6 @@ onUnmounted(() => {
document.removeEventListener('keydown', handleKeyPress);
});
// 在 setup 中初始化 message
const message = useMessage();
// 添加提示状态
const showModeHint = ref(false);
@@ -506,16 +543,54 @@ watch(showControls, (newValue) => {
resetCursorTimer();
}
});
const isMobile = computed(() => store.state.isMobile);
</script>
<style scoped lang="scss">
.mv-detail {
@apply w-full h-full bg-black relative;
// 添加横屏模式支持
@media screen and (orientation: landscape) {
height: 100vh !important;
width: 100vw !important;
}
.video-container {
@apply w-full h-full relative;
transition: cursor 0.3s ease;
// 移动端适配
@media (max-width: 768px) {
.custom-controls {
.controls-main {
@apply flex-wrap gap-2 justify-center;
.left-controls,
.right-controls {
@apply w-full justify-center;
}
.time-display {
@apply order-first w-full text-center mb-2;
}
}
}
// 调整标题样式
.mv-detail-title {
.title {
@apply text-base max-w-full;
}
}
// 调整进度条
.progress-bar {
@apply mb-2;
}
}
&.cursor-hidden {
* {
cursor: none !important;

View File

@@ -5,10 +5,21 @@
<div>
<template v-for="(item, index) in playlistCategory?.sub" :key="item.name">
<span
v-show="isShowAllPlaylistCategory || index <= 19"
v-show="isShowAllPlaylistCategory || index <= 19 || isHiding"
class="play-list-type-item"
:class="setAnimationClass('animate__bounceIn')"
:style="setAnimationDelay(index <= 19 ? index : index - 19)"
:class="
setAnimationClass(
index <= 19
? 'animate__bounceIn'
: !isShowAllPlaylistCategory
? 'animate__backOutLeft'
: 'animate__bounceIn',
) +
' ' +
'type-item-' +
index
"
:style="getAnimationDelay(index)"
@click="handleClickPlaylistType(item.name)"
>{{ item.name }}</span
>
@@ -17,7 +28,7 @@
class="play-list-type-showall"
:class="setAnimationClass('animate__bounceIn')"
:style="setAnimationDelay(!isShowAllPlaylistCategory ? 25 : playlistCategory?.sub.length || 100 + 30)"
@click="isShowAllPlaylistCategory = !isShowAllPlaylistCategory"
@click="handleToggleShowAllPlaylistCategory"
>
{{ !isShowAllPlaylistCategory ? '显示全部' : '隐藏一些' }}
</div>
@@ -26,7 +37,7 @@
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { computed, onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import { getPlaylistCategory } from '@/api/home';
@@ -36,6 +47,59 @@ import { setAnimationClass, setAnimationDelay } from '@/utils';
const playlistCategory = ref<IPlayListSort>();
// 是否显示全部歌单分类
const isShowAllPlaylistCategory = ref<boolean>(false);
const DELAY_TIME = 40;
const getAnimationDelay = computed(() => {
return (index: number) => {
if (index <= 19) {
return setAnimationDelay(index, DELAY_TIME);
}
if (!isShowAllPlaylistCategory.value) {
const nowIndex = (playlistCategory.value?.sub.length || 0) - index;
return setAnimationDelay(nowIndex, DELAY_TIME);
}
return setAnimationDelay(index - 19, DELAY_TIME);
};
});
watch(isShowAllPlaylistCategory, (newVal) => {
if (!newVal) {
const elements = playlistCategory.value?.sub.map((item, index) =>
document.querySelector(`.type-item-${index}`),
) as HTMLElement[];
elements
.slice(20)
.reverse()
.forEach((element, index) => {
if (element) {
setTimeout(
() => {
(element as HTMLElement).style.position = 'absolute';
},
index * DELAY_TIME + 400,
);
}
});
setTimeout(
() => {
isHiding.value = false;
document.querySelectorAll('.play-list-type-item').forEach((element) => {
if (element) {
console.log('element', element);
(element as HTMLElement).style.position = 'none';
}
});
},
(playlistCategory.value?.sub.length || 0 - 19) * DELAY_TIME,
);
} else {
document.querySelectorAll('.play-list-type-item').forEach((element) => {
if (element) {
(element as HTMLElement).style.position = 'none';
}
});
}
});
// 加载歌单分类
const loadPlaylistCategory = async () => {
@@ -52,6 +116,14 @@ const handleClickPlaylistType = (type: string) => {
},
});
};
const isHiding = ref<boolean>(false);
const handleToggleShowAllPlaylistCategory = () => {
isShowAllPlaylistCategory.value = !isShowAllPlaylistCategory.value;
if (!isShowAllPlaylistCategory.value) {
isHiding.value = true;
}
};
// 页面初始化
onMounted(() => {
loadPlaylistCategory();

View File

@@ -1,6 +1,6 @@
<template>
<div class="recommend-album">
<div class="title" :class="setAnimationClass('animate__fadeInLeft')">最新专辑</div>
<div class="title" :class="setAnimationClass('animate__fadeInRight')">最新专辑</div>
<div class="recommend-album-list">
<template v-for="(item, index) in albumData?.albums" :key="item.id">
<div

View File

@@ -89,7 +89,6 @@ const loadData = async () => {
const {
data: { data: dayRecommend },
} = await getDayRecommend();
console.log('dayRecommend', dayRecommend);
// 处理数据
if (dayRecommend) {
singerData.artists = singerData.artists.slice(0, 4);

View File

@@ -0,0 +1,119 @@
<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 mb-2">在桌面安装应用获得更好的体验</p>
<n-checkbox v-model:checked="noPrompt">不再提示</n-checkbox>
</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 noPrompt = ref(false);
const closeModal = () => {
showModal.value = false;
if (noPrompt.value) {
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.exe',
// };
// // 根据操作系统选择下载链接
// let downloadUrl = '';
// if (isMac) {
// downloadUrl = urls.mac;
// } else if (isWindows) {
// downloadUrl = urls.windows;
// }
const downloadUrl = 'https://github.com/algerkong/AlgerMusicPlayer/releases';
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>

View File

@@ -15,6 +15,8 @@
<script setup lang="ts">
import { useStore } from 'vuex';
import { audioService } from '@/services/audioService';
const props = defineProps<{
show: boolean;
title: string;
@@ -29,6 +31,7 @@ watch(
if (val) {
store.commit('setIsPlay', false);
store.commit('setPlayMusic', false);
audioService.getCurrentSound()?.pause();
}
},
);

View File

@@ -18,14 +18,17 @@
:song-list="songList"
:list-info="listInfo"
/>
<PlayVideo v-if="item.type === 'mv'" v-model:show="showPop" :title="item.name" :url="url" />
<mv-player v-if="item.type === 'mv'" v-model:show="showPop" :current-mv="getCurrentMv()" no-list />
</div>
</template>
<script setup lang="ts">
import { useStore } from 'vuex';
import { getAlbum, getListDetail } from '@/api/list';
import { getMvUrl } from '@/api/mv';
import MvPlayer from '@/components/MvPlayer.vue';
import { audioService } from '@/services/audioService';
import { IMvItem } from '@/type/mv';
import { getImgUrl } from '@/utils';
const props = defineProps<{
@@ -38,13 +41,20 @@ const props = defineProps<{
};
}>();
const url = ref('');
const songList = ref<any[]>([]);
const showPop = ref(false);
const listInfo = ref<any>(null);
const getCurrentMv = () => {
return {
id: props.item.id,
name: props.item.name,
} as unknown as IMvItem;
};
const store = useStore();
const handleClick = async () => {
listInfo.value = null;
if (props.item.type === '专辑') {
@@ -64,8 +74,9 @@ const handleClick = async () => {
}
if (props.item.type === 'mv') {
const res = await getMvUrl(props.item.id);
url.value = res.data.data.url;
store.commit('setIsPlay', false);
store.commit('setPlayMusic', false);
audioService.getCurrentSound()?.pause();
showPop.value = true;
}
};

View File

@@ -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,20 +12,31 @@
@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-like">
<i class="iconfont icon-likefill"></i>
<div class="song-item-operating" :class="{ 'song-item-operating-list': list }">
<div v-if="favorite" class="song-item-operating-like">
<i class="iconfont icon-likefill" :class="{ 'like-active': isFavorite }" @click.stop="toggleFavorite"></i>
</div>
<div
class="song-item-operating-play bg-black animate__animated"
@@ -40,9 +51,10 @@
</template>
<script lang="ts" setup>
import { useTemplateRef } from 'vue';
import { computed, useTemplateRef } from 'vue';
import { useStore } from 'vuex';
import { audioService } from '@/services/audioService';
import type { SongResult } from '@/type/music';
import { getImgUrl } from '@/utils';
import { getImageBackground } from '@/utils/linearColor';
@@ -51,9 +63,13 @@ const props = withDefaults(
defineProps<{
item: SongResult;
mini?: boolean;
list?: boolean;
favorite?: boolean;
}>(),
{
mini: false,
list: false,
favorite: true,
},
);
@@ -90,8 +106,10 @@ const playMusicEvent = async (item: SongResult) => {
if (playMusic.value.id === item.id) {
if (play.value) {
store.commit('setPlayMusic', false);
audioService.getCurrentSound()?.pause();
} else {
store.commit('setPlayMusic', true);
audioService.getCurrentSound()?.play();
}
return;
}
@@ -99,6 +117,21 @@ const playMusicEvent = async (item: SongResult) => {
store.commit('setIsPlay', true);
emits('play', item);
};
// 判断是否已收藏
const isFavorite = computed(() => {
return store.state.favoriteList.includes(props.item.id);
});
// 切换收藏状态
const toggleFavorite = async (e: Event) => {
e.stopPropagation();
if (isFavorite.value) {
store.commit('removeFromFavorite', props.item.id);
} else {
store.commit('addToFavorite', props.item.id);
}
};
</script>
<style lang="scss" scoped>
@@ -126,7 +159,7 @@ const playMusicEvent = async (item: SongResult) => {
}
}
&-operating {
@apply flex items-center pl-4 rounded-full border border-gray-700 ml-4;
@apply flex items-center rounded-full border border-gray-700 ml-4;
background-color: #0d0d0d;
.iconfont {
@apply text-xl;
@@ -136,7 +169,10 @@ const playMusicEvent = async (item: SongResult) => {
@apply text-xl hover:text-red-600 transition;
}
&-like {
@apply mr-2 cursor-pointer;
@apply mr-2 cursor-pointer ml-4;
}
.like-active {
@apply text-red-600;
}
&-play {
@apply cursor-pointer border border-gray-500 rounded-full w-10 h-10 flex justify-center items-center hover:bg-green-600 transition;
@@ -167,7 +203,7 @@ const playMusicEvent = async (item: SongResult) => {
@apply text-base;
}
&-like {
@apply mr-1;
@apply mr-1 ml-1;
}
&-play {
@apply w-8 h-8;
@@ -175,4 +211,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>

View File

@@ -1,8 +1,7 @@
import { computed, ref } from 'vue';
import { getMusicLrc } from '@/api/music';
import { audioService } from '@/services/audioService';
import store from '@/store';
import { ILyric } from '@/type/lyric';
import type { ILyricText, SongResult } from '@/type/music';
const windowData = window as any;
@@ -16,8 +15,34 @@ export const allTime = ref(0); // 总播放时间
export const nowIndex = ref(0); // 当前播放歌词
export const correctionTime = ref(0.4); // 歌词矫正时间Correction time
export const currentLrcProgress = ref(0); // 来存储当前歌词的进度
export const audio = ref<HTMLAudioElement>(); // 音频对象
export const playMusic = computed(() => store.state.playMusic as SongResult); // 当前播放歌曲
export const sound = ref<Howl | null>(audioService.getCurrentSound());
document.onkeyup = (e) => {
switch (e.code) {
case 'Space':
if (store.state.play) {
store.commit('setPlayMusic', false);
audioService.getCurrentSound()?.pause();
} else {
store.commit('setPlayMusic', true);
audioService.getCurrentSound()?.play();
}
break;
default:
}
};
watch(
() => store.state.playMusicUrl,
(newVal) => {
if (newVal) {
audioService.play(newVal);
sound.value = audioService.getCurrentSound();
audioServiceOn(audioService);
}
},
);
watch(
() => store.state.playMusic,
@@ -31,6 +56,48 @@ watch(
deep: true,
},
);
export const audioServiceOn = (audio: typeof audioService) => {
let interval: any = null;
// 监听播放
audio.onPlay(() => {
store.commit('setPlayMusic', true);
interval = setInterval(() => {
nowTime.value = sound.value?.seek() as number;
allTime.value = sound.value?.duration() as number;
const newIndex = getLrcIndex(nowTime.value);
if (newIndex !== nowIndex.value) {
nowIndex.value = newIndex;
currentLrcProgress.value = 0;
}
if (isElectron.value) {
sendLyricToWin();
}
}, 50);
});
// 监听暂停
audio.onPause(() => {
store.commit('setPlayMusic', false);
clearInterval(interval);
});
// 监听结束
audio.onEnd(() => {
handleEnded();
store.commit('nextPlay');
});
};
export const play = () => {
audioService.getCurrentSound()?.play();
};
export const pause = () => {
audioService.getCurrentSound()?.pause();
};
const isPlaying = computed(() => store.state.play as boolean);
// 增加矫正时间
@@ -80,25 +147,18 @@ export const getLrcStyle = (index: number) => {
return {};
};
watch(nowTime, (newTime) => {
const newIndex = getLrcIndex(newTime);
if (newIndex !== nowIndex.value) {
nowIndex.value = newIndex;
currentLrcProgress.value = 0; // 重置进度
}
});
// 播放进度
export const useLyricProgress = () => {
let animationFrameId: number | null = null;
const updateProgress = () => {
if (!isPlaying.value) return;
audio.value = audio.value || (document.querySelector('#MusicAudio') as HTMLAudioElement);
if (!audio.value) return;
const currentSound = sound.value;
if (!currentSound) return;
const { start, end } = currentLrcTiming.value;
const duration = end - start;
const elapsed = audio.value.currentTime - start;
const elapsed = (currentSound.seek() as number) - start;
currentLrcProgress.value = Math.min(Math.max((elapsed / duration) * 100, 0), 100);
animationFrameId = requestAnimationFrame(updateProgress);
@@ -142,9 +202,12 @@ export const useLyricProgress = () => {
};
// 设置当前播放时间
export const setAudioTime = (index: number, audio: HTMLAudioElement) => {
audio.currentTime = lrcTimeArray.value[index];
audio.play();
export const setAudioTime = (index: number) => {
const currentSound = sound.value;
if (!currentSound) return;
currentSound.seek(lrcTimeArray.value[index]);
currentSound.play();
};
// 获取当前播放的歌词
@@ -156,43 +219,99 @@ export const getCurrentLrc = () => {
};
};
// 获取一句歌词播放时间几秒到几秒
// 获取一句歌词播放时间几秒到几秒
export const getLrcTimeRange = (index: number) => ({
currentTime: lrcTimeArray.value[index],
nextTime: lrcTimeArray.value[index + 1],
});
// 监听歌词数组变化,当切换歌曲时重新初始化歌词窗口
watch(
() => lrcArray.value,
(newLrcArray) => {
if (newLrcArray.length > 0 && isElectron.value) {
// 重新初始化歌词数据
initLyricWindow();
// 发送当前状态
sendLyricToWin();
}
},
);
// 监听播放状态变化
watch(isPlaying, (newIsPlaying) => {
if (isElectron.value) {
sendLyricToWin(newIsPlaying);
}
});
// 处理歌曲结束
export const handleEnded = () => {
if (isElectron.value) {
setTimeout(() => {
initLyricWindow();
sendLyricToWin();
}, 100);
}
};
// 初始化歌词数据
export const initLyricWindow = () => {
if (!isElectron.value) return;
try {
if (lrcArray.value.length > 0) {
console.log('Initializing lyric window with data:', {
lrcArray: lrcArray.value,
lrcTimeArray: lrcTimeArray.value,
allTime: allTime.value,
});
const staticData = {
type: 'init',
lrcArray: lrcArray.value,
lrcTimeArray: lrcTimeArray.value,
allTime: allTime.value,
};
windowData.electronAPI.sendLyric(JSON.stringify(staticData));
} else {
console.log('No lyrics available for initialization');
}
} catch (error) {
console.error('Error initializing lyric window:', error);
}
};
// 发送歌词更新数据
export const sendLyricToWin = (isPlay: boolean = true) => {
if (!isElectron.value) return;
try {
if (lrcArray.value.length > 0) {
const nowIndex = getLrcIndex(nowTime.value);
const { currentLrc, nextLrc } = getCurrentLrc();
const { currentTime, nextTime } = getLrcTimeRange(nowIndex);
// 设置lyricWinData 获取 当前播放的两句歌词 和歌词时间
const lyricWinData = {
currentLrc,
nextLrc,
currentTime,
nextTime,
const updateData = {
type: 'update',
nowIndex,
lrcTimeArray: lrcTimeArray.value,
lrcArray: lrcArray.value,
nowTime: nowTime.value,
allTime: allTime.value,
startCurrentTime: lrcTimeArray.value[nowIndex],
nextTime: lrcTimeArray.value[nowIndex + 1],
isPlay,
};
windowData.electronAPI.sendLyric(JSON.stringify(lyricWinData));
windowData.electronAPI.sendLyric(JSON.stringify(updateData));
}
} catch (error) {
console.error('Error sending lyric to window:', error);
console.error('Error sending lyric update:', error);
}
};
export const openLyric = () => {
if (!isElectron.value) return;
console.log('Opening lyric window');
windowData.electronAPI.openLyric();
sendLyricToWin();
// 延迟一下初始化,确保窗口已经创建
setTimeout(() => {
console.log('Initializing lyric window after delay');
initLyricWindow();
sendLyricToWin();
}, 500);
};

View File

@@ -1,5 +1,8 @@
import { Howl } from 'howler';
import { getMusicLrc, getMusicUrl, getParsingMusicUrl } from '@/api/music';
import { useMusicHistory } from '@/hooks/MusicHistoryHook';
import { audioService } from '@/services/audioService';
import type { ILyric, ILyricText, SongResult } from '@/type/music';
import { getImgUrl, getMusicProxyUrl } from '@/utils';
import { getImageLinearBackground } from '@/utils/linearColor';
@@ -23,9 +26,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 } =
@@ -56,9 +56,13 @@ export const useMusicListHook = () => {
// 用于预加载下一首歌曲的 MP3 数据
const preloadNextSong = (nextSongUrl: string) => {
const audio = new Audio(nextSongUrl);
audio.preload = 'auto'; // 设置预加载
audio.load(); // 手动加载
const sound = new Howl({
src: [nextSongUrl],
html5: true,
preload: true,
autoplay: false,
});
return sound;
};
const fetchSongs = async (state: any, startIndex: number, endIndex: number) => {
@@ -169,9 +173,19 @@ export const useMusicListHook = () => {
state.playMusic.lyric = lyrics;
};
const play = () => {
audioService.getCurrentSound()?.play();
};
const pause = () => {
audioService.getCurrentSound()?.pause();
};
return {
handlePlayMusic,
nextPlay,
prevPlay,
play,
pause,
};
};

View File

@@ -29,6 +29,7 @@
<!-- 底部音乐播放 -->
<play-bar v-if="isPlay" />
</div>
<install-app-modal></install-app-modal>
</div>
</template>
@@ -36,6 +37,7 @@
import { useRoute } from 'vue-router';
import { useStore } from 'vuex';
import InstallAppModal from '@/components/common/InstallAppModal.vue';
import PlayBottom from '@/components/common/PlayBottom.vue';
import { isElectron } from '@/hooks/MusicHook';
import homeRouter from '@/router/home';
@@ -62,68 +64,9 @@ const store = useStore();
const isPlay = computed(() => store.state.isPlay as boolean);
const { menus } = store.state;
const play = computed(() => store.state.play as boolean);
const route = useRoute();
const audio = {
value: document.querySelector('#MusicAudio') as HTMLAudioElement,
};
const backgroundColor = ref('#000');
// watch(
// () => store.state.playMusic,
// () => {
// backgroundColor.value = store.state.playMusic.backgroundColor;
// console.log('backgroundColor.value', backgroundColor.value);
// },
// {
// immediate: true,
// deep: true,
// },
// );
onMounted(() => {
// 监听音乐是否播放
watch(
() => play.value,
(value) => {
if (value && audio.value) {
audioPlay();
} else {
audioPause();
}
},
);
document.onkeyup = (e) => {
switch (e.code) {
case 'Space':
playMusicEvent();
break;
default:
}
};
});
const audioPlay = () => {
if (audio.value) {
audio.value.play();
}
};
const audioPause = () => {
if (audio.value) {
audio.value.pause();
}
};
const playMusicEvent = async () => {
if (play.value) {
store.commit('setPlayMusic', false);
} else {
store.commit('setPlayMusic', true);
}
};
</script>
<style lang="scss" scoped>

View File

@@ -12,8 +12,8 @@
<div>
<div class="music-content-name">{{ playMusic.name }}</div>
<div class="music-content-singer">
<span v-for="(item, index) in playMusic.song.artists" :key="index">
{{ item.name }}{{ index < playMusic.song.artists.length - 1 ? ' / ' : '' }}
<span v-for="(item, index) in playMusic.ar || playMusic.song.artists" :key="index">
{{ item.name }}{{ index < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}
</span>
</div>
</div>
@@ -33,8 +33,8 @@
:id="`music-lrc-text-${index}`"
:key="index"
class="music-lrc-text"
:class="{ 'now-text': index === nowIndex }"
@click="setAudioTime(index, audio)"
:class="{ 'now-text': index === nowIndex, 'hover-text': item.text }"
@click="setAudioTime(index)"
>
<span :style="getLrcStyle(index)">{{ item.text }}</span>
<div class="music-lrc-text-tr">{{ item.trText }}</div>
@@ -75,10 +75,6 @@ const props = defineProps({
type: Boolean,
default: false,
},
audio: {
type: HTMLAudioElement,
default: null,
},
background: {
type: String,
default: '',
@@ -220,7 +216,6 @@ defineExpose({
#drawer-target {
@apply top-0 left-0 absolute overflow-hidden rounded px-24 flex items-center justify-center w-full h-full pb-8;
backdrop-filter: blur(20px);
animation-duration: 300ms;
.music-img {
@@ -252,25 +247,16 @@ defineExpose({
background-color: inherit;
width: 500px;
height: 550px;
mask-image: linear-gradient(to bottom, transparent 0%, black 10%, black 90%, transparent 100%);
&-text {
@apply text-2xl cursor-pointer font-bold px-2 py-4;
transition: all 0.3s ease;
background-color: transparent;
span {
padding-right: 100px;
display: inline-block;
background-clip: text !important;
-webkit-background-clip: text !important;
}
&:hover {
@apply font-bold opacity-100 rounded-xl;
background-color: var(--hover-bg-color);
span {
color: var(--text-color-active) !important;
}
padding-right: 30px;
}
&-tr {
@@ -279,17 +265,35 @@ defineExpose({
color: var(--text-color-primary);
}
}
.hover-text {
&:hover {
@apply font-bold opacity-100 rounded-xl;
background-color: var(--hover-bg-color);
span {
color: var(--text-color-active) !important;
}
}
}
}
}
.mobile {
#drawer-target {
@apply flex-col p-4 pt-8;
@apply flex-col p-4 pt-8 justify-start;
.music-img {
display: none;
}
.music-lrc {
height: calc(100vh - 260px) !important;
width: 100vw;
span {
padding-right: 0px !important;
}
}
.music-lrc-text {
text-align: center;
}
}
}

View File

@@ -1,23 +1,21 @@
<template>
<!-- 展开全屏 -->
<music-full
ref="MusicFullRef"
v-model:music-full="musicFullVisible"
:audio="audio.value as HTMLAudioElement"
:background="background"
/>
<music-full ref="MusicFullRef" v-model:music-full="musicFullVisible" :background="background" />
<!-- 底部播放栏 -->
<div
class="music-play-bar"
:class="setAnimationClass('animate__bounceInUp') + ' ' + (musicFullVisible ? 'play-bar-opcity' : '')"
>
<n-image
:src="getImgUrl(playMusic?.picUrl, '300y300')"
class="play-bar-img"
lazy
preview-disabled
@click="setMusicFull"
/>
<div class="play-bar-img-wrapper" @click="setMusicFull">
<n-image :src="getImgUrl(playMusic?.picUrl, '300y300')" class="play-bar-img" lazy preview-disabled />
<div class="hover-arrow">
<div class="hover-content">
<!-- <i class="ri-arrow-up-s-line text-3xl" :class="{ 'ri-arrow-down-s-line': musicFullVisible }"></i> -->
<i class="text-3xl" :class="musicFullVisible ? 'ri-arrow-down-s-line' : 'ri-arrow-up-s-line'"></i>
<span class="hover-text">{{ musicFullVisible ? '收起' : '展开' }}歌词</span>
</div>
</div>
</div>
<div class="music-content">
<div class="music-content-title">
<n-ellipsis class="text-ellipsis" line-clamp="1">
@@ -26,9 +24,10 @@
</div>
<div class="music-content-name">
<n-ellipsis class="text-ellipsis" line-clamp="1">
<span v-for="(item, index) in playMusic.song.artists" :key="index">
{{ item.name }}{{ index < playMusic.song.artists.length - 1 ? ' / ' : '' }}
</span>
<span v-for="(artists, artistsindex) in playMusic.ar || playMusic.song.artists" :key="artistsindex"
>{{ artists.name
}}{{ artistsindex < (playMusic.ar || playMusic.song.artists).length - 1 ? ' / ' : '' }}</span
>
</n-ellipsis>
</div>
</div>
@@ -108,11 +107,12 @@
</template>
<script lang="ts" setup>
import { useThrottleFn } from '@vueuse/core';
import { useTemplateRef } from 'vue';
import { useStore } from 'vuex';
import SongItem from '@/components/common/SongItem.vue';
import { allTime, getCurrentLrc, isElectron, nowTime, openLyric, sendLyricToWin } from '@/hooks/MusicHook';
import { allTime, isElectron, nowTime, openLyric, sound } from '@/hooks/MusicHook';
import type { SongResult } from '@/type/music';
import { getImgUrl, secondToMinute, setAnimationClass } from '@/utils';
@@ -124,12 +124,8 @@ const store = useStore();
const playMusic = computed(() => store.state.playMusic as SongResult);
// 是否播放
const play = computed(() => store.state.play as boolean);
const playList = computed(() => store.state.playList as SongResult[]);
const audio = {
value: document.querySelector('#MusicAudio') as HTMLAudioElement,
};
const background = ref('#000');
watch(
@@ -140,30 +136,27 @@ watch(
{ immediate: true, deep: true },
);
const audioPlay = () => {
if (audio.value) {
audio.value.play();
}
};
// 使用 useThrottleFn 创建节流版本的 seek 函数
const throttledSeek = useThrottleFn((value: number) => {
if (!sound.value) return;
sound.value.seek((value * allTime.value) / 100);
}, 50); // 50ms 的节流延迟
// 计算属性 获取当前播放时间的进度
// 修改 timeSlider 计算属性
const timeSlider = computed({
get: () => (nowTime.value / allTime.value) * 100,
set: (value) => {
if (!audio.value) return;
audio.value.currentTime = (value * allTime.value) / 100;
audioPlay();
store.commit('setPlayMusic', true);
},
set: throttledSeek,
});
// 音量条
const audioVolume = ref(1);
const audioVolume = ref(localStorage.getItem('volume') ? parseFloat(localStorage.getItem('volume') as string) : 1);
const volumeSlider = computed({
get: () => audioVolume.value * 100,
set: (value) => {
if (!audio.value) return;
audio.value.volume = value / 100;
if (!sound.value) return;
localStorage.setItem('volume', (value / 100).toString());
sound.value.volume(value / 100);
audioVolume.value = value / 100;
},
});
// 获取当前播放时间
@@ -176,25 +169,6 @@ const getAllTime = computed(() => {
return secondToMinute(allTime.value);
});
// 监听音乐播放 获取时间
const onAudio = () => {
if (audio.value) {
audio.value.removeEventListener('timeupdate', handleGetAudioTime);
audio.value.removeEventListener('ended', handleEnded);
audio.value.addEventListener('timeupdate', handleGetAudioTime);
audio.value.addEventListener('ended', handleEnded);
// 监听音乐播放暂停
audio.value.addEventListener('pause', () => {
store.commit('setPlayMusic', false);
});
audio.value.addEventListener('play', () => {
store.commit('setPlayMusic', true);
});
}
};
onAudio();
function handleEnded() {
store.commit('nextPlay');
}
@@ -205,27 +179,17 @@ function handlePrev() {
const MusicFullRef = ref<any>(null);
function handleGetAudioTime(this: HTMLAudioElement) {
// 监听音频播放的实时时间事件
const audio = this as HTMLAudioElement;
// 获取当前播放时间
nowTime.value = audio.currentTime;
getCurrentLrc();
// 获取总时间
allTime.value = audio.duration;
// 获取音量
audioVolume.value = audio.volume;
sendLyricToWin(store.state.isPlay);
// if (musicFullVisible.value) {
// MusicFullRef.value?.lrcScroll();
// }
}
// 播放暂停按钮事件
const playMusicEvent = async () => {
if (play.value) {
if (sound.value) {
sound.value.pause();
}
store.commit('setPlayMusic', false);
} else {
if (sound.value) {
sound.value.play();
}
store.commit('setPlayMusic', true);
}
};
@@ -408,4 +372,39 @@ const scrollToPlayList = (val: boolean) => {
:root {
--primary-color: #18a058;
}
.play-bar-img-wrapper {
@apply relative cursor-pointer w-14 h-14;
.hover-arrow {
@apply absolute inset-0 flex items-center justify-center opacity-0 transition-opacity duration-300 rounded-2xl;
background: rgba(0, 0, 0, 0.5);
.hover-content {
@apply flex flex-col items-center justify-center;
i {
@apply text-white mb-0.5;
}
.hover-text {
@apply text-white text-xs scale-90;
}
}
}
&:hover {
.hover-arrow {
@apply opacity-100;
}
}
}
.tooltip-content {
@apply text-sm py-1 px-2;
}
.play-bar-img {
@apply w-14 h-14 rounded-2xl;
}
</style>

View File

@@ -35,6 +35,14 @@
/>
<div v-else class="mx-2 rounded-full cursor-pointer text-sm" @click="toLogin">登录</div>
</div>
<coffee
alipay-q-r="https://github.com/algerkong/algerkong/blob/main/alipay.jpg?raw=true"
wechat-q-r="https://github.com/algerkong/algerkong/blob/main/wechat.jpg?raw=true"
>
<div class="github" @click="toGithub">
<i class="ri-github-fill"></i>
</div>
</coffee>
</div>
</template>
@@ -44,6 +52,7 @@ import { useStore } from 'vuex';
import { getSearchKeyword } from '@/api/home';
import { getUserDetail, logout } from '@/api/login';
import Coffee from '@/components/Coffee.vue';
import { SEARCH_TYPES, USER_SET_OPTIONS } from '@/const/bar-const';
import { getImgUrl } from '@/utils';
@@ -135,6 +144,10 @@ const selectItem = async (key: string) => {
default:
}
};
const toGithub = () => {
window.open('https://github.com/algerkong/AlgerMusicPlayer', '_blank');
};
</script>
<style lang="scss" scoped>
@@ -154,4 +167,8 @@ const selectItem = async (key: string) => {
@apply pl-4;
}
}
.github {
@apply cursor-pointer text-gray-100 hover:text-gray-400 text-xl ml-4 rounded-full border border-gray-600 flex justify-center items-center px-2 h-full;
}
</style>

View File

@@ -15,7 +15,7 @@ import directives from './directive';
const app = createApp(App);
Object.keys(directives).forEach((key: string) => {
app.directive(key, directives[key]);
app.directive(key, directives[key as keyof typeof directives]);
});
app.use(router);
app.use(store);

View File

@@ -50,6 +50,15 @@ const layoutRouter = [
},
component: () => import('@/views/history/index.vue'),
},
{
path: '/favorite',
name: 'favorite',
component: () => import('@/views/favorite/index.vue'),
meta: {
title: '我的收藏',
icon: 'icon-likefill',
},
},
{
path: '/user',
name: 'user',

View File

@@ -0,0 +1,55 @@
import { Howl } from 'howler';
class AudioService {
private currentSound: Howl | null = null;
play(url: string) {
if (this.currentSound) {
this.currentSound.unload();
}
this.currentSound = null;
this.currentSound = new Howl({
src: [url],
html5: true,
autoplay: true,
volume: localStorage.getItem('volume') ? parseFloat(localStorage.getItem('volume') as string) : 1,
});
return this.currentSound;
}
getCurrentSound() {
return this.currentSound;
}
stop() {
if (this.currentSound) {
this.currentSound.stop();
this.currentSound.unload();
this.currentSound = null;
}
}
// 监听播放
onPlay(callback: () => void) {
if (this.currentSound) {
this.currentSound.on('play', callback);
}
}
// 监听暂停
onPause(callback: () => void) {
if (this.currentSound) {
this.currentSound.on('pause', callback);
}
}
// 监听结束
onEnd(callback: () => void) {
if (this.currentSound) {
this.currentSound.on('end', callback);
}
}
}
export const audioService = new AudioService();

View File

@@ -4,6 +4,15 @@ import { useMusicListHook } from '@/hooks/MusicListHook';
import homeRouter from '@/router/home';
import type { SongResult } from '@/type/music';
// 默认设置
const defaultSettings = {
isProxy: false,
noAnimate: false,
animationSpeed: 1,
author: 'Alger',
authorUrl: 'https://github.com/algerkong',
};
interface State {
menus: any[];
play: boolean;
@@ -18,6 +27,7 @@ interface State {
isMobile: boolean;
searchValue: string;
searchType: number;
favoriteList: number[];
}
const state: State = {
@@ -29,13 +39,13 @@ const state: State = {
user: localStorage.getItem('user') ? JSON.parse(localStorage.getItem('user') as string) : null,
playList: [],
playListIndex: 0,
setData: null,
setData: defaultSettings,
lyric: {},
isMobile: false,
searchValue: '',
searchType: 1,
favoriteList: localStorage.getItem('favoriteList') ? JSON.parse(localStorage.getItem('favoriteList') || '[]') : [],
};
const windowData = window as any;
const { handlePlayMusic, nextPlay, prevPlay } = useMusicListHook();
@@ -62,15 +72,52 @@ const mutations = {
async prevPlay(state: State) {
await prevPlay(state);
},
async setSetData(state: State, setData: any) {
setSetData(state: State, setData: any) {
state.setData = setData;
window.electron && window.electron.ipcRenderer.setStoreValue('set', JSON.parse(JSON.stringify(setData)));
const isElectron = (window as any).electronAPI !== undefined;
if (isElectron) {
(window as any).electron.ipcRenderer.setStoreValue('set', JSON.parse(JSON.stringify(setData)));
} else {
localStorage.setItem('appSettings', JSON.stringify(setData));
}
},
addToFavorite(state: State, songId: number) {
if (!state.favoriteList.includes(songId)) {
state.favoriteList = [songId, ...state.favoriteList];
localStorage.setItem('favoriteList', JSON.stringify(state.favoriteList));
}
},
removeFromFavorite(state: State, songId: number) {
state.favoriteList = state.favoriteList.filter((id) => id !== songId);
localStorage.setItem('favoriteList', JSON.stringify(state.favoriteList));
},
};
const actions = {
initializeSettings({ commit }: { commit: any }) {
const isElectron = (window as any).electronAPI !== undefined;
if (isElectron) {
const setData = (window as any).electron.ipcRenderer.getStoreValue('set');
commit('setSetData', setData || defaultSettings);
} else {
const savedSettings = localStorage.getItem('appSettings');
if (savedSettings) {
commit('setSetData', {
...defaultSettings,
...JSON.parse(savedSettings),
});
} else {
commit('setSetData', defaultSettings);
}
}
},
};
const store = createStore({
state,
mutations,
actions,
});
export default store;

View File

@@ -81,6 +81,7 @@ export interface Song {
count?: number;
playLoading?: boolean;
picUrl?: string;
ar: Artist[];
}
interface Privilege {

View File

@@ -11,11 +11,20 @@ export const setAnimationClass = (type: String) => {
if (store.state.setData && store.state.setData.noAnimate) {
return '';
}
return `animate__animated ${type}`;
const speed = store.state.setData?.animationSpeed || 1;
let speedClass = '';
if (speed <= 0.3) speedClass = 'animate__slower';
else if (speed <= 0.8) speedClass = 'animate__slow';
else if (speed >= 2.5) speedClass = 'animate__faster';
else if (speed >= 1.5) speedClass = 'animate__fast';
return `animate__animated ${type}${speedClass ? ` ${speedClass}` : ''}`;
};
// 设置动画延时
export const setAnimationDelay = (index: number = 6, time: number = 50) => {
return `animation-delay:${index * time}ms`;
const speed = store.state.setData?.animationSpeed || 1;
return `animation-delay:${(index * time) / (speed * 2)}ms`;
};
// 将秒转换为分钟和秒
@@ -54,11 +63,9 @@ export const getIsMc = () => {
if (windowData.electron.ipcRenderer.getStoreValue('set').isProxy) {
return true;
}
if (window.location.origin.includes('localhost')) {
}
return false;
};
const ProxyUrl = import.meta.env.VITE_API_PROXY || 'http://110.42.251.190:9856';
const ProxyUrl = import.meta.env.VITE_API_PROXY;
export const getMusicProxyUrl = (url: string) => {
if (!getIsMc()) {

View File

@@ -0,0 +1,208 @@
<template>
<div v-if="isComponent ? favoriteSongs.length : true" class="favorite-page">
<div class="favorite-header" :class="setAnimationClass('animate__fadeInRight')">
<h2>我的收藏</h2>
<div class="favorite-count"> {{ favoriteList.length }} </div>
</div>
<div class="favorite-main" :class="setAnimationClass('animate__bounceInRight')">
<n-scrollbar class="favorite-content">
<div v-if="favoriteList.length === 0" class="empty-tip">
<n-empty description="还没有收藏歌曲" />
</div>
<div v-else class="favorite-list">
<div v-if="loading" class="loading-wrapper">
<n-spin size="large" />
</div>
<template v-else>
<song-item
v-for="(song, index) in favoriteSongs"
:key="song.id"
:item="song"
:favorite="!isComponent"
:class="setAnimationClass('animate__bounceInUp')"
:style="getItemAnimationDelay(index)"
@play="handlePlay"
/>
</template>
<div v-if="isComponent" class="favorite-list-more text-center">
<n-button text type="primary" @click="handleMore">查看更多</n-button>
</div>
</div>
</n-scrollbar>
<div v-if="favoriteList.length > 0 && !loading && !isComponent" class="pagination-wrapper">
<n-pagination
v-model:page="currentPage"
:page-size="pageSize"
:item-count="favoriteList.length"
:page-slot="5"
size="small"
@update:page="handlePageChange"
/>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { computed, onMounted, ref, watch } from 'vue';
import { useRouter } from 'vue-router';
import { useStore } from 'vuex';
import { getMusicDetail } from '@/api/music';
import SongItem from '@/components/common/SongItem.vue';
import type { SongResult } from '@/type/music';
import { setAnimationClass, setAnimationDelay } from '@/utils';
const store = useStore();
const favoriteList = computed(() => store.state.favoriteList);
const favoriteSongs = ref<SongResult[]>([]);
const loading = ref(false);
// 分页相关
const pageSize = 16;
const currentPage = ref(1);
defineProps({
isComponent: {
type: Boolean,
default: false,
},
});
// 获取当前页的收藏歌曲ID
const getCurrentPageIds = () => {
// 反转列表顺序,最新收藏的在前面
const reversedList = [...favoriteList.value];
const startIndex = (currentPage.value - 1) * pageSize;
const endIndex = startIndex + pageSize;
return reversedList.slice(startIndex, endIndex);
};
// 获取收藏歌曲详情
const getFavoriteSongs = async () => {
if (favoriteList.value.length === 0) {
favoriteSongs.value = [];
return;
}
loading.value = true;
try {
const currentIds = getCurrentPageIds();
const res = await getMusicDetail(currentIds);
if (res.data.songs) {
favoriteSongs.value = res.data.songs.map((song: SongResult) => {
return {
...song,
picUrl: song.al?.picUrl || '',
};
});
}
} catch (error) {
console.error('获取收藏歌曲失败:', error);
} finally {
loading.value = false;
}
};
// 处理页码变化
const handlePageChange = () => {
getFavoriteSongs();
};
onMounted(() => {
getFavoriteSongs();
});
// 监听收藏列表变化
watch(
favoriteList,
() => {
currentPage.value = 1;
getFavoriteSongs();
},
{ deep: true, immediate: true },
);
const handlePlay = () => {
store.commit('setPlayList', favoriteSongs.value);
};
const getItemAnimationDelay = (index: number) => {
const currentPageIndex = index % pageSize;
return setAnimationDelay(currentPageIndex, 30);
};
const router = useRouter();
const handleMore = () => {
router.push('/favorite');
};
</script>
<style lang="scss" scoped>
.favorite-page {
@apply h-full flex flex-col p-6;
.favorite-header {
@apply flex items-center justify-between mb-6 flex-shrink-0;
h2 {
@apply text-2xl font-bold;
}
.favorite-count {
@apply text-gray-400 text-sm;
}
}
.favorite-main {
@apply flex flex-col flex-grow min-h-0;
.favorite-content {
@apply flex-grow min-h-0;
.empty-tip {
@apply h-full flex items-center justify-center;
}
.favorite-list {
@apply space-y-2 pb-4;
}
}
}
}
.loading-wrapper {
@apply flex justify-center items-center py-20;
}
.pagination-wrapper {
@apply flex justify-center py-4 flex-shrink-0;
:deep(.n-pagination) {
@apply bg-gray-800 rounded-full px-4 py-1;
.n-pagination-item {
@apply text-gray-300 hover:text-white;
&--active {
@apply text-green-500;
}
}
}
}
.mobile {
.favorite-page {
@apply p-4;
.favorite-header {
@apply mb-4;
h2 {
@apply text-xl;
}
}
}
}
</style>

View File

@@ -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;

View File

@@ -9,7 +9,10 @@
<!-- 本周最热音乐 -->
<recommend-songlist />
<!-- 推荐最新专辑 -->
<recommend-album />
<div>
<favorite-list is-component />
<recommend-album />
</div>
</div>
</div>
</n-scrollbar>
@@ -17,11 +20,8 @@
<script lang="ts" setup>
import { isMobile } from '@/utils';
import FavoriteList from '@/views/favorite/index.vue';
const RecommendSinger = defineAsyncComponent(() => import('@/components/RecommendSinger.vue'));
const PlaylistType = defineAsyncComponent(() => import('@/components/PlaylistType.vue'));
const RecommendSonglist = defineAsyncComponent(() => import('@/components/RecommendSonglist.vue'));
const RecommendAlbum = defineAsyncComponent(() => import('@/components/RecommendAlbum.vue'));
defineOptions({
name: 'Home',
});
@@ -35,7 +35,22 @@ defineOptions({
@apply mt-6 flex mb-28;
}
.mobile .main-content {
@apply flex-col mx-4;
.mobile {
.main-content {
@apply flex-col mx-4;
}
:deep(.favorite-page) {
@apply p-0 mx-4 h-full;
}
}
:deep(.favorite-page) {
@apply p-0 mx-4 h-[300px];
.favorite-header {
@apply mb-0;
h2 {
@apply text-lg font-bold mb-4;
}
}
}
</style>

View File

@@ -11,12 +11,24 @@ defineOptions({
name: 'List',
});
const recommendList = ref();
const TOTAL_ITEMS = 42; // 每页数量
const recommendList = ref<any[]>([]);
const showMusic = ref(false);
const page = ref(0);
const hasMore = ref(true);
const isLoadingMore = ref(false);
// 计算每个项目的动画延迟
const getItemAnimationDelay = (index: number) => {
const currentPageIndex = index % TOTAL_ITEMS;
return setAnimationDelay(currentPageIndex, 30);
};
const recommendItem = ref<IRecommendItem | null>();
const listDetail = ref<IListDetail | null>();
const listLoading = ref(true);
const selectRecommendItem = async (item: IRecommendItem) => {
listLoading.value = true;
recommendItem.value = null;
@@ -32,31 +44,62 @@ const route = useRoute();
const listTitle = ref(route.query.type || '歌单列表');
const loading = ref(false);
const loadList = async (type: string) => {
loading.value = true;
const params = {
cat: type || '',
limit: 30,
offset: 0,
};
const { data } = await getListByCat(params);
recommendList.value = data.playlists;
loading.value = false;
const loadList = async (type: string, isLoadMore = false) => {
if (!hasMore.value && isLoadMore) return;
if (isLoadMore) {
isLoadingMore.value = true;
} else {
loading.value = true;
page.value = 0;
recommendList.value = [];
}
try {
const params = {
cat: type || '',
limit: TOTAL_ITEMS,
offset: page.value * TOTAL_ITEMS,
};
const { data } = await getListByCat(params);
if (isLoadMore) {
recommendList.value.push(...data.playlists);
} else {
recommendList.value = data.playlists;
}
hasMore.value = data.more;
page.value++;
} catch (error) {
console.error('加载歌单列表失败:', error);
} finally {
loading.value = false;
isLoadingMore.value = false;
}
};
if (route.query.type) {
loadList(route.query.type as string);
} else {
getRecommendList().then((res: { data: { result: any } }) => {
recommendList.value = res.data.result;
});
}
// 监听滚动事件
const handleScroll = (e: any) => {
const { scrollTop, scrollHeight, clientHeight } = e.target;
// 距离底部100px时加载更多
if (scrollTop + clientHeight >= scrollHeight - 100 && !isLoadingMore.value && hasMore.value) {
loadList(route.query.type as string, true);
}
};
onMounted(() => {
if (route.query.type) {
loadList(route.query.type as string);
} else {
getRecommendList(TOTAL_ITEMS).then((res: { data: { result: any } }) => {
recommendList.value = res.data.result;
});
}
});
watch(
() => route.query,
async (newParams) => {
if (newParams.type) {
recommendList.value = null;
recommendList.value = [];
listTitle.value = newParams.type || '歌单列表';
loadList(newParams.type as string);
}
@@ -68,14 +111,14 @@ watch(
<div class="list-page">
<div class="recommend-title" :class="setAnimationClass('animate__bounceInLeft')">{{ listTitle }}</div>
<!-- 歌单列表 -->
<n-scrollbar class="recommend" :size="100" @click="showMusic = false">
<n-scrollbar class="recommend" :size="100" @scroll="handleScroll">
<div v-loading="loading" class="recommend-list">
<div
v-for="(item, index) in recommendList"
:key="item.id"
class="recommend-item"
:class="setAnimationClass('animate__bounceIn')"
:style="setAnimationDelay(index, 30)"
:style="getItemAnimationDelay(index)"
@click.stop="selectRecommendItem(item)"
>
<div class="recommend-item-img">
@@ -95,6 +138,12 @@ watch(
<div class="recommend-item-title">{{ item.name }}</div>
</div>
</div>
<!-- 加载状态 -->
<div v-if="isLoadingMore" class="loading-more">
<n-spin size="small" />
<span class="ml-2">加载中...</span>
</div>
<div v-if="!hasMore && recommendList.length > 0" class="no-more">没有更多了</div>
</n-scrollbar>
<music-list
v-model:show="showMusic"
@@ -108,28 +157,32 @@ watch(
<style lang="scss" scoped>
.list-page {
@apply relative h-full w-full px-4;
@apply relative h-full w-full;
}
.recommend {
@apply w-full h-full bg-none;
&-title {
@apply text-lg font-bold text-white pb-4;
@apply text-lg font-bold text-white pb-2;
}
&-list {
@apply grid gap-6 pb-28;
grid-template-columns: repeat(auto-fill, minmax(13%, 1fr));
@apply grid gap-x-8 gap-y-6 pb-28 pr-4;
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
}
&-item {
@apply flex flex-col;
&-img {
@apply rounded-xl overflow-hidden relative;
@apply rounded-xl overflow-hidden relative w-full aspect-square;
&-img {
@apply block w-full h-full;
}
img {
@apply absolute top-0 left-0 w-full h-full object-cover rounded-xl;
}
&:hover img {
@apply hover:scale-110 transition-all duration-300 ease-in-out;
}
&-img {
@apply h-full w-full rounded-xl overflow-hidden;
}
.top {
@apply absolute w-full h-full top-0 left-0 flex justify-center items-center transition-all duration-300 ease-in-out cursor-pointer;
background-color: #00000088;
@@ -147,10 +200,7 @@ watch(
}
.play-count {
position: absolute;
top: 10px;
left: 10px;
font-size: 14px;
@apply absolute top-2 left-2 text-sm;
}
}
}
@@ -160,9 +210,22 @@ watch(
}
}
.loading-more {
@apply flex items-center justify-center py-4 text-sm text-gray-400;
}
.no-more {
@apply text-center py-4 text-sm text-gray-500;
}
.mobile {
.recommend-title {
@apply text-xl font-bold px-4;
}
.recommend-list {
grid-template-columns: repeat(auto-fill, minmax(25%, 1fr));
@apply px-4 gap-4;
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
}
}
</style>

View File

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
import { useStore } from 'vuex';
import { checkQr, createQr, getQrKey, getUserDetail, loginByCellphone } from '@/api/login';
import { isMobile, setAnimationClass } from '@/utils';
import { setAnimationClass } from '@/utils';
defineOptions({
name: 'Login',
@@ -14,6 +14,7 @@ defineOptions({
const message = useMessage();
const store = useStore();
const router = useRouter();
const isQr = ref(false);
const qrUrl = ref<string>();
onMounted(() => {
@@ -24,6 +25,11 @@ const timerRef = ref(null);
const loadLogin = async () => {
try {
if (timerRef.value) {
clearInterval(timerRef.value);
timerRef.value = null;
}
if (!isQr.value) return;
const qrKey = await getQrKey();
const key = qrKey.data.data.unikey;
const { data } = await createQr(key);
@@ -65,7 +71,7 @@ const timerIsQr = (key: string) => {
clearInterval(timer);
timerRef.value = null;
}
}, 2000);
}, 3000);
return timer;
};
@@ -79,9 +85,9 @@ onBeforeUnmount(() => {
});
// 是否扫码登陆
const isQr = ref(!isMobile.value);
const chooseQr = () => {
isQr.value = !isQr.value;
loadLogin();
};
// 手机号登录
@@ -116,6 +122,7 @@ const loginPhone = async () => {
<input v-model="phone" class="phone-input" type="text" placeholder="手机号" />
<input v-model="password" class="phone-input" type="password" placeholder="密码" />
</div>
<div class="text">使用网易云账号登录</div>
<n-button class="btn-login" @click="loginPhone()">登录</n-button>
</div>
</div>
@@ -136,14 +143,14 @@ const loginPhone = async () => {
}
.text {
@apply mt-4 text-green-500 text-xs;
@apply mt-4 text-white text-xs;
}
.phone-login {
width: 350px;
height: 550px;
@apply rounded-2xl rounded-b-none bg-cover bg-no-repeat relative overflow-hidden;
background-image: url(http://tva4.sinaimg.cn/large/006opRgRgy1gw8nf6no7uj30rs15n0x7.jpg);
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.dev/svgjs' width='400' height='560' preserveAspectRatio='none' viewBox='0 0 400 560'%3e%3cg mask='url(%26quot%3b%23SvgjsMask1066%26quot%3b)' fill='none'%3e%3crect width='400' height='560' x='0' y='0' fill='rgba(24%2c 106%2c 59%2c 1)'%3e%3c/rect%3e%3cpath d='M0%2c234.738C43.535%2c236.921%2c80.103%2c205.252%2c116.272%2c180.923C151.738%2c157.067%2c188.295%2c132.929%2c207.855%2c94.924C227.898%2c55.979%2c233.386%2c10.682%2c226.119%2c-32.511C218.952%2c-75.107%2c199.189%2c-115.793%2c167.469%2c-145.113C137.399%2c-172.909%2c92.499%2c-171.842%2c55.779%2c-189.967C8.719%2c-213.196%2c-28.344%2c-282.721%2c-78.217%2c-266.382C-128.725%2c-249.834%2c-111.35%2c-166.696%2c-143.781%2c-124.587C-173.232%2c-86.348%2c-244.72%2c-83.812%2c-255.129%2c-36.682C-265.368%2c9.678%2c-217.952%2c48.26%2c-190.512%2c87.004C-167.691%2c119.226%2c-140.216%2c145.431%2c-109.013%2c169.627C-74.874%2c196.1%2c-43.147%2c232.575%2c0%2c234.738' fill='%23114b2a'%3e%3c/path%3e%3cpath d='M400 800.9010000000001C443.973 795.023 480.102 765.6 513.011 735.848 541.923 709.71 561.585 676.6320000000001 577.037 640.85 592.211 605.712 606.958 568.912 601.458 531.035 595.962 493.182 568.394 464.36400000000003 546.825 432.775 522.317 396.88300000000004 507.656 347.475 466.528 333.426 425.366 319.366 384.338 352.414 342.111 362.847 297.497 373.869 242.385 362.645 211.294 396.486 180.212 430.318 192.333 483.83299999999997 188.872 529.644 185.656 572.218 178.696 614.453 191.757 655.101 205.885 699.068 227.92 742.4110000000001 265.75 768.898 304.214 795.829 353.459 807.1220000000001 400 800.9010000000001' fill='%231f894c'%3e%3c/path%3e%3c/g%3e%3cdefs%3e%3cmask id='SvgjsMask1066'%3e%3crect width='400' height='560' fill='white'%3e%3c/rect%3e%3c/mask%3e%3c/defs%3e%3c/svg%3e");
background-color: #383838;
box-shadow: inset 0px 0px 20px 5px #0000005e;

View File

@@ -1,76 +1,107 @@
<template>
<div class="lyric-window" :class="[lyricSetting.theme, { lyric_lock: lyricSetting.isLock }]">
<div class="drag-bar"></div>
<div class="lyric-bar" :class="{ 'lyric-bar-hover': isDrag }">
<div class="buttons">
<!-- <div class="music-buttons">
<div @click="handlePrev">
<i class="iconfont icon-prev"></i>
</div>
<div class="music-buttons-play" @click="playMusicEvent">
<i class="iconfont icon" :class="play ? 'icon-stop' : 'icon-play'"></i>
</div>
<div @click="handleEnded">
<i class="iconfont icon-next"></i>
</div>
</div> -->
<div class="button check-theme" @click="checkTheme">
<i v-if="lyricSetting.theme === 'light'" class="icon ri-sun-line"></i>
<i v-else class="icon ri-moon-line"></i>
<div
class="lyric-window"
:class="[lyricSetting.theme, { lyric_lock: lyricSetting.isLock }]"
@mouseenter="handleMouseEnter"
@mouseleave="handleMouseLeave"
>
<!-- 顶部控制栏 -->
<div class="control-bar" :class="{ 'control-bar-show': showControls }">
<div class="font-size-controls">
<n-button-group>
<n-button quaternary size="small" :disabled="fontSize <= 12" @click="decreaseFontSize">
<i class="ri-subtract-line"></i>
</n-button>
<n-button quaternary size="small" :disabled="fontSize >= 48" @click="increaseFontSize">
<i class="ri-add-line"></i>
</n-button>
</n-button-group>
</div>
<div class="control-buttons">
<div class="control-button" @click="checkTheme">
<i v-if="lyricSetting.theme === 'light'" class="ri-sun-line"></i>
<i v-else class="ri-moon-line"></i>
</div>
<div class="button">
<i class="icon ri-share-2-line" :class="{ checked: lyricSetting.isTop }" @click="handleTop"></i>
<div class="control-button" @click="handleTop">
<i class="ri-pushpin-line" :class="{ active: lyricSetting.isTop }"></i>
</div>
<div class="button button-lock" @click="handleLock">
<i v-if="lyricSetting.isLock" class="icon ri-lock-line"></i>
<i v-else class="icon ri-lock-unlock-line"></i>
<div class="control-button" @click="handleLock">
<i v-if="lyricSetting.isLock" class="ri-lock-line"></i>
<i v-else class="ri-lock-unlock-line"></i>
</div>
<div class="button">
<i class="icon ri-close-circle-line" @click="handleClose"></i>
<div class="control-button" @click="handleClose">
<i class="ri-close-line"></i>
</div>
</div>
</div>
<div id="clickThroughElement" class="lyric-box">
<template v-if="lyricData.lrcArray[lyricData.nowIndex]">
<h2 class="lyric lyric-current">{{ lyricData.lrcArray[lyricData.nowIndex].text }}</h2>
<p class="lyric-current">{{ lyricData.currentLrc.trText }}</p>
<template v-if="lyricData.lrcArray[lyricData.nowIndex + 1]">
<h2 class="lyric lyric-next">
{{ lyricData.lrcArray[lyricData.nowIndex + 1].text }}
</h2>
<p class="lyric-next">{{ lyricData.nextLrc.trText }}</p>
</template>
</template>
<!-- 歌词显示区域 -->
<div ref="containerRef" class="lyric-container">
<div class="lyric-scroll">
<div class="lyric-wrapper" :style="wrapperStyle">
<template v-if="staticData.lrcArray?.length > 0">
<div
v-for="(line, index) in staticData.lrcArray"
:key="index"
class="lyric-line"
:style="lyricLineStyle"
:class="{
'lyric-line-current': index === currentIndex,
'lyric-line-passed': index < currentIndex,
'lyric-line-next': index === currentIndex + 1,
}"
>
<div class="lyric-text" :style="{ fontSize: `${fontSize}px` }">
<span class="lyric-text-inner" :style="getLyricStyle(index)">
{{ line.text || '' }}
</span>
</div>
<div v-if="line.trText" class="lyric-translation" :style="{ fontSize: `${fontSize * 0.6}px` }">
{{ line.trText }}
</div>
</div>
</template>
<div v-else class="lyric-empty">暂无歌词</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { useIpcRenderer } from '@vueuse/electron';
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
defineOptions({
name: 'Lyric',
});
const ipcRenderer = useIpcRenderer();
const windowData = window as any;
const containerRef = ref<HTMLElement | null>(null);
const containerHeight = ref(0);
const lineHeight = ref(60);
const currentIndex = ref(0);
const isInitialized = ref(false);
// 字体大小控制
const fontSize = ref(24); // 默认字体大小
const fontSizeStep = 2; // 每次整的步长
const lyricData = ref({
currentLrc: {
text: '',
trText: '',
},
nextLrc: {
text: '',
trText: '',
},
currentTime: 0,
nextTime: 0,
nowTime: 0,
// 静态数据
const staticData = ref<{
lrcArray: Array<{ text: string; trText: string }>;
lrcTimeArray: number[];
allTime: number;
}>({
lrcArray: [],
lrcTimeArray: [],
allTime: 0,
});
// 动态数据
const dynamicData = ref({
nowTime: 0,
startCurrentTime: 0,
lrcArray: [] as any,
lrcTimeArray: [] as any,
nowIndex: 0,
nextTime: 0,
isPlay: true,
});
const lyricSetting = ref({
@@ -83,16 +114,323 @@ const lyricSetting = ref({
}),
});
let hideControlsTimer: number | null = null;
const isHovering = ref(false);
// 计算是否栏
const showControls = computed(() => {
if (lyricSetting.value.isLock) {
return isHovering.value;
}
return true;
});
// 清除隐藏定时器
const clearHideTimer = () => {
if (hideControlsTimer) {
clearTimeout(hideControlsTimer);
hideControlsTimer = null;
}
};
// 处理鼠标进入窗口
const handleMouseEnter = () => {
if (!lyricSetting.value.isLock) return;
isHovering.value = true;
};
// 处理鼠标离开窗口
const handleMouseLeave = () => {
if (!lyricSetting.value.isLock) return;
isHovering.value = false;
};
// 监听锁定状态变化
watch(
() => lyricSetting.value.isLock,
(newLock: boolean) => {
if (newLock) {
isHovering.value = false;
}
},
);
onMounted(() => {
ipcRenderer.on('receive-lyric', (event, data) => {
// 初始化时,如果是锁定状态,确保控制栏隐藏
if (lyricSetting.value.isLock) {
isHovering.value = false;
}
});
onUnmounted(() => {
clearHideTimer();
});
// 计算歌词滚动位置
const wrapperStyle = computed(() => {
if (!isInitialized.value || !containerHeight.value) {
return {
transform: 'translateY(0)',
transition: 'none',
};
}
// 计算容器中心点
const containerCenter = containerHeight.value / 2;
// 计算当前行到顶部的距离包含padding
const currentLineTop = currentIndex.value * lineHeight.value + containerHeight.value * 0.2; // 加上顶部padding
// 计算偏移量,使当前行居中
const targetOffset = containerCenter - currentLineTop;
// 计算内容总高度包含padding
const contentHeight = staticData.value.lrcArray.length * lineHeight.value + containerHeight.value * 0.4; // 上下padding各20vh
// 计算最小和最大偏移量
const minOffset = -(contentHeight - containerHeight.value);
const maxOffset = 0;
// 限制偏移量在合理范围内
const finalOffset = Math.min(maxOffset, Math.max(minOffset, targetOffset));
return {
transform: `translateY(${finalOffset}px)`,
transition: isInitialized.value ? 'transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)' : 'none',
};
});
const lyricLineStyle = computed(() => ({
height: `${lineHeight.value}px`,
}));
// 更新容器高度和行高
const updateContainerHeight = () => {
if (!containerRef.value) return;
// 更新容器高度
containerHeight.value = containerRef.value.clientHeight;
// 计算基础行高(字体大小的2.5倍)
const baseLineHeight = fontSize.value * 2.5;
// 计算最大允许行高(容器高度的1/4)
const maxAllowedHeight = containerHeight.value / 3;
// 设置行高(不小于40px,不大于最大允许高度)
lineHeight.value = Math.min(maxAllowedHeight, Math.max(40, baseLineHeight));
};
// 处理字体大小变化
const handleFontSizeChange = async () => {
// 先保存字体大小
saveFontSize();
// 更新容器高度和行高
updateContainerHeight();
};
// 增加字体大小
const increaseFontSize = async () => {
if (fontSize.value < 48) {
fontSize.value += fontSizeStep;
await handleFontSizeChange();
}
};
// 减小字体大小
const decreaseFontSize = async () => {
if (fontSize.value > 12) {
fontSize.value -= fontSizeStep;
await handleFontSizeChange();
}
};
// 保存字体大小到本地存储
const saveFontSize = () => {
localStorage.setItem('lyricFontSize', fontSize.value.toString());
};
// 监听容器大小变化
onMounted(() => {
const resizeObserver = new ResizeObserver(() => {
updateContainerHeight();
});
if (containerRef.value) {
resizeObserver.observe(containerRef.value);
}
onUnmounted(() => {
resizeObserver.disconnect();
});
});
// 动画帧ID
const animationFrameId = ref<number | null>(null);
// 实际播放时间
const actualTime = ref(0);
// 计算当前行的进度
const currentProgress = computed(() => {
const { startCurrentTime, nextTime, isPlay } = dynamicData.value;
if (!startCurrentTime || !nextTime || !isPlay) return 0;
const duration = nextTime - startCurrentTime;
const elapsed = actualTime.value - startCurrentTime;
return Math.min(Math.max(elapsed / duration, 0), 1);
});
// 获取歌词样式
const getLyricStyle = (index: number) => {
if (index !== currentIndex.value) return {};
const progress = currentProgress.value * 100;
return {
background: `linear-gradient(to right, var(--highlight-color) ${progress}%, var(--text-color) ${progress}%)`,
WebkitBackgroundClip: 'text',
WebkitTextFillColor: 'transparent',
transition: 'all 0.1s linear',
};
};
// 时间偏移量(毫秒)
const TIME_OFFSET = 400;
// 更新动画
const updateProgress = () => {
if (!dynamicData.value.isPlay) {
if (animationFrameId.value) {
cancelAnimationFrame(animationFrameId.value);
animationFrameId.value = null;
}
return;
}
// 计算实际时间,添加偏移量
const timeDiff = (performance.now() - lastUpdateTime.value) / 1000;
actualTime.value = dynamicData.value.nowTime + timeDiff + TIME_OFFSET / 1000;
// 继续动画
animationFrameId.value = requestAnimationFrame(updateProgress);
};
// 记录上次更新时间
const lastUpdateTime = ref(performance.now());
// 监听数据更新
watch(
() => dynamicData.value,
(newData: any) => {
// 更新最后更新时间
lastUpdateTime.value = performance.now();
// 更新实际时间,包含偏移量
actualTime.value = newData.nowTime + TIME_OFFSET / 1000;
// 如果正在播放且没有动画,启动动画
if (newData.isPlay && !animationFrameId.value) {
updateProgress();
}
},
{ deep: true },
);
// 监听播放状态变化
watch(
() => dynamicData.value.isPlay,
(isPlaying: boolean) => {
if (isPlaying) {
lastUpdateTime.value = performance.now();
updateProgress();
} else if (animationFrameId.value) {
cancelAnimationFrame(animationFrameId.value);
animationFrameId.value = null;
}
},
);
// 修改数据更新处理
const handleDataUpdate = (parsedData: {
nowTime: number;
startCurrentTime: number;
nextTime: number;
isPlay: boolean;
nowIndex: number;
}) => {
// 确保数据存在且格式正确
if (!parsedData || typeof parsedData.nowTime !== 'number') {
console.error('Invalid update data received:', parsedData);
return;
}
dynamicData.value = {
nowTime: parsedData.nowTime,
startCurrentTime: parsedData.startCurrentTime,
nextTime: parsedData.nextTime,
isPlay: parsedData.isPlay,
};
// 更新索引
if (typeof parsedData.nowIndex === 'number' && parsedData.nowIndex !== currentIndex.value) {
currentIndex.value = parsedData.nowIndex;
}
};
onMounted(() => {
// 加载保存的字体大小
const savedFontSize = localStorage.getItem('lyricFontSize');
if (savedFontSize) {
fontSize.value = Number(savedFontSize);
lineHeight.value = fontSize.value * 2.5;
}
// 初始化容器高度
updateContainerHeight();
window.addEventListener('resize', updateContainerHeight);
// 监听歌词数据
windowData.electron.ipcRenderer.on('receive-lyric', (data: string) => {
try {
lyricData.value = JSON.parse(data);
const parsedData = JSON.parse(data);
if (parsedData.type === 'init') {
// 初始化重置状态
currentIndex.value = 0;
isInitialized.value = false;
// 清理可能存在的动画
if (animationFrameId.value) {
cancelAnimationFrame(animationFrameId.value);
animationFrameId.value = null;
}
// 保据格式正确
if (Array.isArray(parsedData.lrcArray)) {
staticData.value = {
lrcArray: parsedData.lrcArray,
lrcTimeArray: parsedData.lrcTimeArray || [],
allTime: parsedData.allTime || 0,
};
} else {
console.error('Invalid lyric array format:', parsedData);
}
nextTick(() => {
isInitialized.value = true;
});
} else if (parsedData.type === 'update') {
handleDataUpdate(parsedData);
}
} catch (error) {
console.error('error', error);
console.error('Error parsing lyric data:', error);
}
});
});
onUnmounted(() => {
window.removeEventListener('resize', updateContainerHeight);
});
const checkTheme = () => {
if (lyricSetting.value.theme === 'light') {
lyricSetting.value.theme = 'dark';
@@ -103,7 +441,7 @@ const checkTheme = () => {
const handleTop = () => {
lyricSetting.value.isTop = !lyricSetting.value.isTop;
ipcRenderer.send('top-lyric', lyricSetting.value.isTop);
windowData.electron.ipcRenderer.send('top-lyric', lyricSetting.value.isTop);
};
const handleLock = () => {
@@ -111,26 +449,16 @@ const handleLock = () => {
};
const handleClose = () => {
ipcRenderer.send('close-lyric');
windowData.electron.ipcRenderer.send('close-lyric');
};
watch(
() => lyricSetting.value,
(newValue) => {
(newValue: any) => {
localStorage.setItem('lyricData', JSON.stringify(newValue));
},
{ deep: true },
);
// onMounted(() => {
// const el = document.getElementById('clickThroughElement') as HTMLElement;
// el.addEventListener('mouseenter', () => {
// if (lyricSetting.value.isLock) ipcRenderer.send('mouseenter-lyric');
// });
// el.addEventListener('mouseleave', () => {
// if (lyricSetting.value.isLock) ipcRenderer.send('mouseleave-lyric');
// });
// });
</script>
<style>
@@ -143,132 +471,196 @@ body {
.lyric-window {
width: 100vw;
height: 100vh;
@apply overflow-hidden text-gray-600 rounded-xl box-border;
// border: 4px solid transparent;
&:hover .lyric-bar {
opacity: 1;
}
&:hover .drag-bar {
opacity: 1;
}
&:hover {
box-shadow: inset 0 0 10px 0 rgba(255, 255, 255, 0.5);
}
}
position: relative;
overflow: hidden;
background: transparent;
.lyric_lock {
&:hover {
box-shadow: none;
&.dark {
--bg-color: transparent;
--text-color: #ffffff;
--text-secondary: rgba(255, 255, 255, 0.6);
--highlight-color: #1db954;
--control-bg: rgba(0, 0, 0, 0.3);
}
&:hover .lyric-bar {
background-color: transparent;
.button {
opacity: 0;
}
.button-lock {
opacity: 1;
color: #d6d6d6;
&.light {
--bg-color: transparent;
--text-color: #333333;
--text-secondary: rgba(51, 51, 51, 0.6);
--highlight-color: #1db954;
--control-bg: rgba(255, 255, 255, 0.3);
}
&.lyric_lock {
.control-bar {
background: var(--control-bg);
&-show {
opacity: 1;
}
}
}
&:hover .drag-bar {
opacity: 0;
}
}
.icon {
@apply text-xl hover:text-white;
}
.lyric-bar {
background-color: #b1b1b1;
@apply flex flex-col justify-center items-center;
width: 100vw;
.control-bar {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 40px;
background: var(--control-bg);
backdrop-filter: blur(8px);
display: flex;
justify-content: flex-end;
align-items: center;
padding: 0 20px;
opacity: 0;
visibility: hidden;
transition:
opacity 0.2s ease,
visibility 0.2s ease;
-webkit-app-region: drag;
z-index: 100;
&-show {
opacity: 1;
visibility: visible;
}
.font-size-controls {
margin-right: auto; // 将字体控制放在侧
padding-right: 20px;
-webkit-app-region: no-drag;
.n-button {
i {
font-size: 16px;
}
}
}
.control-buttons {
-webkit-app-region: no-drag;
}
}
.control-buttons {
display: flex;
gap: 16px;
-webkit-app-region: no-drag;
}
.control-button {
width: 32px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
border-radius: 50%;
color: var(--text-color);
transition: all 0.2s ease;
backdrop-filter: blur(4px);
&:hover {
background: var(--control-bg);
}
i {
font-size: 18px;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
&.active {
color: var(--highlight-color);
}
}
}
.lyric-container {
position: absolute;
top: 40px;
left: 0;
right: 0;
bottom: 0;
overflow: hidden;
}
.lyric-scroll {
height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
mask-image: linear-gradient(to bottom, transparent 0%, black 20%, black 80%, transparent 100%);
}
.lyric-wrapper {
will-change: transform;
padding: 20vh 0;
transform-origin: center center;
transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
}
.lyric-line {
padding: 4px 20px;
text-align: center;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
&.lyric-line-current {
transform: scale(1.05);
opacity: 1;
}
&.lyric-line-passed,
&.lyric-line-next {
opacity: 0.6;
}
}
.lyric-bar-hover {
.lyric-text {
font-weight: 600;
margin-bottom: 2px;
color: var(--text-color);
white-space: pre-wrap;
word-break: break-all;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
transition: all 0.2s ease;
line-height: 1.4;
}
.lyric-translation {
color: var(--text-secondary);
white-space: pre-wrap;
word-break: break-all;
text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
transition: font-size 0.2s ease;
line-height: 1.4; // 添加行高比例
}
.lyric-empty {
text-align: center;
color: var(--text-secondary);
font-size: 16px;
padding: 20px;
}
body {
background-color: transparent !important;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
'Helvetica Neue', sans-serif;
}
.lyric-content {
transition: font-size 0.2s ease;
}
.lyric-line-current {
opacity: 1;
}
.drag-bar {
-webkit-app-region: drag;
height: 20px;
cursor: move;
background-color: #383838;
opacity: 0;
}
.buttons {
width: 100vw;
height: 100px;
@apply flex justify-center items-center gap-4;
}
.button {
@apply cursor-pointer text-center;
}
.checked {
color: #fff !important;
}
.button-move {
-webkit-app-region: drag;
cursor: move;
}
.music-buttons {
@apply mx-6;
-webkit-app-region: no-drag;
.iconfont {
@apply text-2xl hover:text-green-500 transition;
}
@apply flex items-center;
> div {
@apply cursor-pointer;
}
&-play {
@apply flex justify-center items-center w-12 h-12 rounded-full mx-4 hover:bg-green-500 transition;
background: #383838;
}
}
.check-theme {
font-size: 26px;
cursor: pointer;
opacity: 1;
}
.lyric {
text-shadow: 0 0 1vw #2c2c2c;
font-size: 4vw;
@apply font-bold m-0 p-0 select-none pointer-events-none;
}
.lyric-current {
color: #333;
}
.lyric-next {
color: #999;
margin: 10px;
}
.lyric-window.dark {
.lyric {
text-shadow: none;
text-shadow: 0 0 1vw #000000;
}
.lyric-current {
color: #fff;
}
.lyric-next {
color: #cecece;
}
}
.lyric-box {
// writing-mode: vertical-rl;
padding: 10px;
}
</style>

View File

@@ -10,17 +10,10 @@
:key="item.id"
class="mv-item"
:class="setAnimationClass('animate__bounceIn')"
:style="setAnimationDelay(index, 10)"
:style="getItemAnimationDelay(index)"
>
<div class="mv-item-img" @click="handleShowMv(item, index)">
<n-image
class="mv-item-img-img"
:src="getImgUrl(item.cover, '200y112')"
lazy
preview-disabled
width="200"
height="112"
/>
<n-image class="mv-item-img-img" :src="getImgUrl(item.cover, '320y180')" lazy preview-disabled />
<div class="top">
<div class="play-count">{{ formatNumber(item.playCount) }}</div>
<i class="iconfont icon-videofill"></i>
@@ -50,6 +43,7 @@ import { useStore } from 'vuex';
import { getTopMv } from '@/api/mv';
import MvPlayer from '@/components/MvPlayer.vue';
import { audioService } from '@/services/audioService';
import { IMvItem } from '@/type/mv';
import { formatNumber, getImgUrl, setAnimationClass, setAnimationDelay } from '@/utils';
@@ -65,9 +59,14 @@ const initLoading = ref(false);
const loadingMore = ref(false);
const currentIndex = ref(0);
const offset = ref(0);
const limit = ref(30);
const limit = ref(42);
const hasMore = ref(true);
const getItemAnimationDelay = (index: number) => {
const currentPageIndex = index % limit.value;
return setAnimationDelay(currentPageIndex, 30);
};
onMounted(async () => {
await loadMvList();
});
@@ -75,6 +74,7 @@ onMounted(async () => {
const handleShowMv = async (item: IMvItem, index: number) => {
store.commit('setIsPlay', false);
store.commit('setPlayMusic', false);
audioService.getCurrentSound()?.pause();
showMv.value = true;
currentIndex.value = index;
playMvItem.value = item;
@@ -157,15 +157,15 @@ const isPrevDisabled = computed(() => currentIndex.value === 0);
<style scoped lang="scss">
.mv-list {
@apply relative h-full w-full px-4;
@apply relative h-full w-full;
&-title {
@apply text-xl font-bold;
@apply text-xl font-bold pb-2;
}
&-content {
@apply grid gap-6 pb-28 mt-2;
grid-template-columns: repeat(auto-fill, minmax(14%, 1fr));
@apply grid gap-4 pb-28 mt-2 pr-4;
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
}
.mv-item {
@@ -173,6 +173,7 @@ const isPrevDisabled = computed(() => currentIndex.value === 0);
background-color: #1f1f1f;
&-img {
@apply rounded-lg overflow-hidden relative;
aspect-ratio: 16/9;
line-height: 0;
&:hover img {
@@ -180,7 +181,7 @@ const isPrevDisabled = computed(() => currentIndex.value === 0);
}
&-img {
@apply w-full rounded-lg overflow-hidden;
@apply w-full h-full object-cover rounded-lg overflow-hidden;
}
.top {
@@ -218,8 +219,13 @@ const isPrevDisabled = computed(() => currentIndex.value === 0);
}
.mobile {
.mv-list-title {
@apply text-xl font-bold px-4;
}
.mv-list-content {
grid-template-columns: repeat(auto-fill, minmax(30%, 1fr));
@apply px-4;
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
}
}

View File

@@ -1,41 +1,84 @@
<template>
<div class="set-page">
<div class="set-item">
<div>
<div class="set-item-title">代理</div>
<div class="set-item-content">无法听音乐时打开</div>
<n-scrollbar>
<div class="set-page">
<div v-if="isElectron" class="set-item">
<div>
<div class="set-item-title">代理</div>
<div class="set-item-content">无法听音乐时打开</div>
</div>
<n-switch v-model:value="setData.isProxy" />
</div>
<n-switch v-model:value="setData.isProxy" />
</div>
<div class="set-item">
<div>
<div class="set-item-title">减轻动画效果</div>
<div class="set-item">
<div>
<div class="set-item-title">关闭动画效果</div>
</div>
<n-switch v-model:value="setData.noAnimate" />
</div>
<n-switch v-model:value="setData.noAnimate" />
</div>
<div class="set-item">
<div>
<div class="set-item-title">版本</div>
<div class="set-item-content">当前已是最新版本</div>
<div class="set-item">
<div>
<div class="set-item-title">动画速度</div>
<div class="set-item-content">调节动画播放速度</div>
</div>
<div class="flex items-center gap-2">
<span class="text-sm text-gray-400">{{ setData.animationSpeed }}x</span>
<div class="w-40">
<n-slider
v-model:value="setData.animationSpeed"
:min="0.1"
:max="3"
:step="0.1"
:marks="{
0.1: '极慢',
1: '正常',
3: '极快',
}"
:disabled="setData.noAnimate"
class="w-40"
/>
</div>
</div>
</div>
<div>{{ config.version }}</div>
</div>
<div class="set-item">
<div>
<div class="set-item-title">作者</div>
<div class="set-item-content"></div>
<div class="set-item">
<div>
<div class="set-item-title">版本</div>
<div class="set-item-content">当前已是最新版本</div>
</div>
<div>{{ config.version }}</div>
</div>
<div class="set-item cursor-pointer hover:text-green-500 hover:bg-green-950 transition-all" @click="openAuthor">
<div>
<div class="set-item-title">作者</div>
<div class="set-item-content">algerkong github</div>
</div>
<div>{{ setData.author }}</div>
</div>
<div>{{ setData.author }}</div>
</div>
<div class="set-action">
<n-button @click="handelCancel">取消</n-button>
<n-button type="primary" @click="handleSave">保存并重启</n-button>
<div class="set-action">
<n-button class="w-40 h-10" @click="handelCancel">取消</n-button>
<n-button type="primary" class="w-40 h-10" @click="handleSave">{{
isElectron ? '保存并重启' : '保存'
}}</n-button>
</div>
<div class="p-6 bg-black rounded-lg shadow-lg mt-20">
<div class="text-gray-100 text-base text-center">支持作者</div>
<div class="flex gap-60">
<div class="flex flex-col items-center gap-2 cursor-pointer hover:scale-[2] transition-all z-10 bg-black">
<n-image :src="alipayQR" alt="支付宝收款码" class="w-32 h-32 rounded-lg" preview-disabled />
<span class="text-sm text-gray-100">支付宝</span>
</div>
<div class="flex flex-col items-center gap-2 cursor-pointer hover:scale-[2] transition-all z-10 bg-black">
<n-image :src="wechatQR" alt="微信收款码" class="w-32 h-32 rounded-lg" preview-disabled />
<span class="text-sm text-gray-100">微信支付</span>
</div>
</div>
</div>
</div>
</div>
</n-scrollbar>
</template>
<script setup lang="ts">
import { computed, ref } from 'vue';
import { useRouter } from 'vue-router';
import config from '@/../package.json';
@@ -45,20 +88,32 @@ defineOptions({
name: 'Setting',
});
const setData = ref(store.state.setData);
const alipayQR = 'https://github.com/algerkong/algerkong/blob/main/alipay.jpg?raw=true';
const wechatQR = 'https://github.com/algerkong/algerkong/blob/main/wechat.jpg?raw=true';
const isElectron = ref((window as any).electronAPI !== undefined);
const router = useRouter();
// 使用计算属性来获取和设置数据
const setData = computed({
get: () => store.state.setData,
set: (value) => store.commit('setSetData', value),
});
const handelCancel = () => {
router.back();
};
const windowData = window as any;
const handleSave = () => {
store.commit('setSetData', setData.value);
if (windowData.electronAPI) {
windowData.electronAPI.restart();
if (isElectron.value) {
(window as any).electronAPI.restart();
}
router.back();
};
const openAuthor = () => {
window.open(setData.value.authorUrl, '_blank');
};
</script>
@@ -67,7 +122,7 @@ const handleSave = () => {
@apply flex flex-col justify-center items-center pt-8;
}
.set-item {
@apply w-3/5 flex justify-between items-center mb-4;
@apply w-3/5 flex justify-between items-center mb-2 px-4 py-2 rounded-lg;
.set-item-title {
@apply text-gray-200 text-base;
}
@@ -75,4 +130,7 @@ const handleSave = () => {
@apply text-gray-400 text-sm;
}
}
.set-action {
@apply flex gap-3 mt-4;
}
</style>

View File

@@ -57,12 +57,18 @@ onActivated(() => {
const isShowList = ref(false);
const list = ref<Playlist>();
const listLoading = ref(false);
// 展示歌单
const showPlaylist = async (id: number) => {
const showPlaylist = async (id: number, name: string) => {
isShowList.value = true;
list.value = {};
listLoading.value = true;
list.value = {
name,
} as Playlist;
const { data } = await getListDetail(id);
list.value = data.playlist;
listLoading.value = false;
};
const handlePlay = () => {
@@ -103,7 +109,12 @@ const handlePlay = () => {
<div class="play-list" :class="setAnimationClass('animate__fadeInLeft')">
<div class="title">创建的歌单</div>
<n-scrollbar>
<div v-for="(item, index) in playList" :key="index" class="play-list-item" @click="showPlaylist(item.id)">
<div
v-for="(item, index) in playList"
:key="index"
class="play-list-item"
@click="showPlaylist(item.id, item.name)"
>
<n-image :src="getImgUrl(item.coverImgUrl, '50y50')" class="play-list-item-img" lazy preview-disabled />
<div class="play-list-item-info">
<div class="play-list-item-name">{{ item.name }}</div>
@@ -133,7 +144,13 @@ const handlePlay = () => {
</n-scrollbar>
</div>
</div>
<music-list v-model:show="isShowList" :name="list?.name || ''" :song-list="list?.tracks || []" :list-info="list" />
<music-list
v-model:show="isShowList"
:name="list?.name || ''"
:song-list="list?.tracks || []"
:list-info="list"
:loading="listLoading"
/>
</div>
</template>

View File

@@ -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: [],
};

View File

@@ -36,15 +36,20 @@ export default defineConfig({
port: 4488,
proxy: {
// with options
'/api': {
target: 'http://110.42.251.190:9898',
[process.env.VITE_API_LOCAL as string]: {
target: process.env.VITE_API,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
rewrite: (path) => path.replace(new RegExp(`^${process.env.VITE_API_LOCAL}`), ''),
},
'/music': {
target: 'http://110.42.251.190:4100',
[process.env.VITE_API_MUSIC_PROXY as string]: {
target: process.env.VITE_API_MUSIC,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/music/, ''),
rewrite: (path) => path.replace(new RegExp(`^${process.env.VITE_API_MUSIC_PROXY}`), ''),
},
[process.env.VITE_API_PROXY_MUSIC as string]: {
target: process.env.VITE_API_PROXY,
changeOrigin: true,
rewrite: (path) => path.replace(new RegExp(`^${process.env.VITE_API_PROXY_MUSIC}`), ''),
},
},
},