|
@@ -128,15 +128,12 @@ const parseUrlParams = () => {
|
|
|
return params
|
|
return params
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// 处理 signup 路径
|
|
|
|
|
|
|
+// 处理 signup 路径(仅 H5 端)
|
|
|
const handleSignupRoute = (options) => {
|
|
const handleSignupRoute = (options) => {
|
|
|
- // 解析 URL 参数(优先从浏览器 URL 解析)
|
|
|
|
|
|
|
+ // #ifdef H5
|
|
|
|
|
+ // 解析 URL 参数(从浏览器 URL 解析)
|
|
|
const query = parseUrlParams()
|
|
const query = parseUrlParams()
|
|
|
-
|
|
|
|
|
- // 如果浏览器解析不到,再使用 options 参数
|
|
|
|
|
- if (Object.keys(query).length === 0 && options) {
|
|
|
|
|
- Object.assign(query, options)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ console.log('解析到的参数:', query);
|
|
|
|
|
|
|
|
// 判断是否是 signup 路径
|
|
// 判断是否是 signup 路径
|
|
|
const isSignup = query.path === 'signup' || query.s || query.signup || query.activeTab === '2'
|
|
const isSignup = query.path === 'signup' || query.s || query.signup || query.activeTab === '2'
|
|
@@ -150,16 +147,24 @@ const handleSignupRoute = (options) => {
|
|
|
|
|
|
|
|
// 构建登录页面 URL
|
|
// 构建登录页面 URL
|
|
|
let loginUrl = '/pages/login/index?activeTab=2'
|
|
let loginUrl = '/pages/login/index?activeTab=2'
|
|
|
-
|
|
|
|
|
// 携带参数
|
|
// 携带参数
|
|
|
if (id) loginUrl += `&id=${id}`
|
|
if (id) loginUrl += `&id=${id}`
|
|
|
if (subId) loginUrl += `&subId=${subId}`
|
|
if (subId) loginUrl += `&subId=${subId}`
|
|
|
if (code) loginUrl += `&code=${code}`
|
|
if (code) loginUrl += `&code=${code}`
|
|
|
|
|
|
|
|
|
|
+ console.log('跳转到:', loginUrl);
|
|
|
|
|
+
|
|
|
// 跳转到注册页面
|
|
// 跳转到注册页面
|
|
|
uni.reLaunch({
|
|
uni.reLaunch({
|
|
|
- url: loginUrl
|
|
|
|
|
|
|
+ url: loginUrl,
|
|
|
|
|
+ success: () => {
|
|
|
|
|
+ console.log('跳转成功');
|
|
|
|
|
+ },
|
|
|
|
|
+ fail: (err) => {
|
|
|
|
|
+ console.error('跳转失败:', err);
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
|
|
+ // #endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
watch(locale, () => {
|
|
watch(locale, () => {
|