fix: conflict

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

1
.gitignore vendored
View File

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

View File

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

View File

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