Merge branch 'main' into xingyy

This commit is contained in:
Phoenix 2025-05-12 14:35:50 +08:00
commit c9794c3f25
2 changed files with 8 additions and 3 deletions

View File

@ -2,6 +2,7 @@ import axios from "axios";
import $router from "../router";
import { message } from "ant-design-vue";
import { Local } from "@/utils/erpStorage.js";
import { getAccessToken } from "@/utils/auth";
const service = axios.create({
baseURL: import.meta.env.VITE_EPR_BASEURL,
timeout: 60 * 60 * 1000,
@ -21,6 +22,10 @@ service.interceptors.request.use(
config.headers["Content-Type"] = "multipart/form-data";
config.headers.Authorization = Local.get("token") || "";
} else config.headers.Authorization = Local.get("token") || "";
if(!config.headers.Authorization && import.meta.env.MODE === 'test'){
// 测试环境直接启动项目时没有token使用auth写死的token
config.headers.Authorization = getAccessToken()
}
return config;
},
(error) => {

View File

@ -27,9 +27,9 @@ export default defineConfig(({ mode }) => {
vueJsx({}),
compressPlugin(),
UnoCSS(),
vueDevTools({
launchEditor: 'cursor',
})
// vueDevTools({
// launchEditor: 'cursor',
// })
],
define: {
__APP_ENV__: env.APP_ENV