From 2fee66bc6651e1460ea1dbfb7affff2afa066add Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 15 Oct 2025 15:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-app
---
src/utils/common/index.js | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 63a29a5..6acbdb0 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -29,17 +29,22 @@
})
}
-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 对象
+export function getWebViewUrl(targetUrl, otherParams) {
+ const userStore = useUserStore();
+ const url = import.meta.env.VITE_APP_WEBVIEW_URL;
+ // 1. 处理用户参数
+ const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}';
+ // 2. 构建查询参数字符串
+ let queryString = `params=${encodeURIComponent(userParams)}`;
+ // 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.toString()}`
+ // 4. 拼接完整 URL
+ return `${url}${targetUrl}?${queryString}`;
}
--
Gitblit v1.9.3