diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 7011ade4c..0aaa49507 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -1,28 +1,29 @@ import request from '@/config/axios' export interface UserVO { - id: number - username: string - nickname: string - deptId: number - postIds: string[] - email: string - mobile: string - sex: number - avatar: string - loginIp: string - status: number - remark: string - loginDate: Date - createTime: Date - userType :string + id : number + username : string + nickname : string + deptId : number + postIds : string[] + email : string + mobile : string + sex : number + avatar : string + loginIp : string + status : number + remark : string + loginDate : Date + createTime : Date + userType : string + mailKey : string } export const getUserPage = async (params) => { console.log(params) if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return await request.post({ url: '/system/user/senior', data }) } else { return await request.get({ url: '/system/user/page', params }) @@ -35,22 +36,22 @@ export const getUserPage = async (params) => { // } // 查询用户详情 -export const getUser = (id: number) => { +export const getUser = (id : number) => { return request.get({ url: '/system/user/get?id=' + id }) } // 新增用户 -export const createUser = (data: UserVO) => { +export const createUser = (data : UserVO) => { return request.post({ url: '/system/user/create', data }) } // 修改用户 -export const updateUser = (data: UserVO) => { +export const updateUser = (data : UserVO) => { return request.put({ url: '/system/user/update', data }) } // 删除用户 -export const deleteUser = (id: number) => { +export const deleteUser = (id : number) => { return request.delete({ url: '/system/user/delete?id=' + id }) } @@ -65,7 +66,7 @@ export const importUserTemplate = () => { } // 用户密码重置 -export const resetUserPwd = (id: number, password: string) => { +export const resetUserPwd = (id : number, password : string) => { const data = { id, password @@ -74,7 +75,7 @@ export const resetUserPwd = (id: number, password: string) => { } // 用户状态修改 -export const updateUserStatus = (id: number, status: number) => { +export const updateUserStatus = (id : number, status : number) => { const data = { id, status @@ -83,6 +84,16 @@ export const updateUserStatus = (id: number, status: number) => { } // 获取用户精简信息列表 -export const getSimpleUserList = (): Promise => { +export const getSimpleUserList = () : Promise => { return request.get({ url: '/system/user/list-all-simple' }) } + +// 忘记密码 +export const forgetPassword = (data : UserVO) => { + return request.put({ url: '/system/user/forgetPassword', data }) +} + +// 忘记密码->修改密码 +export const updatePassword = (data : UserVO) => { + return request.put({ url: '/system/user/updatePassword', data }) +} diff --git a/src/permission.ts b/src/permission.ts index 24ce89277..1650d3504 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -15,7 +15,8 @@ const { loadStart, loadDone } = usePageLoading() // 路由不重定向白名单 const whiteList = [ '/login', - '/aa', + '/forgetPassword', + '/updatePassword', '/social-login', '/auth-redirect', '/bind', diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 57c118c66..f8e08bce4 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -185,9 +185,19 @@ const remainingRouter: AppRouteRecordRaw[] = [ noTagsView: true } },{ - path: '/aa', - component: () => import('@/views/login/aa.vue'), - name: 'Aa', + path: '/forgetPassword', + component: () => import('@/views/login/forgetPassword.vue'), + name: 'ForgetPassword', + meta: { + hidden: true, + title: t('router.login'), + noTagsView: true + } + }, + { + path: '/updatePassword', + component: () => import('@/views/login/updatePassword.vue'), + name: 'UpdatePassword', meta: { hidden: true, title: t('router.login'), diff --git a/src/views/login/aa.vue b/src/views/login/aa.vue deleted file mode 100644 index 96fb0164d..000000000 --- a/src/views/login/aa.vue +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index fdcef1ceb..6f79ce15e 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -1,5 +1,6 @@