diff --git a/src/components/RegistrationEventRecordCalendar.vue b/src/components/RegistrationEventRecordCalendar.vue
index 9af4e88..21f57a4 100644
--- a/src/components/RegistrationEventRecordCalendar.vue
+++ b/src/components/RegistrationEventRecordCalendar.vue
@@ -49,33 +49,47 @@
 		<div v-else-if="!currentMonthFilteredRecords.length" class="empty-block" v-text="emptyText" />
 		<t-popup v-model="dayRecordVisible" placement="bottom">
 			<div class="day-record-panel">
-				<h3 v-text="selectedDayTitle" />
-				<t-cell-group v-if="selectedDayRecords.length" theme="card">
-					<t-cell
-						v-for="item in selectedDayRecords"
-						:key="item.id"
-						:title="getRecordRegistrationEventName(item)"
-						:description="getRecordCustomerName(item)"
-						:note="`${formatRecordTime(item.registeredAt)}`"
-					/>
-				</t-cell-group>
-				<div v-else class="empty-block">该日暂无登记事件记录</div>
+				<div class="popup-head">
+					<h3 v-text="selectedDayTitle" />
+					<t-button theme="default" variant="text" size="small" @click="dayRecordVisible = false">
+						关闭
+					</t-button>
+				</div>
+				<div class="popup-body">
+					<t-cell-group v-if="selectedDayRecords.length" theme="card">
+						<t-cell
+							v-for="item in selectedDayRecords"
+							:key="item.id"
+							:title="getRecordRegistrationEventName(item)"
+							:description="getRecordCustomerName(item)"
+							:note="`${formatRecordTime(item.registeredAt)}`"
+						/>
+					</t-cell-group>
+					<div v-else class="empty-block">该日暂无登记事件记录</div>
+				</div>
 			</div>
 		</t-popup>
 		<t-popup v-model="registrationEventFilterVisible" placement="bottom">
 			<div class="filter-popup">
-				<div class="title">登记事件筛选</div>
-				<t-checkbox-group v-model="selectedRegistrationEventIdListProxy" class="items">
-					<t-checkbox
-						class="item"
-						v-for="item in registrationEventList"
-						:key="item.id"
-						:value="item.id"
-						:label="item.name"
-						block
-						borderless
-					/>
-				</t-checkbox-group>
+				<div class="popup-head">
+					<div class="title">登记事件筛选</div>
+					<t-button theme="default" variant="text" size="small" @click="registrationEventFilterVisible = false">
+						关闭
+					</t-button>
+				</div>
+				<div class="popup-body">
+					<t-checkbox-group v-model="selectedRegistrationEventIdListProxy" class="items">
+						<t-checkbox
+							class="item"
+							v-for="item in registrationEventList"
+							:key="item.id"
+							:value="item.id"
+							:label="item.name"
+							block
+							borderless
+						/>
+					</t-checkbox-group>
+				</div>
 			</div>
 		</t-popup>
 	</section>
@@ -346,6 +360,7 @@ function addMonths(date: Date, months: number): Date {
 	background: #f5f5f8;
 	border-radius: 1rem 1rem 0 0;
 	flex-direction: column;
+	max-height: min(80vh, 40rem);
 
 	h3,
 	.title {
@@ -355,11 +370,29 @@ function addMonths(date: Date, months: number): Date {
 		text-align: center;
 		font-weight: 700;
 	}
+
+	.popup-head {
+		gap: .5rem;
+		display: flex;
+		padding: 0 1rem;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.popup-body {
+		flex: 1;
+		overflow-y: auto;
+	}
 }
 
 .filter-popup {
 	padding: 1rem 1rem calc(1rem + env(safe-area-inset-bottom, 0)) 1rem;
 
+	.popup-head,
+	.popup-body {
+		padding: 0;
+	}
+
 	.items {
 		gap: .5rem;
 		display: grid;
@@ -413,7 +446,7 @@ function addMonths(date: Date, months: number): Date {
 	}
 
 	.day-record-panel,
-	.registration-event-filter-panel {
+	.filter-popup {
 		background: #10161f;
 
 		h3,