From 55286bdfe54a609a1ce6f7a2302e6836a13db104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?= Date: Sat, 13 Sep 2025 10:00:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=99=BB=E5=BD=95):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=80=BB=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 简化登录逻辑,不再需要传递和处理设备总数信息 --- Touchkebao/src/pages/login/Login.tsx | 4 ++-- Touchkebao/src/store/module/user.ts | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Touchkebao/src/pages/login/Login.tsx b/Touchkebao/src/pages/login/Login.tsx index a92f337a..108bf02a 100644 --- a/Touchkebao/src/pages/login/Login.tsx +++ b/Touchkebao/src/pages/login/Login.tsx @@ -99,10 +99,10 @@ const Login: React.FC = () => { response .then(res => { - const { member, kefuData, deviceTotal } = res; + const { member, kefuData } = res.kefuData; // 清空WebSocket连接状态 useWebSocketStore.getState().clearConnectionState(); - login(res.token, member, deviceTotal); + login(res.token, member); const { self, token } = kefuData; login2(token.access_token); setUserInfo(self); diff --git a/Touchkebao/src/store/module/user.ts b/Touchkebao/src/store/module/user.ts index 357046a5..c56d7ac9 100644 --- a/Touchkebao/src/store/module/user.ts +++ b/Touchkebao/src/store/module/user.ts @@ -16,7 +16,6 @@ export interface User { updateTime: string | null; lastLoginIp: string; lastLoginTime: number; - deviceTotal: number; // 设备总数 } interface UserState { @@ -28,7 +27,7 @@ interface UserState { setToken: (token: string) => void; setToken2: (token2: string) => void; clearUser: () => void; - login: (token: string, userInfo: User, deviceTotal: number) => void; + login: (token: string, userInfo: User) => void; login2: (token2: string) => void; logout: () => void; } @@ -44,7 +43,7 @@ export const useUserStore = createPersistStore( setToken2: token2 => set({ token2 }), clearUser: () => set({ user: null, token: null, token2: null, isLoggedIn: false }), - login: (token, userInfo, deviceTotal) => { + login: (token, userInfo) => { // 只将token存储到localStorage localStorage.setItem("token", token); @@ -64,7 +63,6 @@ export const useUserStore = createPersistStore( updateTime: userInfo.updateTime, lastLoginIp: userInfo.lastLoginIp, lastLoginTime: userInfo.lastLoginTime, - deviceTotal: deviceTotal, }; set({ user, token, isLoggedIn: true });