From e3e6a984ee20e3a77852442b68ddb1d887e2e769 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 26 Dec 2025 18:05:34 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into prod
---
src/utils/common/index.js | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 9e1f8ff..a2bb1d8 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2025-10-15 15:52:12
* @LastEditors : yuan
- * @LastEditTime : 2025-10-16 17:57:16
+ * @LastEditTime : 2025-12-17 14:09:14
* @FilePath : \src\utils\common\index.js
* @Description :
* Copyright 2025 OBKoro1, All Rights Reserved.
@@ -10,8 +10,8 @@
*/
// 小程序更新检测
import { useUserStore } from "@/store/index.js"
-import configEnv from "@/config/env.js";
-import process from "node:process";
+import configEnv from "@/config/env.js"
+import process from "node:process"
export function mpUpdate () {
const updateManager = uni.getUpdateManager()
@@ -40,26 +40,39 @@
})
})
}
-export function getStatusBarHeight() {
+export function getStatusBarHeight () {
try {
- const systemInfo = uni.getSystemInfoSync();
- return systemInfo.statusBarHeight || 0;
+ const systemInfo = uni.getWindowInfo()
+
+ // #ifdef APP-PLUS
+ return systemInfo.statusBarHeight || 0
+ // #endif
+
+ // #ifdef MP-WEIXIN
+ return 0
+ // #endif
+
+ // #ifdef H5
+ return systemInfo.statusBarHeight || 0
+ // #endif
+ return systemInfo.statusBarHeight || 0
} catch (error) {
- return 0;
+ return 0
}
}
-export function getEnvObj() {
+export function getEnvObj () {
return configEnv[__APP_ENV__?.ENV_NAME] || {}
}
+
export function getWebViewUrl (targetUrl, otherParams) {
const userStore = useUserStore()
const url = getEnvObj().VITE_APP_WEBVIEW_URL
const uniPlatform = __APP_ENV__.UNI_PLATFORM
- const statusBarHeight = getStatusBarHeight();
+ const statusBarHeight = getStatusBarHeight()
// 1. 处理用户参数
const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}'
// 2. 构建查询参数字符串
-let queryString = `params=${encodeURIComponent(userParams)}&topMargin=${statusBarHeight}&uniPlatform=${uniPlatform}`
+ let queryString = `params=${encodeURIComponent(userParams)}&topMargin=${statusBarHeight}&uniPlatform=${uniPlatform}`
// 3. 处理 otherParams 对象
if (otherParams && typeof otherParams === 'object') {
@@ -73,3 +86,8 @@
// 4. 拼接完整 URL
return `${url}${targetUrl}?${queryString}`
}
+
+export function getAssetsImage (targetUrl) {
+ const url = getEnvObj().VITE_APP_ASSETS_URL
+ return `${url}${targetUrl}`
+}
\ No newline at end of file
--
Gitblit v1.9.3