dedsudiyu 1 周之前
父節點
當前提交
badb9f5da1
共有 3 個文件被更改,包括 6 次插入5 次删除
  1. 2 1
      src/router/index.js
  2. 4 3
      src/store/index.js
  3. 0 1
      src/utils/request.js

+ 2 - 1
src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import VueRouter from 'vue-router'
+import { getToken } from '@/utils/auth'
 
 
 Vue.use(VueRouter)
 Vue.use(VueRouter)
 
 
@@ -34,7 +35,7 @@ const router = new VueRouter({
 
 
 // 路由守卫
 // 路由守卫
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
-  const token = localStorage.getItem('token')
+  const token = getToken();
   if (to.meta.requiresAuth && !token) {
   if (to.meta.requiresAuth && !token) {
     if (to.path !== '/login') {
     if (to.path !== '/login') {
       next('/login')
       next('/login')

+ 4 - 3
src/store/index.js

@@ -1,17 +1,18 @@
 import Vue from 'vue'
 import Vue from 'vue'
 import Vuex from 'vuex'
 import Vuex from 'vuex'
+import { getToken,setToken,removeToken } from '@/utils/auth'
 
 
 Vue.use(Vuex)
 Vue.use(Vuex)
 
 
 export default new Vuex.Store({
 export default new Vuex.Store({
   state: {
   state: {
-    token: localStorage.getItem('token') || '',
+    token: getToken() || '',
     userInfo: JSON.parse(localStorage.getItem('userInfo') || '{}')
     userInfo: JSON.parse(localStorage.getItem('userInfo') || '{}')
   },
   },
   mutations: {
   mutations: {
     SET_TOKEN(state, token) {
     SET_TOKEN(state, token) {
       state.token = token
       state.token = token
-      localStorage.setItem('token', token)
+      setToken(token)
     },
     },
     SET_USER_INFO(state, info) {
     SET_USER_INFO(state, info) {
       state.userInfo = info
       state.userInfo = info
@@ -20,7 +21,7 @@ export default new Vuex.Store({
     LOGOUT(state) {
     LOGOUT(state) {
       state.token = ''
       state.token = ''
       state.userInfo = {}
       state.userInfo = {}
-      localStorage.removeItem('token')
+      removeToken()
       localStorage.removeItem('userInfo')
       localStorage.removeItem('userInfo')
     }
     }
   },
   },

+ 0 - 1
src/utils/request.js

@@ -30,7 +30,6 @@ service.interceptors.request.use(
   config => {
   config => {
     // 弹层相关
     // 弹层相关
     loadingInstance = Loading.service(options)
     loadingInstance = Loading.service(options)
-    // const token = localStorage.getItem('token')
     const token = getToken();
     const token = getToken();
     if (token) {
     if (token) {
       config.headers['Authorization'] = token
       config.headers['Authorization'] = token