From 873e1efe73b2eec7d3cd2b1011a91ebd212e4a54 Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Tue, 14 Jul 2026 17:22:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(util&scss):=20=E4=BF=AE=E5=A4=8D=E5=BF=AB?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=86=85=E5=B5=8CH5=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96URL=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 为body添加滚动样式适配快应用webview视口限制
2. 调整URL参数合并逻辑，确保page_params始终置于URL末尾
---
 common/css/main.scss | 4 ++++
 common/js/util.js    | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/css/main.scss b/common/css/main.scss
index 601d983..ddbc976 100644
--- a/common/css/main.scss
+++ b/common/css/main.scss
@@ -40,6 +40,10 @@ body {
 	margin: 0;
 	padding: 0;
 	background-color: $color-bg;
+	/* 快应用内嵌 H5: webview 视口可能比屏幕小, 允许根容器自身滚动
+	   避免外层 view overflow:hidden 截断子组件内容 */
+	overflow: auto;
+	-webkit-overflow-scrolling: touch;
 }
 
 #app,
diff --git a/common/js/util.js b/common/js/util.js
index 8a31329..4cb24d3 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -721,7 +721,13 @@ export default {
 		}
 
 		// 2. 合并 param:同 key 时新值覆盖旧值,杜绝 ?name=A&name=B 这种重复
-		const merged = Object.assign({}, existingParams, param || {});
+		//    page_params 永远放在 URL 最末:从 param 中抽离后追加到 merged 末尾
+		const safeParam = param || {};
+		const { page_params, ...restParam } = safeParam;
+		const merged = Object.assign({}, existingParams, restParam);
+		if (page_params !== undefined) {
+			merged.page_params = page_params;
+		}
 
 		// 3. 参数编码策略,按平台区分:
 		//    - 小程序/App: uni.navigateTo / router.pushUrl 内部会自动对 url 做一次编码,