From 5f694550ed7bf0f6147c66feaa4406034ae62e54 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 11 Aug 2026 19:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue b/uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue
index 50c3bbc..adc880f 100644
--- a/uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue
+++ b/uniapps/work-app/src/subPackages/workDetail/HandleWork/index.vue
@@ -113,8 +113,12 @@
 }
 
 function uploadHadle() {
+	// 取最后一条记录的状态值,列表为空时取页面进入时的状态
+	const status = recordList.value.length
+		? recordList.value[recordList.value.length - 1]?.disposeStatus
+		: eventStatus.value
 	uni.navigateTo({
-		url: `/subPackages/workDetail/HandleWorking/index?id=${eventId.value}&eventStatus=${eventStatus.value}`,
+		url: `/subPackages/workDetail/HandleWorking/index?id=${eventId.value}&eventStatus=${status}`,
 	})
 }
 
@@ -141,7 +145,12 @@
 
 <style scoped lang="scss">
 .handle-work-page {
-	padding-top: 188rpx;
+	// #ifdef APP-PLUS
+  padding-top: 188rpx;
+  // #endif
+  // #ifdef H5
+  padding-top: 88rpx;
+  // #endif
 	:deep() {
 		.u-navbar__content {
 			background: url('https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/bg.png')
@@ -180,7 +189,7 @@
 	align-items: center;
 	justify-content: flex-end;
 	padding-right: 24rpx;
-	margin: 0 0 12rpx 0; // 上下间距
+	// margin: 0 0 12rpx 0; // 上下间距
 	color: #1d6fe9;
 	font-size: 28rpx;
 	flex-shrink: 0; // 防止被压缩
@@ -190,7 +199,7 @@
 .record-scroll {
 	flex: 1; // 占满剩余高度
 	// padding-top: 24rpx;
-	padding: 0 24rpx 24rpx 24rpx; // 左右下内边距
+	padding: 10rpx 24rpx 24rpx 24rpx; // 左右下内边距
 	box-sizing: border-box;
 }
 

--
Gitblit v1.9.3