From 4d8f63c2235f04a5e40cae0f108a56669f2dafad Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 25 Jun 2023 17:32:53 +0800 Subject: [PATCH] fix store --- package.json | 1 - src/api/index.ts | 11 +++++++---- src/main.ts | 2 -- yarn.lock | 10 +--------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d582875d..8ff8a770 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "axios-mock-adapter": "^1.21.4", "chart.js": "^4.1.2", "jwt-decode": "^3.1.2", - "pinia": "^2.0.36", "prismjs": "^1.29.0", "roboto-fontface": "^0.10.0", "sass": "^1.59.3", diff --git a/src/api/index.ts b/src/api/index.ts index 9d20b3b9..42a0b642 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,9 @@ -import axios from 'axios' -import router from '@/router' +import router from '@/router'; +import axios from 'axios'; +import { useStore } from 'vuex'; + +// Vuex Store +const store = useStore(); // 创建axios实例 const api = axios.create({ @@ -8,9 +12,8 @@ const api = axios.create({ // 添加请求拦截器 api.interceptors.request.use(config => { - const token = localStorage.getItem('token') - // 在请求头中添加token + const token = store.state.auth.token if (token) config.headers.Authorization = `Bearer ${token}` diff --git a/src/main.ts b/src/main.ts index f03fd0fc..e56f25b8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,7 +8,6 @@ import store from '@/store' import '@core/scss/template/index.scss' import '@layouts/styles/index.scss' import '@styles/styles.scss' -import { createPinia } from 'pinia' import { createApp } from 'vue' loadFonts() @@ -18,7 +17,6 @@ const app = createApp(App) // Use plugins app.use(vuetify) -app.use(createPinia()) app.use(store) app.use(router) diff --git a/yarn.lock b/yarn.lock index 532c1613..ba3da6dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5410,14 +5410,6 @@ pify@^2.3.0: resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== -pinia@^2.0.36: - version "2.0.36" - resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.36.tgz#65130f3b94cc7fe25156308634010fab893dff24" - integrity sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ== - dependencies: - "@vue/devtools-api" "^6.5.0" - vue-demi "*" - pkg-dir@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -6881,7 +6873,7 @@ vue-chartjs@^5.2.0: resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-5.2.0.tgz#3d0076ccf8016d1bf8fab5ccd837e7fb81005ded" integrity sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA== -vue-demi@*, vue-demi@>=0.14.0: +vue-demi@>=0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.0.tgz#dcfd9a9cf9bb62ada1582ec9042372cf67ca6190" integrity sha512-gt58r2ogsNQeVoQ3EhoUAvUsH9xviydl0dWJj7dabBC/2L4uBId7ujtCwDRD0JhkGsV1i0CtfLAeyYKBht9oWg==