From 08fcc710d0a2acb185b3477d72fe32aff6f2e29a Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 01 Dec 2025 16:23:03 +0800
Subject: [PATCH] feat:增加ws连接状态
---
src/utils/common/index.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 8d332d7..9e1f8ff 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -10,6 +10,8 @@
*/
// 小程序更新检测
import { useUserStore } from "@/store/index.js"
+import configEnv from "@/config/env.js";
+import process from "node:process";
export function mpUpdate () {
const updateManager = uni.getUpdateManager()
@@ -38,14 +40,27 @@
})
})
}
-
+export function getStatusBarHeight() {
+ try {
+ const systemInfo = uni.getSystemInfoSync();
+ return systemInfo.statusBarHeight || 0;
+ } catch (error) {
+ return 0;
+ }
+}
+export function getEnvObj() {
+ return configEnv[__APP_ENV__?.ENV_NAME] || {}
+}
export function getWebViewUrl (targetUrl, otherParams) {
const userStore = useUserStore()
- const url = "https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper"
+ 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