fix(auth): 修复授权后跳转逻辑并启用降级导航
修复授权成功后跳转回原页面时硬编码路径的问题,改为使用默认跳转 启用被注释的导航降级逻辑,当navigateTo失败时自动降级为redirectTo
Showing
3 changed files
with
5 additions
and
6 deletions
| 1 | /* | 1 | /* |
| 2 | * @Date: 2025-06-28 10:33:00 | 2 | * @Date: 2025-06-28 10:33:00 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2026-01-12 23:48:04 | 4 | + * @LastEditTime: 2026-01-13 00:07:41 |
| 5 | * @FilePath: /xyxBooking-weapp/src/app.js | 5 | * @FilePath: /xyxBooking-weapp/src/app.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ | ... | ... |
| ... | @@ -19,7 +19,7 @@ import { silentAuth, returnToOriginalPage } from '@/utils/authRedirect' | ... | @@ -19,7 +19,7 @@ import { silentAuth, returnToOriginalPage } from '@/utils/authRedirect' |
| 19 | 19 | ||
| 20 | useDidShow(() => { | 20 | useDidShow(() => { |
| 21 | silentAuth() | 21 | silentAuth() |
| 22 | - .then(() => returnToOriginalPage('/pages/index/index')) | 22 | + .then(() => returnToOriginalPage()) |
| 23 | .catch((error) => { | 23 | .catch((error) => { |
| 24 | Taro.showToast({ title: error?.message || '授权失败', icon: 'none' }) | 24 | Taro.showToast({ title: error?.message || '授权失败', icon: 'none' }) |
| 25 | }) | 25 | }) | ... | ... |
| ... | @@ -211,10 +211,9 @@ export const navigateToAuth = (return_path) => { | ... | @@ -211,10 +211,9 @@ export const navigateToAuth = (return_path) => { |
| 211 | return | 211 | return |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | - // TAG: navigateTo 失败时(例如页面栈满),降级为 redirectTo | 214 | + Taro.navigateTo({ url: '/pages/auth/index' }).catch(() => { |
| 215 | - // Taro.navigateTo({ url: '/pages/auth/index' }).catch(() => { | 215 | + return Taro.redirectTo({ url: '/pages/auth/index' }) |
| 216 | - // return Taro.redirectTo({ url: '/pages/auth/index' }) | 216 | + }) |
| 217 | - // }) | ||
| 218 | } | 217 | } |
| 219 | 218 | ||
| 220 | /** | 219 | /** | ... | ... |
-
Please register or login to post a comment