github-mirror/YesPlayMusic
2
0
Fork 0
mirror of https://github.com/qier222/YesPlayMusic.git synced 2024-11-22 12:15:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
kunkka 2020-10-27 23:17:15 +08:00
commit 912839433e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.DS_Store .DS_Store
node_modules node_modules
/dist /dist
dist_electron
# local env files # local env files

4
src/router/index.js
View File

@ -1,6 +1,5 @@
import Vue from "vue"; import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
import store from "@/store";
import NProgress from "nprogress"; import NProgress from "nprogress";
import "@/assets/css/nprogress.css"; import "@/assets/css/nprogress.css";
import { isLooseLoggedIn } from "@/utils/auth"; import { isLooseLoggedIn } from "@/utils/auth";
@ -118,9 +117,6 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// 需要登录的逻辑 // 需要登录的逻辑
if (to.meta.requireLogin) { if (to.meta.requireLogin) {
if (store.state.data.user.nickname === undefined) {
next({ path: "/login" });
}
if (isLooseLoggedIn()) { if (isLooseLoggedIn()) {
next(); next();
} else { } else {

1
src/store/actions.js
View File

@ -85,6 +85,7 @@ export default {
if (state.player.repeat !== "off") { if (state.player.repeat !== "off") {
nextTrack = state.player.list.find((t) => t.sort === 0); nextTrack = state.player.list.find((t) => t.sort === 0);
} else { } else {
document.title = "YesPlayMusic";
return; return;
} }
} }