From 6a05ddc1ecfa3c279f0fe7ab6c0ef75ec071d020 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Thu, 23 Jun 2022 22:44:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(navigateBack):=20=E4=BF=AE=E5=A4=8D=20navig?=
 =?UTF-8?q?ateBack=20options=20ts=20=E7=B1=BB=E5=9E=8B=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=20ts=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/service/api/route/navigateBack.ts            |  6 ++++--
 packages/uni-components/src/components/navigator.ts  | 12 +++++++++++-
 .../uni-h5/src/service/api/route/navigateBack.ts     |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

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 25f31c85d..1bf46d930 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<API_TYPE_NAVIGATE_BACK>(
       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 02815dc7f..4e6469428 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<typeof uni.navigateTo>[0]['animationType']
-type AnimationBackType = Parameters<typeof uni.navigateBack>[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 3017f27ad..5d934a06c 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<API_TYPE_NAVIGATE_BACK>(
       return reject(ON_BACK_PRESS)
     }
 
-    getApp().$router.go(-args.delta!)
+    getApp().$router.go(args && args.delta ? -args.delta : -1)
     return resolve()
   },
   NavigateBackProtocol,
-- 
GitLab