Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Hooke
/
lls_program
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
hookehuyr
2025-09-12 23:14:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d45ae2e57044e853f83e3f6c647ef9bdad4709f9
d45ae2e5
1 parent
f465979e
refactor(auth): 将家庭检查逻辑从静默授权移到数据刷新
静默授权函数不再处理家庭检查逻辑,统一在刷新数据时处理
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
40 deletions
src/pages/Dashboard/index.vue
src/utils/authRedirect.js
src/pages/Dashboard/index.vue
View file @
d45ae2e
...
...
@@ -340,6 +340,17 @@ const refreshDashboardData = async () => {
});
} else {
console.error('获取Dashboard数据失败:', data);
// 检查用户是否已加入家庭
const hasFamily = await checkUserHasFamily()
// 如果用户没有加入家庭,跳转到欢迎页面
if (!hasFamily) {
console.warn('用户未加入家庭,跳转到欢迎页面');
await Taro.navigateTo({
url: '/pages/Welcome/index'
})
return
}
}
} catch (error) {
console.error('刷新Dashboard数据异常:', error);
...
...
@@ -360,17 +371,6 @@ useLoad(async () => {
// 静默授权成功后立即刷新页面数据
await refreshDashboardData();
// 检查用户是否已加入家庭
const hasFamily = await checkUserHasFamily()
// 如果用户没有加入家庭,跳转到欢迎页面
if (!hasFamily) {
console.warn('用户未加入家庭,跳转到欢迎页面');
await Taro.navigateTo({
url: '/pages/Welcome/index'
})
return
}
},
(error) => {
console.error('Dashboard onLoad - 静默授权失败:', error);
...
...
src/utils/authRedirect.js
View file @
d45ae2e
/*
* @Date: 2025-01-25 10:00:00
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2025-09-12 23:
02:36
* @LastEditTime: 2025-09-12 23:
12:50
* @FilePath: /lls_program/src/utils/authRedirect.js
* @Description: 授权重定向处理工具函数
*/
...
...
@@ -303,38 +303,11 @@ export const silentAuth = async (onSuccess, onError) => {
// 更新request默认headers
request
.
defaults
.
headers
.
cookie
=
cookie
// 静默授权成功,检查用户是否已加入家庭
try
{
const
hasFamily
=
await
checkUserHasFamily
()
// 如果用户没有加入家庭,跳转到欢迎页面
if
(
!
hasFamily
)
{
await
Taro
.
redirectTo
({
url
:
'/pages/Welcome/index'
})
const
result
=
{
...
response
.
data
,
redirected
:
true
}
if
(
onSuccess
)
{
onSuccess
(
result
)
}
return
result
}
// 用户已有家庭,执行成功回调
if
(
onSuccess
)
{
onSuccess
(
response
.
data
)
}
return
response
.
data
}
catch
(
familyCheckError
)
{
console
.
error
(
'检查家庭状态失败:'
,
familyCheckError
)
// 家庭检查失败,仍然执行成功回调,让页面正常显示
// 静默授权成功,直接执行成功回调
if
(
onSuccess
)
{
onSuccess
(
response
.
data
)
}
return
response
.
data
}
}
catch
(
error
)
{
console
.
error
(
'静默授权过程失败:'
,
error
)
...
...
Please
register
or
login
to post a comment