diff --git a/.env b/.env index 0e20e5c..c50d63c 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 生产环境优先级 -# development & production > .env +# development & production & test > .env # title VITE_GLOB_APP_TITLE = SnowAdmin diff --git a/src/api/index.ts b/src/api/index.ts index c60e60a..9e2f359 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -2,8 +2,9 @@ import axios from "axios"; import router from "@/router"; import { Message } from "@arco-design/web-vue"; +// 是否开启本地mock const MockFlag = import.meta.env.VITE_APP_OPEN_MOCK === "true"; -console.log("在这里axios", import.meta.env.VITE_APP_OPEN_MOCK, MockFlag); + // 创建axios实例 const service = axios.create({ baseURL: MockFlag ? "" : "/api" @@ -21,7 +22,6 @@ service.interceptors.request.use( // 有token,在请求头中携带token config.headers.Authorization = userInfo.token; } - console.log("请求拦截", config); return config; }, function (error: any) { @@ -33,7 +33,6 @@ service.interceptors.request.use( // 响应拦截器 service.interceptors.response.use( function (response: any) { - console.log("响应了", response); if (response.status != 200) { Message.error("服务器异常,请联系管理员"); return Promise.reject(response.data); diff --git a/src/api/modules/test/index.ts b/src/api/modules/test/index.ts index 7b21ab9..b6c2ac7 100644 --- a/src/api/modules/test/index.ts +++ b/src/api/modules/test/index.ts @@ -1,9 +1,8 @@ import axios from "@/api"; -export const mockTestAPI = (params: any) => { +export const mockTestAPI = () => { return axios({ url: "/mock/test/success", - method: "get", - params + method: "get" }); }; diff --git a/src/mock/index.ts b/src/mock/index.ts index 8eb2a69..3b64765 100644 --- a/src/mock/index.ts +++ b/src/mock/index.ts @@ -1,12 +1,6 @@ import { createProdMockServer } from "vite-plugin-mock/es/createProdMockServer"; import testModule from "./test/index"; -// import userModule from './user/index' -// import tableModule from './person/index' -// import systemModule from './system/index' -// import fileModule from './file/index' -// import cateModule from './cate/index' -// import areaModule from './area/index' export function setupProdMockServer() { createProdMockServer([...testModule]); diff --git a/src/mock/test/index.ts b/src/mock/test/index.ts index 74db144..a03c61e 100644 --- a/src/mock/test/index.ts +++ b/src/mock/test/index.ts @@ -7,7 +7,7 @@ export default [ method: "get", timeout: 500, response: () => { - return resultSuccess("mock数据成功了"); + return resultSuccess("SnowAdmin开源免费,Welcome!"); } }, { @@ -15,7 +15,7 @@ export default [ method: "get", timeout: 500, response: () => { - return resultError(null, "请求数据出错了", 500); + return resultError(null, "模拟mock数据出错", 500); } } ] as MockMethod[]; diff --git a/src/views/login/components/login-banner.vue b/src/views/login/components/login-banner.vue index 8e025b5..b710b5b 100644 --- a/src/views/login/components/login-banner.vue +++ b/src/views/login/components/login-banner.vue @@ -14,10 +14,12 @@ import { mockTestAPI } from "@/api/modules/test/index"; // 全局title const title = import.meta.env.VITE_GLOB_APP_TITLE; +// mock模拟数据 const onMock = async () => { - console.log("模拟数据"); + const MockFlag = import.meta.env.VITE_APP_OPEN_MOCK; + if (MockFlag === "false") return; let res = await mockTestAPI(); - console.log("数据在这", res); + console.log("mock数据成功", res); }; diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts index cc1f825..4c551f8 100644 --- a/src/vite-env.d.ts +++ b/src/vite-env.d.ts @@ -16,3 +16,4 @@ declare module "@codemirror/lang-vue"; declare module "nprogress"; declare module "@wangeditor/editor-for-vue"; declare module "@/directives/modules/custom"; +declare module "mockjs"; diff --git a/vite.config.ts b/vite.config.ts index 066918c..f48bc7e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,7 +9,7 @@ import { ArcoResolver } from "unplugin-vue-components/resolvers"; import { vitePluginForArco } from "@arco-plugins/vite-vue"; import { createSvgIconsPlugin } from "vite-plugin-svg-icons"; import { createHtmlPlugin } from "vite-plugin-html"; -import { viteMockServe } from 'vite-plugin-mock' +import { viteMockServe } from "vite-plugin-mock"; const themePath = normalizePath(path.normalize("./src/style/global-theme.scss")); // https://vitejs.dev/config/ @@ -78,7 +78,7 @@ export default defineConfig(({ mode }) => { dts: "src/components.d.ts" }), viteMockServe({ - mockPath: './src/mock/', // 目录位置 + mockPath: "./src/mock/", // 目录位置 logger: true, // 是否在控制台显示请求日志 supportTs: true, // 是否读取ts文件模块 localEnabled: env.VITE_APP_OPEN_MOCK === "true", // 设置是否启用本地mock文件 @@ -87,7 +87,7 @@ export default defineConfig(({ mode }) => { injectCode: ` import { setupProdMockServer } from '../src/mock/index'; setupProdMockServer(); - `, + ` }) ], resolve: {