From c8400abd9f37405127890be1c9a559edf9f251f8 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Thu, 30 Nov 2023 09:46:28 +0800 Subject: [PATCH] fix: #367 --- mock/analysis/index.mock.ts | 11 ++++------- mock/department/index.mock.ts | 18 +++++++----------- mock/dict/index.mock.ts | 8 ++------ mock/menu/index.mock.ts | 5 +---- mock/request/index.mock.ts | 14 +++++--------- mock/role/index.mock.ts | 11 ++++------- mock/table/index.mock.ts | 15 ++++++--------- mock/user/index.mock.ts | 10 +++------- mock/workplace/index.mock.ts | 14 +++++--------- src/config/axios/config.ts | 5 ++--- 10 files changed, 39 insertions(+), 72 deletions(-) diff --git a/mock/analysis/index.mock.ts b/mock/analysis/index.mock.ts index 85e66d2..5a85b4a 100644 --- a/mock/analysis/index.mock.ts +++ b/mock/analysis/index.mock.ts @@ -1,8 +1,5 @@ -import config from '@/config/axios/config' import { defineMock } from 'vite-plugin-mock-dev-server' -const { code } = config - const delay = 1000 export default defineMock([ @@ -13,7 +10,7 @@ export default defineMock([ delay, body: () => { return { - code: code, + code: 0, data: { users: 102400, messages: 81212, @@ -30,7 +27,7 @@ export default defineMock([ delay, body: () => { return { - code: code, + code: 0, data: [ { value: 1000, name: 'analysis.directAccess' }, { value: 310, name: 'analysis.mailMarketing' }, @@ -48,7 +45,7 @@ export default defineMock([ delay, body: () => { return { - code: code, + code: 0, data: [ { value: 13253, name: 'analysis.monday' }, { value: 34235, name: 'analysis.tuesday' }, @@ -68,7 +65,7 @@ export default defineMock([ delay, body: () => { return { - code: code, + code: 0, data: [ { estimate: 100, actual: 120, name: 'analysis.january' }, { estimate: 120, actual: 82, name: 'analysis.february' }, diff --git a/mock/department/index.mock.ts b/mock/department/index.mock.ts index 416c036..3d5940f 100644 --- a/mock/department/index.mock.ts +++ b/mock/department/index.mock.ts @@ -1,10 +1,6 @@ -import config from '@/config/axios/config' - import { toAnyString } from '@/utils' import { faker } from '@faker-js/faker' -const { code } = config - const departmentList: any = [] const citys = ['厦门总公司', '北京分公司', '上海分公司', '福州分公司', '深圳分公司', '杭州分公司'] @@ -84,7 +80,7 @@ export default [ method: 'GET', body: () => { return { - code: code, + code: 0, data: { list: departmentList } @@ -96,7 +92,7 @@ export default [ method: 'GET', body: () => { return { - code: code, + code: 0, data: { list: departmentList, total: 5 @@ -127,7 +123,7 @@ export default [ }) } return { - code: code, + code: 0, data: { total: 100, list: mockList @@ -142,7 +138,7 @@ export default [ delay: 1000, body: () => { return { - code: code, + code: 0, data: 'success' } } @@ -160,7 +156,7 @@ export default [ } } else { return { - code: code, + code: 0, data: 'success' } } @@ -173,7 +169,7 @@ export default [ delay: 1000, body: () => { return { - code: code, + code: 0, data: 'success' } } @@ -191,7 +187,7 @@ export default [ } } else { return { - code: code, + code: 0, data: 'success' } } diff --git a/mock/dict/index.mock.ts b/mock/dict/index.mock.ts index cf47ba9..ae22d00 100644 --- a/mock/dict/index.mock.ts +++ b/mock/dict/index.mock.ts @@ -1,7 +1,3 @@ -import config from '@/config/axios/config' - -const { code } = config - const delay = 1000 const dictObj: Recordable = { @@ -29,7 +25,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: dictObj } } @@ -41,7 +37,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: [ { label: 'test1', diff --git a/mock/menu/index.mock.ts b/mock/menu/index.mock.ts index 8f4e576..fd1b82d 100644 --- a/mock/menu/index.mock.ts +++ b/mock/menu/index.mock.ts @@ -1,8 +1,5 @@ -import config from '@/config/axios/config' import { faker } from '@faker-js/faker' -const { code } = config - const delay = 1000 export default [ @@ -13,7 +10,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: { list: [ { diff --git a/mock/request/index.mock.ts b/mock/request/index.mock.ts index e595fae..fd3dfcb 100644 --- a/mock/request/index.mock.ts +++ b/mock/request/index.mock.ts @@ -1,9 +1,5 @@ -import config from '@/config/axios/config' - const delay = 600000 -const { code } = config - export default [ { url: '/mock/request/1', @@ -11,7 +7,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: 'request-1' } } @@ -22,7 +18,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: 'request-2' } } @@ -33,7 +29,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: 'request-3' } } @@ -44,7 +40,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: 'request-4' } } @@ -55,7 +51,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: 'request-5' } } diff --git a/mock/role/index.mock.ts b/mock/role/index.mock.ts index f8ce84c..e89be2c 100644 --- a/mock/role/index.mock.ts +++ b/mock/role/index.mock.ts @@ -1,10 +1,7 @@ -import config from '@/config/axios/config' import { faker } from '@faker-js/faker' import { toAnyString } from '@/utils' -const { code } = config - const delay = 1000 const adminList = [ @@ -1144,7 +1141,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: adminList } } @@ -1155,7 +1152,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: { list: List, total: 4 @@ -1170,7 +1167,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: testList } } @@ -1181,7 +1178,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: { list: List, total: 4 diff --git a/mock/table/index.mock.ts b/mock/table/index.mock.ts index 1d2a375..9cb17e9 100644 --- a/mock/table/index.mock.ts +++ b/mock/table/index.mock.ts @@ -1,10 +1,7 @@ -import config from '@/config/axios/config' import { faker } from '@faker-js/faker' import { toAnyString } from '@/utils' -const { code } = config - const delay = 1000 const count = 100 @@ -196,7 +193,7 @@ export default [ (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1) ) return { - code: code, + code: 0, data: { total: mockList.length, list: pageList @@ -219,7 +216,7 @@ export default [ (_, index) => index < pageSize * pageIndex && index >= pageSize * (pageIndex - 1) ) return { - code: code, + code: 0, data: { total: mockList.length, list: pageList @@ -240,7 +237,7 @@ export default [ }) ].concat(List) return { - code: code, + code: 0, data: 'success' } } else { @@ -252,7 +249,7 @@ export default [ } }) return { - code: code, + code: 0, data: 'success' } } @@ -267,7 +264,7 @@ export default [ for (const example of List) { if (example.id === id) { return { - code: code, + code: 0, data: example } } @@ -293,7 +290,7 @@ export default [ } } return { - code: code, + code: 0, data: 'success' } } diff --git a/mock/user/index.mock.ts b/mock/user/index.mock.ts index 5cb1744..388fccc 100644 --- a/mock/user/index.mock.ts +++ b/mock/user/index.mock.ts @@ -1,7 +1,3 @@ -import config from '@/config/axios/config' - -const { code } = config - const delay = 1000 const List: { @@ -44,7 +40,7 @@ export default [ ) return { - code: code, + code: 0, data: { total: mockList.length, list: pageList @@ -64,7 +60,7 @@ export default [ if (user.username === data.username && user.password === data.password) { hasUser = true return { - code: code, + code: 0, data: user } } @@ -84,7 +80,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: null } } diff --git a/mock/workplace/index.mock.ts b/mock/workplace/index.mock.ts index 026c41e..15996cc 100644 --- a/mock/workplace/index.mock.ts +++ b/mock/workplace/index.mock.ts @@ -1,7 +1,3 @@ -import config from '@/config/axios/config' - -const { code } = config - const delay = 1000 export default [ @@ -12,7 +8,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: { project: 40, access: 2340, @@ -28,7 +24,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: [ { name: 'Github', @@ -83,7 +79,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: [ { keys: ['workplace.push', 'Github'], @@ -120,7 +116,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: [ { name: 'Github', @@ -157,7 +153,7 @@ export default [ delay, body: () => { return { - code: code, + code: 0, data: [ { name: 'workplace.quote', max: 65, personal: 42, team: 50 }, { name: 'workplace.contribution', max: 160, personal: 30, team: 140 }, diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index 6683fff..4d54e39 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -6,7 +6,7 @@ import { } from './types' import { ElMessage } from 'element-plus' import qs from 'qs' -// import router from '@/router' +import router from '@/router' import { useStorage } from '@/hooks/web/useStorage' @@ -75,8 +75,7 @@ const defaultResponseInterceptors = (response: AxiosResponse) => { if (response?.data?.code === 401) { // token过期 clear() - window.location.reload() - // router.push('/login') + router.push('/login') } } }