From 62c9d873513dfcee15a795fb25af872079822ed2 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Mon, 13 Jun 2022 12:23:19 +0800
Subject: [PATCH] fix(app and h5): vue3 uni.navigateBack onBackPress
 e.from=undefined

---
 packages/uni-app-plus/src/service/api/route/navigateBack.ts | 2 +-
 packages/uni-h5/src/service/api/route/navigateBack.ts       | 6 +++++-
 2 files changed, 6 insertions(+), 2 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 6b943262a..25f31c85d 100644
--- a/packages/uni-app-plus/src/service/api/route/navigateBack.ts
+++ b/packages/uni-app-plus/src/service/api/route/navigateBack.ts
@@ -29,7 +29,7 @@ export const navigateBack = defineAsyncApi<API_TYPE_NAVIGATE_BACK>(
     }
     if (
       invokeHook(page as ComponentPublicInstance, ON_BACK_PRESS, {
-        from: (args as any).from,
+        from: (args as any).from || 'navigateBack',
       })
     ) {
       return resolve()
diff --git a/packages/uni-h5/src/service/api/route/navigateBack.ts b/packages/uni-h5/src/service/api/route/navigateBack.ts
index 2484ad8eb..3017f27ad 100644
--- a/packages/uni-h5/src/service/api/route/navigateBack.ts
+++ b/packages/uni-h5/src/service/api/route/navigateBack.ts
@@ -12,7 +12,11 @@ export const navigateBack = defineAsyncApi<API_TYPE_NAVIGATE_BACK>(
   API_NAVIGATE_BACK,
   (args, { resolve, reject }) => {
     let canBack = true
-    if (invokeHook(ON_BACK_PRESS, { from: (args as any).from }) === true) {
+    if (
+      invokeHook(ON_BACK_PRESS, {
+        from: (args as any).from || 'navigateBack',
+      }) === true
+    ) {
       canBack = false
     }
     if (!canBack) {
-- 
GitLab