diff --git a/locales/en.yaml b/locales/en.yaml index 1e149c5bc..effc85b45 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -1,4 +1,5 @@ buttons: + pureAccountSettings: Account Settings pureLoginOut: LoginOut pureLogin: Login pureSystemSet: Open ProjectConfig @@ -10,7 +11,6 @@ buttons: pureCloseAllTabs: Close AllTabs pureContentFullScreen: Content FullScreen pureContentExitFullScreen: Content ExitFullScreen - pureUserSettings: User Settings menus: pureHome: Home pureLogin: Login @@ -176,4 +176,4 @@ login: purePassWordRuleReg: The password format should be any combination of 8-18 digits purePassWordSureReg: Please enter confirm password purePassWordDifferentReg: The two passwords do not match! - purePassWordUpdateReg: Password has been updated + purePassWordUpdateReg: Password has been updated \ No newline at end of file diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index e50baf799..69a6a8641 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -1,4 +1,5 @@ buttons: + pureAccountSettings: 账户设置 pureLoginOut: 退出系统 pureLogin: 登录 pureSystemSet: 打开项目配置 @@ -10,7 +11,6 @@ buttons: pureCloseAllTabs: 关闭全部标签页 pureContentFullScreen: 内容区全屏 pureContentExitFullScreen: 内容区退出全屏 - pureUserSettings: 个人设置 menus: pureHome: 首页 pureLogin: 登录 diff --git a/mock/mine.ts b/mock/mine.ts new file mode 100644 index 000000000..9b34ff367 --- /dev/null +++ b/mock/mine.ts @@ -0,0 +1,21 @@ +import { defineFakeRoute } from "vite-plugin-fake-server/client"; + +export default defineFakeRoute([ + { + url: "/mine", + method: "get", + response: () => { + return { + success: true, + data: { + avatar: "https://avatars.githubusercontent.com/u/44761321", + username: "admin", + nickname: "Coder", + email: "pureadmin@163.com", + phone: "15888886789", + description: "一个热爱开源的前端工程师" + } + }; + } + } +]); diff --git a/mock/region.ts b/mock/region.ts deleted file mode 100644 index f7fa3cbf4..000000000 --- a/mock/region.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { defineFakeRoute } from "vite-plugin-fake-server/client"; - -export default defineFakeRoute([ - { - url: "/get-regions", - method: "get", - response: () => { - return { - success: true, - data: [ - { - code: "001", - name: "中国", - children: [ - { - code: "001001", - name: "北京市", - children: [ - { - code: "001001001", - name: "东城区" - }, - { - code: "001001002", - name: "西城区" - } - // 其他区 - ] - }, - { - code: "001002", - name: "上海市", - children: [ - { - code: "001002001", - name: "黄浦区" - }, - { - code: "001002002", - name: "徐汇区" - } - // 其他区 - ] - } - // 其他城市 - ] - } - ] - }; - } - } -]); diff --git a/mock/userInfo.ts b/mock/userInfo.ts deleted file mode 100644 index ceb571636..000000000 --- a/mock/userInfo.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { defineFakeRoute } from "vite-plugin-fake-server/client"; - -export default defineFakeRoute([ - { - url: "/get-user-info", - method: "get", - response: () => { - return { - success: true, - data: { - avatarUrl: "https://avatars.githubusercontent.com/u/44761321", - nickName: "企丸丸", - introduce: "我是幻兽帕鲁里的明星", - regionCode: "001002001", - address: "冰鸟密域祭坛地下城", - userName: "admin" - } - }; - } - } -]); diff --git a/src/api/mock.ts b/src/api/mock.ts index 61304822b..549e9d09b 100644 --- a/src/api/mock.ts +++ b/src/api/mock.ts @@ -23,8 +23,3 @@ export const formUpload = data => { } ); }; - -/**所在区域数据*/ -export const getRegions = (params?: object) => { - return http.request("get", "/get-regions", { params }); -}; diff --git a/src/api/user.ts b/src/api/user.ts index 4ae26ea74..ca36d700c 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -29,12 +29,18 @@ export type RefreshTokenResult = { }; export type UserInfo = { - avatarUrl: string; - nickName: string; - introduce: string; - regionCode: string; - address: string; - userName: string; + /** 头像 */ + avatar: string; + /** 用户名 */ + username: string; + /** 昵称 */ + nickname: string; + /** 邮箱 */ + email: string; + /** 联系电话 */ + phone: string; + /** 简介 */ + description: string; }; export type UserInfoResult = { @@ -47,12 +53,12 @@ export const getLogin = (data?: object) => { return http.request("post", "/login", { data }); }; -/** 刷新token */ +/** 刷新`token` */ export const refreshTokenApi = (data?: object) => { return http.request("post", "/refresh-token", { data }); }; -/**获取个人信息 */ -export const getUserInfo = (data?: object) => { - return http.request("get", "/get-user-info", { data }); +/** 账户设置-个人信息 */ +export const getMine = (data?: object) => { + return http.request("get", "/mine", { data }); }; diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index f98e25d1c..6d781d59d 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -8,22 +8,22 @@ import Breadcrumb from "./sidebar/breadCrumb.vue"; import topCollapse from "./sidebar/topCollapse.vue"; import { useTranslationLang } from "../hooks/useTranslationLang"; import globalization from "@/assets/svg/globalization.svg?component"; +import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line"; import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; import Setting from "@iconify-icons/ri/settings-3-line"; import Check from "@iconify-icons/ep/check"; -import UserSettingsLine from "@iconify-icons/ri/user-settings-line"; const { layout, device, logout, - handleOpenUserSettings, onPanel, pureApp, username, userAvatar, avatarsStyle, toggleSideBar, + toAccountSettings, getDropdownItemStyle, getDropdownItemClass } = useNav(); @@ -94,12 +94,12 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();