🐞 fix: 修复当电台模式时播放列表出现错误

imsyy · Dec 27, 2023 · 8f416ff · 8f416ff
1 parent 99ab194
commit 8f416ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/electron.vite.config.js b/electron.vite.config.js
@@ -97,9 +97,9 @@ export default defineConfig(({ mode }) => {
  ],
  },
  manifest: {
- name: loadEnv(mode, process.cwd()).RENDERER_VITE_SITE_TITLE,
- short_name: loadEnv(mode, process.cwd()).RENDERER_VITE_SITE_TITLE,
- description: loadEnv(mode, process.cwd()).RENDERER_VITE_SITE_DES,
+ name: getEnv("RENDERER_VITE_SITE_TITLE"),
+ short_name: getEnv("RENDERER_VITE_SITE_TITLE"),
+ description: getEnv("RENDERER_VITE_SITE_DES"),
  display: "standalone",
  start_url: "/",
  theme_color: "#fff",

diff --git a/electron/main/index.js b/electron/main/index.js
@@ -121,12 +121,11 @@ class MainProcess {
  icon: nativeImage.createFromPath(join(__dirname, "../../public/images/icons/favicon.png")),
  // 预加载
  webPreferences: {
- // devTools: is.dev, //是否开启 DevTools
+ devTools: is.dev,
  preload: join(__dirname, "../preload/index.js"),
  sandbox: false,
  webSecurity: false,
  hardwareAcceleration: true,
- nodeIntegration: true,
  },
  });
 

diff --git a/src/components/Global/Playlist.vue b/src/components/Global/Playlist.vue
@@ -159,7 +159,7 @@ const playlistOpen = () => {
 // 播放歌曲
 const playSong = debounce(async (song, index) => {
  // 更改模式
- playMode.value = "normal";
+ if (playMode.value !== "dj") playMode.value = "normal";
  // 更改播放索引
  playIndex.value = index;
  // 是否为当前播放歌曲

diff --git a/src/utils/globalEvents.js b/src/utils/globalEvents.js
@@ -1,6 +1,6 @@
 import { checkPlatform } from "@/utils/helper";
 import { playOrPause, changePlayIndex } from "@/utils/Player";
-import { siteStatus } from "@/stores";
+import { siteStatus, musicData } from "@/stores";
 
 /**
  * 全局事件
@@ -11,6 +11,8 @@ const globalEvents = (router) => {
  // 显示播放器
  electron.ipcRenderer.on("showPlayer", () => {
  const status = siteStatus();
+ const music = musicData();
+ if (music.playMode === "dj") return false;
  status.showFullPlayer = true;
  });
  // 播放或暂停