diff --git a/packages/common/utils/url.ts b/packages/common/utils/url.ts index 7e723ac..20c0fae 100644 --- a/packages/common/utils/url.ts +++ b/packages/common/utils/url.ts @@ -9,10 +9,13 @@ export function appendParamsToUrl(url: string, pathname: string, params: Record< for (const key in params) { searchParams.append(key, params[key]) } - // 设置URL的查询参数 - urlObject.search = searchParams.toString() - + let result = urlObject.toString() + if (result.endsWith('?')) { + result += searchParams.toString() + } else { + result += '?' + searchParams.toString() + } // 返回处理后的URL字符串 - return urlObject.toString() + return result } diff --git a/webs/log-web/src/views/iframe.vue b/webs/log-web/src/views/iframe.vue index c754949..51a4303 100644 --- a/webs/log-web/src/views/iframe.vue +++ b/webs/log-web/src/views/iframe.vue @@ -26,9 +26,9 @@ export default { token: getToken(), ...(this.$route.query || {}) } - const url = appendParamsToUrl(this.url, this.$route.path, params) - console.log('iframeUrl: ', url.toString()) - return url.toString() + const url = appendParamsToUrl(this.url, this.$route.path + this.$route.meta?.pathname, params) + console.log('iframeUrl: ', url) + return url } }, methods: { diff --git a/webs/oms-web/src/views/iframe.vue b/webs/oms-web/src/views/iframe.vue index 9f8c10a..13f9487 100644 --- a/webs/oms-web/src/views/iframe.vue +++ b/webs/oms-web/src/views/iframe.vue @@ -26,9 +26,9 @@ export default { token: getToken(), ...(this.$route.query || {}) } - const url = appendParamsToUrl(this.url, this.$route.path, params) - console.log('iframeUrl: ', url.toString()) - return url.toString() + const url = appendParamsToUrl(this.url, this.$route.path + this.$route.meta?.pathname, params) + console.log('iframeUrl: ', url) + return url } }, methods: {