diff --git a/packages/uni-app-plus/src/service/api/route/navigateBack.ts b/packages/uni-app-plus/src/service/api/route/navigateBack.ts index 25f31c85d6c09e56fc83e20d66df89ffd4a95266..1bf46d930205784c831347808196f2ac919bd051 100644 --- a/packages/uni-app-plus/src/service/api/route/navigateBack.ts +++ b/packages/uni-app-plus/src/service/api/route/navigateBack.ts @@ -40,9 +40,11 @@ export const navigateBack = defineAsyncApi( quit() } else if (isDirectPage(page)) { reLaunchEntryPage() - } else { + } else if (args) { const { delta, animationType, animationDuration } = args back(delta!, animationType, animationDuration) + } else { + back() } return resolve() }, @@ -65,7 +67,7 @@ function quit() { } function back( - delta: number, + delta: number = 1, animationType?: string, animationDuration?: number ) { diff --git a/packages/uni-components/src/components/navigator.ts b/packages/uni-components/src/components/navigator.ts index 02815dc7feee7d3ddf5c4a8606d1f5b4255bd10a..4e64694288b016bc533355643e5d264c7699c31f 100644 --- a/packages/uni-components/src/components/navigator.ts +++ b/packages/uni-components/src/components/navigator.ts @@ -33,7 +33,17 @@ const ANIMATION_OUT = [ ] type AnimationToType = Parameters[0]['animationType'] -type AnimationBackType = Parameters[0]['animationType'] +type AnimationBackType = + | 'auto' + | 'none' + | 'slide-out-right' + | 'slide-out-left' + | 'slide-out-top' + | 'slide-out-bottom' + | 'fade-out' + | 'zoom-in' + | 'zoom-fade-in' + | 'pop-out' export const navigatorProps = { hoverClass: { diff --git a/packages/uni-h5/src/service/api/route/navigateBack.ts b/packages/uni-h5/src/service/api/route/navigateBack.ts index 3017f27adc6498e78eb61aa92cd0d8ef44c763b6..5d934a06c965e0c33bb9b89e37a3d1447ae8ad37 100644 --- a/packages/uni-h5/src/service/api/route/navigateBack.ts +++ b/packages/uni-h5/src/service/api/route/navigateBack.ts @@ -23,7 +23,7 @@ export const navigateBack = defineAsyncApi( return reject(ON_BACK_PRESS) } - getApp().$router.go(-args.delta!) + getApp().$router.go(args && args.delta ? -args.delta : -1) return resolve() }, NavigateBackProtocol,