From f4de73c1cd56824f92f87fa119668564221827d7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 20 Oct 2025 09:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/common/index.js | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 6acbdb0..8d332d7 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -1,5 +1,15 @@
+/*
+ * @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"
export function mpUpdate () {
const updateManager = uni.getUpdateManager()
@@ -29,22 +39,22 @@
})
}
-export function getWebViewUrl(targetUrl, otherParams) {
- const userStore = useUserStore();
- const url = import.meta.env.VITE_APP_WEBVIEW_URL;
+export function getWebViewUrl (targetUrl, otherParams) {
+ const userStore = useUserStore()
+ const url = "https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper"
// 1. 处理用户参数
- const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}';
+ const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}'
// 2. 构建查询参数字符串
- let queryString = `params=${encodeURIComponent(userParams)}`;
+ let queryString = `params=${encodeURIComponent(userParams)}`
// 3. 处理 otherParams 对象
if (otherParams && typeof otherParams === 'object') {
Object.keys(otherParams).forEach(key => {
- const value = otherParams[key];
+ const value = otherParams[key]
if (value !== undefined && value !== null) {
- queryString += `&${key}=${encodeURIComponent(value)}`;
+ queryString += `&${key}=${encodeURIComponent(value)}`
}
- });
+ })
}
// 4. 拼接完整 URL
- return `${url}${targetUrl}?${queryString}`;
+ return `${url}${targetUrl}?${queryString}`
}
--
Gitblit v1.9.3