From 66486f86f0fb27e6a2eb11dddb22f0d0a6970514 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 21 Feb 2024 11:47:13 +0800 Subject: [PATCH] Optimize code --- src/pages/Tools/Store.tsx | 2 ++ src/pages/UserFramework.tsx | 2 +- src/util/auth.tsx | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/Tools/Store.tsx b/src/pages/Tools/Store.tsx index a7ea3e7..5f330df 100644 --- a/src/pages/Tools/Store.tsx +++ b/src/pages/Tools/Store.tsx @@ -179,6 +179,8 @@ const Store = () => { setCurrentPage(response.data!.current) if (response.data!.current === response.data!.pages) { setHasNextPage(false) + } else { + setHasNextPage(true) } if (response.data!.current === 1) { setToolData(response.data!.records) diff --git a/src/pages/UserFramework.tsx b/src/pages/UserFramework.tsx index 2cba983..52057c1 100644 --- a/src/pages/UserFramework.tsx +++ b/src/pages/UserFramework.tsx @@ -23,7 +23,7 @@ const UserFramework = () => { )} diff --git a/src/util/auth.tsx b/src/util/auth.tsx index 6fc66fc..7ec4687 100644 --- a/src/util/auth.tsx +++ b/src/util/auth.tsx @@ -76,8 +76,8 @@ export const getVerifyStatus_async = () => { .verified } -export const getUserInfo = async (): Promise => { - if (getLocalStorage(STORAGE_USER_INFO_KEY) !== null) { +export const getUserInfo = async (force = false): Promise => { + if (getLocalStorage(STORAGE_USER_INFO_KEY) !== null && !force) { return new Promise((resolve) => { resolve( JSON.parse(getLocalStorage(STORAGE_USER_INFO_KEY) as string) as UserWithPowerInfoVo