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 | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index cb4f733..9e1f8ff 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -1,5 +1,17 @@
+/*
+ * @Author : yuan
+ * @Date : 2025-10-15 15:52:12
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-10-16 17:57:16
+ * @FilePath : \src\utils\common\index.js
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-10-15 15:52:12
+ */
// 小程序更新检测
-import {useUserStore} from "@/store/index.js";
+import { useUserStore } from "@/store/index.js"
+import configEnv from "@/config/env.js";
+import process from "node:process";
export function mpUpdate () {
const updateManager = uni.getUpdateManager()
@@ -28,18 +40,36 @@
})
})
}
-
-export function getWebViewUrl(targetUrl,otherParams){
+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 = import.meta.env.VITE_APP_WEBVIEW_URL
- // 构建查询参数
- const params = new URLSearchParams()
- params.append('params', JSON.stringify(userStore?.userInfo))
- // 处理 otherParams 对象
+ 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)}&topMargin=${statusBarHeight}&uniPlatform=${uniPlatform}`
+
+ // 3. 处理 otherParams 对象
if (otherParams && typeof otherParams === 'object') {
Object.keys(otherParams).forEach(key => {
- params.append(key, otherParams[key])
+ const value = otherParams[key]
+ if (value !== undefined && value !== null) {
+ queryString += `&${key}=${encodeURIComponent(value)}`
+ }
})
}
- return `${url}/${targetUrl}?params=${JSON.stringify(userStore?.userInfo)}&${params.toString()}`
+ // 4. 拼接完整 URL
+ return `${url}${targetUrl}?${queryString}`
}
--
Gitblit v1.9.3