From cae25ad4ce394360cd1f9bd2dbd4b41cec1cf330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=B5=E5=AE=AA=E7=91=9E?= <9198107+min-xianrui@user.noreply.gitee.com> Date: Thu, 9 Jan 2025 23:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/codeimg.png | Bin 9649 -> 0 bytes src/api/user/adminUserApi.ts | 8 +- src/api/user/frontUserApi.ts | 3 + src/components/Heads.vue | 4 +- src/components/nav/Navigation1.vue | 58 +++++++------ src/composables/adminRequest.ts | 5 +- src/composables/frontRequest.ts | 5 +- src/pages/admin/index.vue | 98 +++++++++++++++++++++- src/pages/front/index.vue | 17 ++++ src/pages/index.vue | 100 ---------------------- src/pages/login.vue | 128 ++++++++++++++++++----------- src/pages/register.vue | 26 ++++-- src/plugins/router.ts | 20 +++++ src/stores/userStore.ts | 11 +-- 14 files changed, 279 insertions(+), 204 deletions(-) delete mode 100644 public/codeimg.png create mode 100644 src/pages/front/index.vue delete mode 100644 src/pages/index.vue diff --git a/public/codeimg.png b/public/codeimg.png deleted file mode 100644 index 657db403004ee1ed191a449ac03108e141c0d853..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9649 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 b?tMbIm0%Nu#HY6X_uC;UCMQ}gtndFnJ>bHJ diff --git a/src/api/user/adminUserApi.ts b/src/api/user/adminUserApi.ts index 959ea8a..b2dd62b 100644 --- a/src/api/user/adminUserApi.ts +++ b/src/api/user/adminUserApi.ts @@ -1,7 +1,7 @@ import { adminRequest } from '~/composables/adminRequest' /** - * 登录 + * 验证码 * @param data */ export function captchaAdmin(uid: Number) { @@ -38,8 +38,6 @@ export function logoutAdmin() { * 获取用户信息 * @param userId */ -export function userInfoAdmin(userId: any) { - return adminRequest.get("/userInfo", { - params: { userId: userId } - }) +export function userInfoAdmin() { + return adminRequest.get("/sys/user/info") } diff --git a/src/api/user/frontUserApi.ts b/src/api/user/frontUserApi.ts index 042164d..569ddca 100644 --- a/src/api/user/frontUserApi.ts +++ b/src/api/user/frontUserApi.ts @@ -6,6 +6,9 @@ export function loginFront(data:any) { frontRequest.post("/api/user/login", data).then(response =>{ const user = userStore() user.frontToken = response.data.token + frontRequest.get("/api/user/userInfo").then(response =>{ + user.frontUserInfo = response.data + }) }) } /** diff --git a/src/components/Heads.vue b/src/components/Heads.vue index e7fa92c..68dcccb 100644 --- a/src/components/Heads.vue +++ b/src/components/Heads.vue @@ -2,11 +2,11 @@
- +
- 头像 +
{{ userStore().adminUserInfo.username }}
管理员
diff --git a/src/components/nav/Navigation1.vue b/src/components/nav/Navigation1.vue index cd30636..e29f7eb 100644 --- a/src/components/nav/Navigation1.vue +++ b/src/components/nav/Navigation1.vue @@ -1,7 +1,9 @@ @@ -60,7 +63,8 @@ const logout = () => { :deep(.el-menu--horizontal) { border-bottom: none; } -h6{ + +h6 { font-weight: 700; font-size: 16px; padding-top: 15px; diff --git a/src/composables/adminRequest.ts b/src/composables/adminRequest.ts index 60b3b94..9dbd182 100644 --- a/src/composables/adminRequest.ts +++ b/src/composables/adminRequest.ts @@ -32,12 +32,13 @@ adminRequest.interceptors.response.use( return Promise.reject(response.data.msg) case 401: toast.error(response.data.msg) + window.open(`/login`, '_self') return Promise.reject(response.data.msg) default: - return response + return response.data } } - return response + return response.data }, function (error) { let { msg, message } = error.response?.data ?? {} diff --git a/src/composables/frontRequest.ts b/src/composables/frontRequest.ts index 3bf97a2..79e945e 100644 --- a/src/composables/frontRequest.ts +++ b/src/composables/frontRequest.ts @@ -28,14 +28,13 @@ frontRequest.interceptors.response.use( switch (code) { case 500: toast.error(response.data.msg) - break + return Promise.reject(response.data.msg) case 401: window.open(`/login`, '_self') toast.error("请重新登录~") break default: - toast.error(response.data.msg) - break + return response } } if (response.data) { diff --git a/src/pages/admin/index.vue b/src/pages/admin/index.vue index 19c7bcc..ae79957 100644 --- a/src/pages/admin/index.vue +++ b/src/pages/admin/index.vue @@ -1,10 +1,100 @@ - diff --git a/src/pages/front/index.vue b/src/pages/front/index.vue new file mode 100644 index 0000000..5f291c4 --- /dev/null +++ b/src/pages/front/index.vue @@ -0,0 +1,17 @@ + + + + + +{ +"meta": { +"layout": "front" +} +} + diff --git a/src/pages/index.vue b/src/pages/index.vue deleted file mode 100644 index ae79957..0000000 --- a/src/pages/index.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - diff --git a/src/pages/login.vue b/src/pages/login.vue index 796f3ab..3a2238d 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -12,17 +12,26 @@
密码
- +
+ + + + + + + +
-
验证码
- - + + 普通用户 + 管理员 +
- +
没有密码吗？
@@ -30,63 +39,76 @@