From e52077f7bc1593a66327d51ccbcab3198a4ba638 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Tue, 11 Mar 2025 10:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/Login.tsx |  6 +++---
 src/services/user/user.ts | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
index 752344b..0d97b06 100644
--- a/src/pages/login/Login.tsx
+++ b/src/pages/login/Login.tsx
@@ -15,14 +15,14 @@ export default function Login() {
 	const onFinish = (values: any) => {
 		console.log("Received values of form: ", values);
 		login({ account: values["username"], password: values["password"] }).then(res => {
-			if (res.status !== 0) {
+			if (!res.success) {
 				messageApi.open({
 					type: "error",
 					content: res.data.info,
 				});
 			} else {
-				dispatch(updateUser(res.data));
-				localStorage.setItem('user',JSON.stringify(res.data))
+				dispatch(updateUser({ loginFlag: true, loginUser: res.data }));
+				localStorage.setItem("user", JSON.stringify(res.data));
 				navigate("/measure/config");
 			}
 		});
diff --git a/src/services/user/user.ts b/src/services/user/user.ts
index d0c6bc3..8e4ec22 100644
--- a/src/services/user/user.ts
+++ b/src/services/user/user.ts
@@ -1,17 +1,26 @@
 import httpRequest, { BaseResponse } from "../httpRequest";
 
+export type User = {
+	id: number;
+	account: string;
+	nickname: string;
+	password: string;
+	userRole: "Admin" | "User" | "Dev";
+	isBuiltInUser: boolean;
+};
+
 export function login(params: { account: string; password: string }) {
-	return httpRequest<BaseResponse>({
+	return httpRequest<BaseResponse<User>>({
 		url: "/auth/login",
-        params,
+		params,
 		method: "POST",
 	});
 }
 
 export function logout(params: {}) {
-    return httpRequest<BaseResponse>({
+	return httpRequest<BaseResponse>({
 		url: "/auth/logout",
-        params,
+		params,
 		method: "POST",
 	});
 }