From 415cf43c50ea99b22fdcb34a52f7b1b7d7302256 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Thu, 7 Aug 2025 16:36:02 +0800
Subject: [PATCH] no message

---
 root/person/marge.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/root/person/marge.vue b/root/person/marge.vue
index 3642dde..09bb4f9 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -33,8 +33,8 @@
 		</view>
 		
 		
-		<u-popup v-model="modalApplyData.isShow" mode="center" border-radius="14" width="80%" :closeable='true'>
-			<view>
+		<u-popup v-model="modalApplyData.isShow" mode="bottom" border-radius="14" width="80%" :closeable='true'>
+			<view style="max-height: calc(100vh - 200px);overflow-y: auto;">
 				<view class="g_flex_c g_h_40 g_fs_16">申请合并</view>
 				<view>
 					<view>
@@ -71,6 +71,7 @@
 							<g-button type='primary' size='small' btnText='提交'></g-button>
 						</view>
 					</view>
+					<view class="g_h_20"></view>
 				</view>
 			</view>
 		</u-popup>