diff --git a/src/App.vue b/src/App.vue index 1301bf3..ff121a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,14 +4,14 @@ import { onMounted } from 'vue'; import appBridge from '@/assets/js/appBridge'; import utils from '@/assets/js/common'; -onMounted(async() => { +onMounted(async () => { if (utils.getParameter('digitalYiliToken')) { // 隐藏/显示 header appBridge.setHeaderShown(false); // 设置系统状态栏明暗主题 appBridge.setStatusBarStyle('light'); // 设置禁止原生返回 - appBridge.takeOverAndroidBack(); + // appBridge.takeOverAndroidBack(); } }); diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss index d21a751..939b02d 100644 --- a/src/assets/css/public.scss +++ b/src/assets/css/public.scss @@ -1,6 +1,6 @@ .van-nav-bar { - padding-top: var(--status-bar-height) !important; - height: calc(60px + var(--status-bar-height)) !important; + padding-top: calc(var(--status-bar-height) + 10px) !important; + // height: calc(46px + var(--status-bar-height)) !important; } .van-cell { padding: 8px !important; diff --git a/src/assets/js/appBridge.js b/src/assets/js/appBridge.js index 96b6029..2ac48fc 100644 --- a/src/assets/js/appBridge.js +++ b/src/assets/js/appBridge.js @@ -140,22 +140,9 @@ export default { * @returns {Boolean} 操作是否成功 */ takeOverAndroidBack() { - if (!this.isInReactNative()) { - return false; - } - try { - window.ReactNativeWebView.postMessage( - JSON.stringify({ - type: 'takeOverAndroidBack', - data: { - enabled: true - } - }) - ); - return true; - } catch (error) { - return false; - } + return this.postMessage({ + type: 'takeOverAndroidBack' + }); }, /** @@ -328,6 +315,7 @@ export default { if (canGoBack) { router.go(-1); } else { + this.takeOverAndroidBack(); this.navigateBack(); } } diff --git a/src/main.ts b/src/main.ts index 763b944..65c42b6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -33,7 +33,7 @@ router.beforeEach((to, from, next) => { if (to.query.digitalYiliToken) { utils.setSessionStorage('xToken', to.query.digitalYiliToken); } - appBridge.setTitle(to.meta.title as string); + // appBridge.setTitle(to.meta.title as string); // 添加 Android 返回按钮监听方法 window.onAndroidBack = () => { if (routerCanGoBack()) {