diff --git a/.env.base b/.env.base index e050050..6a61f7b 100644 --- a/.env.base +++ b/.env.base @@ -16,4 +16,4 @@ VITE_API_BASEPATH=/crm-api VITE_API_URL=/admin-api # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ diff --git a/.env.dev b/.env.dev index 873f932..c37604e 100644 --- a/.env.dev +++ b/.env.dev @@ -16,7 +16,7 @@ VITE_API_BASEPATH=/crm-api VITE_API_URL=/admin-api # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ # 是否删除debugger VITE_DROP_DEBUGGER=false diff --git a/.env.front b/.env.front index 111418e..0ed3152 100644 --- a/.env.front +++ b/.env.front @@ -16,7 +16,7 @@ VITE_API_BASEPATH=/crm-api VITE_API_URL=/admin-api # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ # 项目本地运行端口号, 与.vscode/launch.json配合 VITE_PORT=80 diff --git a/.env.pro b/.env.pro index ef4877a..118c95f 100644 --- a/.env.pro +++ b/.env.pro @@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ # 输出路径 VITE_OUT_DIR=dist-pro diff --git a/.env.static b/.env.static index 82f9d57..446f225 100644 --- a/.env.static +++ b/.env.static @@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ # 输出路径 VITE_OUT_DIR=dist-dev diff --git a/.env.test b/.env.test index 9d74794..9422e59 100644 --- a/.env.test +++ b/.env.test @@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false VITE_SOURCEMAP=true # 打包路径 -VITE_BASE_PATH=/crm +VITE_BASE_PATH=/crm/ # 输出路径 VITE_OUT_DIR=dist-test diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index e0b2f1a..079df83 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -7,7 +7,7 @@ const config: { /** * api请求基础路径 */ - base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH, + base_url: import.meta.env.VITE_API_BASEPATH, /** * 接口成功返回状态码 */ diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 5382f1e..8adfc2f 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -200,14 +200,18 @@ service.interceptors.response.use( } else { ElNotification.error({ title: msg }) if (code == 403) { - // 无访问权限,退出登录 - const { wsCache } = useCache() - const tenantId = wsCache.get('TENANT_ID') - const appId = wsCache.get('App_ID') - resetRouter() // 重置静态路由表 - wsCache.clear() - removeToken() - window.location.href = `/login?tenantId=${tenantId}&appId=${appId}` + ElMessageBox.confirm(`${msg},是否重新登陆`, '提示', { + type: 'warning' + }).then(() => { + // 无访问权限,退出登录 + const { wsCache } = useCache() + const tenantId = wsCache.get('TENANT_ID') + const appId = wsCache.get('App_ID') + resetRouter() // 重置静态路由表 + wsCache.clear() + removeToken() + window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}` + }) } } return Promise.reject('error') diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue index c4029f3..bdeb2ca 100644 --- a/src/layout/components/Setting/src/Setting.vue +++ b/src/layout/components/Setting/src/Setting.vue @@ -198,6 +198,7 @@ const clear = () => {