From 4270f925f2df53dbcfeac69722d34944483f9535 Mon Sep 17 00:00:00 2001
From: "LHY\\18810" <18810831805@163.com>
Date: Sat, 15 Mar 2025 00:04:00 +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                           | 25 +++++++-----
 src/components/AndroidBackHandler.vue | 58 ---------------------------
 src/layouts/index.vue                 |  2 +-
 src/main.ts                           | 21 ++++++----
 4 files changed, 30 insertions(+), 76 deletions(-)
 delete mode 100644 src/components/AndroidBackHandler.vue

diff --git a/src/App.vue b/src/App.vue
index d56d359..aee81b0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,18 +1,23 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import AndroidBackHandler from '@/components/AndroidBackHandler.vue';
+<script setup lang="ts">
+import { RouterView } from 'vue-router';
+import { onMounted } from 'vue';
+import appBridge from '@/assets/js/appBridge';
+import utils from '@/assets/js/common';
 
-export default defineComponent({
-  name: 'App',
-  components: {
-    AndroidBackHandler
+onMounted(async () => {
+  if (utils.getParameter('digitalYiliToken')) {
+    // 隐藏/显示 header
+    appBridge.setHeaderShown(false);
+    // 设置系统状态栏明暗主题
+    appBridge.setStatusBarStyle('light');
+    // 设置禁止原生返回
+    appBridge.takeOverAndroidBack();
   }
 });
 </script>
 
 <template>
-  <div id="app">
-    <AndroidBackHandler />
-    <router-view></router-view>
+  <div>
+    <RouterView />
   </div>
 </template>
diff --git a/src/components/AndroidBackHandler.vue b/src/components/AndroidBackHandler.vue
deleted file mode 100644
index d94f264..0000000
--- a/src/components/AndroidBackHandler.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script lang="ts">
-import { defineComponent, onMounted, onUnmounted } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
-import appBridge from '@/assets/js/appBridge';
-
-export default defineComponent({
-  name: 'AndroidBackHandler',
-  setup() {
-    const router = useRouter();
-    const route = useRoute();
-    // 检查是否可以返回
-    const canGoBack = () => {
-      // 检查是否有历史记录
-      if (window.history.length > 1) {
-        return true;
-      }
-      // 检查路由状态
-      const position = router.options.history.state?.position;
-      return typeof position === 'number' && position > 0;
-    };
-
-    // 检查是否是首页
-    const isHomePage = () => {
-      // 根据实际路由配置修改这里的判断逻辑
-      return route.path === '/' || route.path === '/home';
-    };
-
-    // 处理返回按钮事件
-    const handleBack = () => {
-      // 如果有历史记录，说明是从其他页面进入的
-      if (canGoBack()) {
-        router.go(-1);
-        return false;
-      } else {
-        appBridge.navigateBack();
-      }
-    };
-
-    onMounted(() => {
-      // 设置禁止原生返回
-      appBridge.takeOverAndroidBack();
-      // 添加返回按钮监听
-      window.onAndroidBack = handleBack;
-    });
-
-    onUnmounted(() => {
-      // 移除返回按钮监听
-      window.onAndroidBack = null;
-    });
-
-    return {};
-  }
-});
-</script>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index f9f3e98..67aa4d6 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -2,7 +2,7 @@
   <div class="common-layout">
     <!-- title 标题和搜索栏 -->
     <header class="header">
-      <van-nav-bar class="header-nav" :title="$route.meta.title" left-arrow @click-left="$route.go(-1)" />
+      <van-nav-bar class="header-nav" :title="$route.meta.title" left-arrow @click-left="$router.go(-1)" />
       <van-search shape="round" class="header-search" placeholder="请输入搜索关键词" background="#6fb937" />
     </header>
     <!-- content -->
diff --git a/src/main.ts b/src/main.ts
index 7eaa5e4..8fc5e0d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -23,19 +23,26 @@ declare global {
     appBridge?: any;
   }
 }
-// 隐藏/显示 header
-appBridge.setHeaderShown(true);
-// 设置系统状态栏明暗主题
-appBridge.setStatusBarStyle('light');
+// 定义路由是否可以返回的判断
+const routerCanGoBack = () => {
+  const position = router.options.history.state?.position;
+  return typeof position === 'number' && position > 0;
+};
 router.beforeEach((to, from, next) => {
   if (to.query.digitalYiliToken) {
     utils.setSessionStorage('xToken', to.query.digitalYiliToken);
   }
-  // 设置 header 标题
   appBridge.setTitle(to.meta.title as string);
+  // 添加 Android 返回按钮监听方法
+  window.onAndroidBack = () => {
+    if (routerCanGoBack()) {
+      router.go(-1);
+    } else {
+      appBridge.navigateBack();
+    }
+  };
   next();
 });
-
 app.use(createPinia());
 app.use(router);
-app.mount('#app');
+app.mount('#app');
\ No newline at end of file