diff --git a/.eslintrc.js b/.eslintrc.js index 737bdb9..4316764 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -35,5 +35,6 @@ module.exports = { 'no-debugger': 'off', // 关闭debugger警告 'vue/multi-word-component-names': 0, // 关闭文件名多单词 // 'import/no-unresolved': ['error', { ignore: ['~icons/*'] }], + "@typescript-eslint/no-explicit-any": ["off"] }, }; diff --git a/mock/module/user.ts b/mock/module/user.ts index 47b1c24..6195bd7 100644 --- a/mock/module/user.ts +++ b/mock/module/user.ts @@ -1,23 +1,17 @@ import Mock from 'mockjs'; -function resultSuccess(data: any, { msg = 'success' } = {}) { - return Mock.mock({ - code: 200, - data, - msg, - }); -} +import { resultSuccess } from '../utils'; const Random = Mock.Random; const token = Random.string('upper', 32, 32); -const adminInfo = { +const userInfo = { userId: '1', - username: 'admin', - realName: 'Admin', - avatar: Random.image(), - desc: 'manager', - password: Random.string('upper', 4, 16), + userName: 'admin', + realName: '管理员大人', + avatar: 'https://z3.ax1x.com/2021/10/29/5jnWgf.jpg', + role: 'admin', + password: '123456', token, permissions: [ { @@ -28,18 +22,6 @@ const adminInfo = { label: '监控页', value: 'dashboard_monitor', }, - { - label: '工作台', - value: 'dashboard_workplace', - }, - { - label: '基础列表', - value: 'basic_list', - }, - { - label: '基础列表删除', - value: 'basic_list_delete', - }, ], }; @@ -49,17 +31,7 @@ export default [ timeout: 1000, method: 'post', response: () => { - return resultSuccess({ token }); - }, - }, - { - url: '/mock/admin_info', - timeout: 1000, - method: 'get', - response: () => { - // const token = getRequestToken(request); - // if (!token) return resultError('Invalid token'); - return resultSuccess(adminInfo); + return resultSuccess(userInfo); }, }, ]; diff --git a/mock/utils.ts b/mock/utils.ts new file mode 100644 index 0000000..3f52471 --- /dev/null +++ b/mock/utils.ts @@ -0,0 +1,16 @@ +import Mock from 'mockjs'; + +export function resultSuccess(data: any, { msg = 'success' } = {}) { + return Mock.mock({ + code: 200, + data, + msg, + }); +} +export function resultFailed(data: any, { msg = 'failed' } = {}) { + return Mock.mock({ + code: 400, + data, + msg, + }); +} diff --git a/src/enum/common.ts b/src/enum/common.ts new file mode 100644 index 0000000..09adeed --- /dev/null +++ b/src/enum/common.ts @@ -0,0 +1,5 @@ +/* 缓存的Key值 */ +export enum EnumStorageKey { + userInfo = '__USER_INFO__', + token = '__TOKEN__', +} diff --git a/src/enum/index.ts b/src/enum/index.ts new file mode 100644 index 0000000..d0b9323 --- /dev/null +++ b/src/enum/index.ts @@ -0,0 +1 @@ +export * from './common'; diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue index 4fe32b2..6ad0a0b 100644 --- a/src/layouts/BasicLayout/index.vue +++ b/src/layouts/BasicLayout/index.vue @@ -4,7 +4,7 @@ - +
@@ -30,7 +30,7 @@
- + {{ appStore.footerText }}
diff --git a/src/layouts/components/header/UserCenter.vue b/src/layouts/components/header/UserCenter.vue index 4bd94d9..d3d1dc6 100644 --- a/src/layouts/components/header/UserCenter.vue +++ b/src/layouts/components/header/UserCenter.vue @@ -1,5 +1,5 @@