diff --git a/public/codeimg.png b/public/codeimg.png deleted file mode 100644 index 657db40..0000000 Binary files a/public/codeimg.png and /dev/null differ 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 @@