From 5aeb8c60920f72382b57c81b3789b127a941f46a Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 08 Nov 2025 17:48:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/common/index.js | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 0cb72d1..c796b03 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -40,7 +40,14 @@
})
})
}
-
+export function getStatusBarHeight() {
+ try {
+ const systemInfo = uni.getSystemInfoSync();
+ return systemInfo.statusBarHeight || 0;
+ } catch (error) {
+ return 0;
+ }
+}
export function getEnvObj() {
const envName = JSON.parse(__APP_ENV__?.UNI_CUSTOM_DEFINE||null)?.ENV_NAME
return configEnv[envName || import.meta.env.VITE_APP_ENV] || {}
@@ -48,10 +55,13 @@
export function getWebViewUrl (targetUrl, otherParams) {
const userStore = useUserStore()
const url = getEnvObj().VITE_APP_WEBVIEW_URL
+ const uniPlatform = __APP_ENV__.UNI_PLATFORM
+ const statusBarHeight = getStatusBarHeight();
// 1. 处理用户参数
const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}'
// 2. 构建查询参数字符串
- let queryString = `params=${encodeURIComponent(userParams)}`
+let queryString = `params=${encodeURIComponent(userParams)}&topMargin=${statusBarHeight}&uniPlatform=${uniPlatform}`
+
// 3. 处理 otherParams 对象
if (otherParams && typeof otherParams === 'object') {
Object.keys(otherParams).forEach(key => {
--
Gitblit v1.9.3