diff --git a/vue/afvue/package.json b/vue/afvue/package.json index 9eae4f3..aa7ce8b 100644 --- a/vue/afvue/package.json +++ b/vue/afvue/package.json @@ -14,7 +14,8 @@ "lodash": "^4.17.21", "pinia": "^2.0.16", "vue": "^2.7.7", - "vue-router": "^3.5.4" + "vue-router": "^3.5.4", + "vuex": "^3.1.1" }, "devDependencies": { "@vitejs/plugin-legacy": "^2.0.0", diff --git a/vue/afvue/src/main.js b/vue/afvue/src/main.js index 04e96a1..b49032d 100644 --- a/vue/afvue/src/main.js +++ b/vue/afvue/src/main.js @@ -9,10 +9,12 @@ import './permission' import './assets/main.css' Vue.use(PiniaVuePlugin) +const pinia = createPinia() + Vue.use(VueAxios) new Vue({ router, - pinia: createPinia(), + store: pinia, render: (h) => h(App) }).$mount('#app') diff --git a/vue/afvue/src/permission.js b/vue/afvue/src/permission.js index 6841b42..ba29c34 100644 --- a/vue/afvue/src/permission.js +++ b/vue/afvue/src/permission.js @@ -1,5 +1,6 @@ import router from './router' import { userStStore } from './stores/user' +import { useCounterStore } from './stores/counter' import NProgress from 'nprogress' // progress bar import '@/components/nprogress.css' // progress bar style @@ -8,23 +9,23 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration // 登录页面 const loginRoutePath = '/login' // 白名单 -const whiteList = [loginRoutePath, '/404', '/401'] +const whiteList = [loginRoutePath] // 路由守卫 -// router.beforeEach((to, from, next) => { -// NProgress.start() // start progress bar +router.beforeEach((to, from, next) => { + NProgress.start() // start progress bar // // 获取用户store实例 -// const userStore = userStStore() -// console.log(userStore.token,"user token") + const userStore = useCounterStore() + // console.log(userStore.token,"user token") // // 检查token // console.log("check token") -// }) +}) // 路由守卫 router.afterEach((to, from) => { diff --git a/vue/afvue/src/stores/user.js b/vue/afvue/src/stores/user.js index d0960f0..0144fc0 100644 --- a/vue/afvue/src/stores/user.js +++ b/vue/afvue/src/stores/user.js @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; export const userStStore = defineStore('user', { state: () => { return { - token: null, // 存储用户token + token: "ffdsasfoo", // 存储用户token user: null, // 存储用户对象 isLoggedIn: false // 用户登录状态 }; @@ -24,8 +24,7 @@ export const userStStore = defineStore('user', { this.isLoggedIn = false; }, setToken(token) { - // this.token = token; - console.log("set token") + this.token = token; } }, }); diff --git a/vue/afvue/yarn.lock b/vue/afvue/yarn.lock index ca939c5..4da21ad 100644 --- a/vue/afvue/yarn.lock +++ b/vue/afvue/yarn.lock @@ -669,3 +669,8 @@ vue@^2.7.7: dependencies: "@vue/compiler-sfc" "2.7.16" csstype "^3.1.0" + +vuex@^3.1.1: + version "3.6.2" + resolved "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" + integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==