修改用户授权调用位置和逻辑
This commit is contained in:
@@ -4,6 +4,7 @@ import Taro from "@tarojs/taro";
|
||||
import { useUserInfo, useUserActions } from "@/store/userStore";
|
||||
// import { getCurrentFullPath } from "@/utils";
|
||||
import evaluateService, { StageType } from "@/services/evaluateService";
|
||||
import { waitForAuthInit } from "@/utils/authInit";
|
||||
import DocCopy from "@/static/ntrp/ntrp_doc_copy.svg";
|
||||
import ArrowRight from "@/static/ntrp/ntrp_arrow_right_color.svg";
|
||||
import {
|
||||
@@ -26,12 +27,18 @@ function NTRPTestEntryCard(props: {
|
||||
console.log(userInfo);
|
||||
|
||||
useEffect(() => {
|
||||
if (!userInfo.id) {
|
||||
fetchUserInfo();
|
||||
}
|
||||
evaluateService.getLastResult().then((res) => {
|
||||
const init = async () => {
|
||||
// 先等待静默登录完成
|
||||
await waitForAuthInit();
|
||||
// 然后再获取用户信息
|
||||
if (!userInfo.id) {
|
||||
await fetchUserInfo();
|
||||
}
|
||||
// 获取测试结果
|
||||
const res = await evaluateService.getLastResult();
|
||||
setTestFlag(res.code === 0 && res.data.has_ntrp_level);
|
||||
});
|
||||
};
|
||||
init();
|
||||
}, [userInfo.id]);
|
||||
|
||||
const handleTest = useCallback(
|
||||
|
||||
Reference in New Issue
Block a user