-
+
![song]()
@@ -145,15 +143,24 @@ const props = defineProps({
.play {
position: absolute;
opacity: 0;
- font-size: 60px;
- color: #ffffffe6;
- transform: scale(0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 50%;
transition:
transform 0.3s,
opacity 0.3s;
cursor: pointer;
+ :deep(.play) {
+ --n-width: 50px;
+ --n-height: 50px;
+ --n-font-size: 20px;
+ .n-icon {
+ font-size: 60px !important;
+ }
+ }
&:hover {
- transform: scale(1.2);
+ transform: scale(1.1);
}
&:active {
transform: scale(1);
@@ -212,7 +219,6 @@ const props = defineProps({
}
&:hover {
background-color: var(--n-close-color-hover);
- transform: translate3d(-2px, 0, 0);
.cover-main-img {
filter: brightness(0.8);
}
diff --git a/src/components/Global/Playlist.vue b/src/components/Global/Playlist.vue
index 257be1b..8cfed44 100644
--- a/src/components/Global/Playlist.vue
+++ b/src/components/Global/Playlist.vue
@@ -123,15 +123,18 @@
+
+
+
+
diff --git a/src/components/List/SongListDropdown.vue b/src/components/List/SongListDropdown.vue
index 147aff1..2c419cc 100644
--- a/src/components/List/SongListDropdown.vue
+++ b/src/components/List/SongListDropdown.vue
@@ -27,18 +27,15 @@ import { storeToRefs } from "pinia";
import { musicData, siteData, siteStatus } from "@/stores";
import { useRouter } from "vue-router";
import { addSongToNext } from "@/utils/Player";
-import { setCloudDel } from "@/api/cloud";
-import { addSongToPlayList } from "@/api/playlist";
import { copyData } from "@/utils/helper";
import SvgIcon from "@/components/Global/SvgIcon";
-const emit = defineEmits(["playSong"]);
+const emit = defineEmits(["playSong", "delCloudSong", "deletePlaylistSong", "delLocalSong"]);
const data = siteData();
const music = musicData();
const router = useRouter();
const status = siteStatus();
const { playMode } = storeToRefs(status);
-const { playSongData } = storeToRefs(music);
const { userData, userLikeData } = storeToRefs(data);
// 右键菜单数据
@@ -74,7 +71,11 @@ const renderSong = (song, isSong) => {
className: "song-data",
},
[
- h(NImage, { src: song?.coverSize?.s || song?.cover, class: "cover" }),
+ h(NImage, {
+ src: song?.coverSize?.s || song?.cover,
+ class: "cover",
+ previewDisabled: true,
+ }),
h("div", { class: "song-detail" }, [
h(NText, { class: "name" }, () => [song?.name || "未知曲目"]),
isSong
@@ -111,8 +112,8 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
// 当前状态
const isFm = playMode.value === "fm";
const isSong = type === "song";
- const isLocalSong = song?.path ? true : false;
- const isHasMv = song.mv && song.mv !== 0 ? true : false;
+ const isLocalSong = !!song?.path;
+ const isHasMv = !!song?.mv && song.mv !== 0;
const isCloud = router.currentRoute.value.name === "cloud";
const isUserPlaylist = sourceId !== 0 && userPlaylistsData.some((pl) => pl.id == sourceId);
// 生成菜单
@@ -143,7 +144,7 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
{
key: "next-play",
label: "下一首播放",
- show: isSong && playMode.value !== "dj" && playSongData.value?.id !== song.id && !isFm,
+ show: isSong && playMode.value !== "dj" && music.getPlaySongData?.id !== song.id && !isFm,
props: {
onClick: () => {
playMode.value = "song";
@@ -239,7 +240,7 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
show: !isCloud && isUserPlaylist,
props: {
onClick: () => {
- deletePlaylistSong(sourceId, song, data, index);
+ emit("deletePlaylistSong", data, song, index);
},
},
icon: renderIcon("delete"),
@@ -261,7 +262,7 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
show: isCloud,
props: {
onClick: () => {
- delCloudSong(data, song, index);
+ emit("delCloudSong", data, song, index);
},
},
icon: renderIcon("delete"),
@@ -280,10 +281,10 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
{
key: "delete",
label: "从本地磁盘中删除",
- show: isLocalSong && playSongData.value?.id !== song.id,
+ show: isLocalSong && music.getPlaySongData?.id !== song.id,
props: {
onClick: () => {
- delLocalSong(data, song, index);
+ emit("delLocalSong", data, song, index);
},
},
icon: renderIcon("delete"),
@@ -330,65 +331,6 @@ const openDropdown = (e, data, song, index, sourceId, type) => {
}
};
-// 云盘歌曲删除
-const delCloudSong = (data, song, index) => {
- console.log(data, song, index);
- $dialog.warning({
- title: "确认删除",
- content: `确认从云盘中删除 ${song.name}？该操作无法撤销！`,
- positiveText: "删除",
- negativeText: "取消",
- onPositiveClick: async () => {
- const result = await setCloudDel(song.id);
- if (result.code == 200) {
- data.splice(index, 1);
- $message.success("删除成功");
- } else {
- $message.error("删除失败，请重试");
- }
- },
- });
-};
-
-// 歌单歌曲删除
-const deletePlaylistSong = (pid, song, data, index) => {
- $dialog.warning({
- title: "确认删除",
- content: `确认从歌单中移除 ${song.name}？该操作无法撤销！`,
- positiveText: "删除",
- negativeText: "取消",
- onPositiveClick: async () => {
- const result = await addSongToPlayList(pid, song?.id, "del");
- if (result.status === 200) {
- data.length === 1 ? data.splice(0, 1, "empty") : data.splice(index, 1);
- $message.success("歌曲删除成功");
- } else {
- $message.error("歌曲删除失败，请重试");
- }
- },
- });
-};
-
-// 本地歌曲删除
-const delLocalSong = (data, song, index) => {
- $dialog.warning({
- title: "确认删除",
- content: `确认从本地磁盘中删除 ${song.name}？该操作无法撤销！`,
- positiveText: "删除",
- negativeText: "取消",
- onPositiveClick: async () => {
- console.log(data, song, index);
- const result = await electron.ipcRenderer.invoke("deleteFile", song?.path);
- if (result) {
- data.length === 1 ? data.splice(0, 1, "empty") : data.splice(index, 1);
- $message.success("歌曲删除成功");
- } else {
- $message.error("歌曲删除失败，请重试");
- }
- },
- });
-};
-
defineExpose({
openDropdown,
});
diff --git a/src/components/Modal/CloudSongMatch.vue b/src/components/Modal/CloudSongMatch.vue
index fa336c6..f52332e 100644
--- a/src/components/Modal/CloudSongMatch.vue
+++ b/src/components/Modal/CloudSongMatch.vue
@@ -78,7 +78,7 @@
-
+
取消
纠正
-
+
diff --git a/src/components/Modal/CreatePlaylist.vue b/src/components/Modal/CreatePlaylist.vue
index b3ff5a0..8a2267c 100644
--- a/src/components/Modal/CreatePlaylist.vue
+++ b/src/components/Modal/CreatePlaylist.vue
@@ -21,7 +21,7 @@
设为隐私歌单
-
+
取消
新建
-
+
diff --git a/src/components/Modal/DownloadSong.vue b/src/components/Modal/DownloadSong.vue
index 3199b2f..996eaf2 100644
--- a/src/components/Modal/DownloadSong.vue
+++ b/src/components/Modal/DownloadSong.vue
@@ -17,7 +17,7 @@
当前为云盘歌曲，下载的文件均为最高音质
-
+
-
+