mirror of
https://github.com/qier222/YesPlayMusic.git
synced 2024-11-22 12:47:27 +08:00
fix: conflict
This commit is contained in:
commit
912839433e
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,6 +1,7 @@
|
|||
.DS_Store
|
||||
node_modules
|
||||
/dist
|
||||
dist_electron
|
||||
|
||||
|
||||
# local env files
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user