视频会议

This commit is contained in:
duoaohui
2026-05-23 12:53:30 +08:00
parent 3e6ddb0e02
commit 2689301721
2 changed files with 21 additions and 1 deletions

View File

@@ -148,6 +148,14 @@ onLoad((query) => {
try { try {
const payload = resolveSsoPayload(query || {}) const payload = resolveSsoPayload(query || {})
const ssoUser = resolveSsoUser(payload) const ssoUser = resolveSsoUser(payload)
const redirect = resolveRedirect(query || {})
console.log('[SSO] resolved params:', {
hasToken: !!(payload && payload.token),
hasPayloadUser: !!(payload && payload.user),
hasSsoUser: !!ssoUser,
userId: ssoUser && (ssoUser.id || ssoUser.user_id),
redirect
})
if (!payload || !payload.token || !ssoUser) { if (!payload || !payload.token || !ssoUser) {
statusText.value = '缺少 payload 参数' statusText.value = '缺少 payload 参数'
return return
@@ -163,8 +171,8 @@ onLoad((query) => {
bootstrapAfterSso(payload.token) bootstrapAfterSso(payload.token)
const redirect = resolveRedirect(query || {})
statusText.value = '登录成功,跳转中…' statusText.value = '登录成功,跳转中…'
console.log('[SSO] redirectTo:', redirect)
// redirectTo 不保留历史,避免返回到 sso 页造成循环 // redirectTo 不保留历史,避免返回到 sso 页造成循环
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ url: redirect }) uni.redirectTo({ url: redirect })

View File

@@ -432,6 +432,13 @@ onLoad(async (query) => {
mode.value = query?.mode === 'join' ? 'join' : 'create' mode.value = query?.mode === 'join' ? 'join' : 'create'
joinCode.value = query?.code || '' joinCode.value = query?.code || ''
autoJoin.value = query?.autoJoin === '1' || query?.autoJoin === 'true' || query?.autoJoin === true autoJoin.value = query?.autoJoin === '1' || query?.autoJoin === 'true' || query?.autoJoin === true
console.log('[Preview] onLoad params:', {
query,
mode: mode.value,
joinCode: joinCode.value,
autoJoin: autoJoin.value,
userId: userStore.userInfo?.id || userStore.userInfo?.user_id || ''
})
// P0-4密码不再从 URL query 读取,改为从 meetingStore.draftJoinPayload 一次性消费 // P0-4密码不再从 URL query 读取,改为从 meetingStore.draftJoinPayload 一次性消费
// 防止 URL 历史 / DevTools 留痕;读取后立即清空草稿避免二次写回 // 防止 URL 历史 / DevTools 留痕;读取后立即清空草稿避免二次写回
if (mode.value === 'join') { if (mode.value === 'join') {
@@ -454,6 +461,11 @@ onLoad(async (query) => {
} }
if (autoJoin.value && canJoin.value) { if (autoJoin.value && canJoin.value) {
await nextTick() await nextTick()
console.log('[Preview] autoJoin start:', {
joinCode: joinCode.value,
hasPermission: hasPermission.value,
permissionError: permissionError.value
})
onJoin() onJoin()
} }
}) })