Browse Source

修复数据类型不匹配错误

feature/rail
zhangjiming 5 months ago
parent
commit
e52077f7bc
  1. 6
      src/pages/login/Login.tsx
  2. 17
      src/services/user/user.ts

6
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");
}
});

17
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",
});
}
Loading…
Cancel
Save