From 5ec306cf96afa789a2ad7f5fef36299b8df0f9bc Mon Sep 17 00:00:00 2001
From: "liu.huiying@ebiz-digits.com" <liu.huiying@ebiz-digits.com>
Date: Fri, 14 Mar 2025 17:41:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:app=E5=B5=8C=E5=A5=97h5=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 ++
 src/main.ts | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ed3e316..d9cd037 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,8 @@ onMounted(async() => {
     appBridge.setHeaderShown(true);
     // 设置系统状态栏明暗主题
     appBridge.setStatusBarStyle('light');
+    // // 设置禁止原生返回
+    // appBridge.takeOverAndroidBack();
   }
 });
 </script>
diff --git a/src/main.ts b/src/main.ts
index 86e0849..3d9b11a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -27,6 +27,8 @@ router.beforeEach((to, from, next) => {
     utils.setSessionStorage('xToken', to.query.digitalYiliToken);
   }
   appBridge.setTitle(to.meta.title as string);
+  // 设置禁止原生返回
+  appBridge.takeOverAndroidBack();
   // 定义路由是否可以返回的判断
   const routerCanGoBack = () => {
     const position = router.options.history.state?.position;
@@ -39,13 +41,9 @@ router.beforeEach((to, from, next) => {
   };
   // 添加 Android 返回按钮监听方法
   window.onAndroidBack = () => {
-    // 设置禁止原生返回
-    appBridge.takeOverAndroidBack();
     if (routerCanGoBack()) {
-      console.log('h5返回')
-      router.back(); // 执行 h5 路由返回
+      router.back(); // 使用 router.back() 而不是 router.goBack()，因为 Vue Router 使用 back() 方法
     } else {
-      console.log('app返回')
       callAppGoBack(); // 调用 APP 的返回方法
     }
   };