diff --git a/src/api/user.ts b/src/api/user.ts index 775bcfa..70ae840 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,8 +1,14 @@ import type { ApiResponse } from "@/lib/api" -import type { UserItem, UserQueryParams } from "@/lib/models/user" +import type { + PhpUserModel, + UpdateUserInfoParams, + UpdateUserPwdParams, + UserItem, + UserQueryParams, +} from "@/lib/models/user" import { callByUser, callPublic } from "./base" -// ==================== 用户管理(.NET /api/baseinfo/v1/user/*) ==================== +// ==================== 用户管理 ==================== export async function fetchUserPage( params: UserQueryParams, @@ -43,21 +49,16 @@ export async function updateUserProfile( ) } -// ==================== 个人中心资料/密码(.NET /user/*,cookie 会话) ==================== +// ==================== 个人中心资料/密码 ==================== -export async function updateUserInfo(data: { - QQ: string - Wx: string - // TaoBao: string - Email: string -}): Promise> { - return await callPublic("/user/UpdateInfo", data) +export async function updateUserInfo( + data: UpdateUserInfoParams, +): Promise> { + return await callPublic("/user/ApiUpdateInfo", data) } -export async function updateUserPwd(data: { - OldPwd: string - NewPwd: string - ConfirmPwd: string -}): Promise> { - return await callPublic("/user/UpdatePwd", data) +export async function updateUserPwd( + data: UpdateUserPwdParams, +): Promise> { + return await callPublic("/user/UpdatePwd", data) } diff --git a/src/home/login/index.tsx b/src/home/login/index.tsx index 06acb97..52b2b38 100644 --- a/src/home/login/index.tsx +++ b/src/home/login/index.tsx @@ -59,22 +59,20 @@ export default function LoginPage() { @@ -174,9 +172,9 @@ function LoginForm() { tabIndex={-1} > {showPassword ? ( - - ) : ( + ) : ( + )} diff --git a/src/lib/models/dashboard.ts b/src/lib/models/dashboard.ts index 787b030..3179e4f 100644 --- a/src/lib/models/dashboard.ts +++ b/src/lib/models/dashboard.ts @@ -1,39 +1,8 @@ -// ==================== /user/ApiIndex 账户总览接口返回结构 ==================== +import type { PhpUserModel } from "@/lib/models/user" -export type ApiIndexUserModel = { - apikey: string - TenantId: number - agent_id: number - jgday: number - LoginCode: string - Password: string - Name: string - Phone: string - Enabled: number - LastLoginDate: string - Sex: number - CreateType: number - ProductAccountCount: number - ExpiredProductAccountCount: number - RestAmount: number - ju_money: number - ConsumeAmount: number - Wx: string - QQ: string - Email: string - TestCountLimit: number - UseTestCount: number - ManagerId: number - ManagerName: string - id_code: string - is_verify: number - is_agent: number - parent_id: number - CreateTime: string - UpdateTime: string - DeleteTag: number - Id: number -} +// ==================== 账户总览接口返回结构 ==================== + +export type ApiIndexUserModel = PhpUserModel export type ApiIndexAccountModel = { TotalCount: number diff --git a/src/lib/models/user.ts b/src/lib/models/user.ts index 14b1dce..adfd8b8 100644 --- a/src/lib/models/user.ts +++ b/src/lib/models/user.ts @@ -1,4 +1,3 @@ -// 用户(.NET /api/baseinfo/v1/user/*,对应 UserEntity) export type UserItem = { Id: number LoginCode: string @@ -14,3 +13,50 @@ export type UserQueryParams = { PageSize?: number KeyWord?: string } + +export type PhpUserModel = { + apikey: string + TenantId: number + agent_id: number + jgday: number + LoginCode: string + Password: string + Name: string + Phone: string + Enabled: number + LastLoginDate: string + Sex: number + CreateType: number + ProductAccountCount: number + ExpiredProductAccountCount: number + RestAmount: number + ju_money: number + ConsumeAmount: number + Wx?: string + QQ?: string + Email?: string + TestCountLimit: number + UseTestCount: number + ManagerId: number + ManagerName: string + id_code: string + is_verify: number + is_agent: number + parent_id: number + CreateTime: string + UpdateTime: string + DeleteTag: number + Id: number +} + +export type UpdateUserInfoParams = { + QQ: string + Wx: string + Email: string +} + +export type UpdateUserPwdParams = { + OldPwd: string + NewPwd: string + ConfirmPwd: string +}