From 35877f4b5c1bf299d00d9caa26ed0ab9664f3081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E8=AF=9A?= <1009578407@qq.com>
Date: Fri, 30 Oct 2026 16:11:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=96=97=E4=BC=91=E5=85=BB?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=201=E3=80=81h5=E4=BF=AE=E6=94=B9/=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=8A=A5=E5=90=8D=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81h5=E8=A1=A8=E5=8D=95=E5=90=8C=E6=AD=A5web=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BF=85=E5=A1=AB=E6=A0=87=E8=AF=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B=203=E3=80=81=E4=BF=AE=E6=94=B9/?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=90=8D=E7=95=8C=E9=9D=A2=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E4=BC=98=E5=8C=96=EF=BC=8C=E6=A0=B7=E5=BC=8F=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=EF=BC=9B=204=E3=80=81h5=E4=BF=AE=E6=94=B9/=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E7=95=8C=E9=9D=A2=E4=BA=B2=E5=B1=9E=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?-=E4=B8=8E=E6=9C=AC=E4=BA=BA=E5=85=B3=E7=B3=BB=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=90=8E=E4=B8=8D=E6=AD=A3=E5=B8=B8=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BA=B2=E5=B1=9E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF-=E5=B9=B4=E9=BE=84=E6=9C=AA=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=9C=80=E5=A4=A7=E4=B8=8A=E9=99=90=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E8=B6=8A=E7=95=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dayofficework/tour/mysignup/index.html    | 62 ++++++++++++++-----
 .../dayofficework/tour/signup/apply.html      | 19 +++---
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/tour/mysignup/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/tour/mysignup/index.html
index df0d13b..43dc7cc 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/tour/mysignup/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/tour/mysignup/index.html
@@ -276,8 +276,22 @@ layout("/layouts/platform_h5.html"){
         font-weight: 600;
     }
 
+    /* 导航栏参与弹层布局，正文独立滚动，避免固定导航遮住首张卡片。 */
+    .tour-record-popup {
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+        padding-top: env(safe-area-inset-top);
+        box-sizing: border-box;
+    }
+
+    .tour-record-popup > .van-nav-bar {
+        flex-shrink: 0;
+    }
+
     .tour-popup-body {
-        height: calc(100vh - 46px);
+        flex: 1;
+        min-height: 0;
         overflow-y: auto;
         padding: 10px 12px 76px;
         background: #f4f6f8;
@@ -594,7 +608,7 @@ layout("/layouts/platform_h5.html"){
     }
 
     .tour-popup-body {
-        padding: 12px 12px 82px;
+        padding: 12px 12px calc(82px + env(safe-area-inset-bottom));
         background-color: #f3f7fd;
     }
 
@@ -616,6 +630,12 @@ layout("/layouts/platform_h5.html"){
         box-shadow: 0 -6px 18px rgba(38, 66, 103, .08);
     }
 
+    .tour-bottom-bar .tour-cancel-button {
+        border: 0;
+        color: #65748a;
+        background-color: #f0f2f5;
+    }
+
     /* 列表页结构与提案校工会预审核保持一致，业务字段及操作条件继续沿用疗休养逻辑。 */
     .tour-my-page .van-nav-bar {
         background-color: #fff;
@@ -917,8 +937,8 @@ layout("/layouts/platform_h5.html"){
         </div>
     </van-popup>
 
-    <van-popup v-model="detailVisible" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false">
-        <van-nav-bar title="报名详情" left-text="返回" left-arrow @click-left="closeHistoryPopup('detail')" fixed placeholder></van-nav-bar>
+    <van-popup v-model="detailVisible" class="tour-record-popup" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false">
+        <van-nav-bar title="报名详情" left-text="返回" left-arrow @click-left="closeHistoryPopup('detail')"></van-nav-bar>
         <div class="tour-popup-body">
             <div class="tour-section">
                 <div class="tour-section-title">教职工信息</div>
@@ -926,6 +946,7 @@ layout("/layouts/platform_h5.html"){
                 <van-cell title="姓名" :value="detail.userName || ''"></van-cell>
                 <van-cell title="性别" :value="detail.gender || ''"></van-cell>
                 <van-cell title="身份证号" :value="detail.idCard || ''"></van-cell>
+                <van-cell title="手机号" :value="detail.mobile || ''"></van-cell>
                 <van-cell title="所在单位" :value="detail.unitName || ''"></van-cell>
                 <van-cell title="所在工会" :value="detail.unionName || ''"></van-cell>
             </div>
@@ -972,14 +993,15 @@ layout("/layouts/platform_h5.html"){
         </div>
     </van-popup>
 
-    <van-popup v-model="signupVisible" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false" @closed="destroySignup">
-        <van-nav-bar title="修改报名" left-text="返回" left-arrow @click-left="closeHistoryPopup('signup')" fixed placeholder></van-nav-bar>
+    <van-popup v-model="signupVisible" class="tour-record-popup" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false" @closed="destroySignup">
+        <van-nav-bar title="修改报名" left-text="返回" left-arrow @click-left="closeHistoryPopup('signup')"></van-nav-bar>
         <div class="tour-popup-body">
             <div class="tour-section">
                 <div class="tour-section-title">教职工信息</div>
                 <van-field label="姓名" readonly v-model="signupForm.userName"></van-field>
                 <van-field label="工号" readonly v-model="signupForm.jobNo"></van-field>
-                <van-field label="身份证号" v-model="signupForm.idCard" maxlength="30" placeholder="请填写身份证号"></van-field>
+                <van-field required label="身份证号" v-model="signupForm.idCard" maxlength="30" placeholder="请填写身份证号"></van-field>
+                <van-field required label="手机号" v-model="signupForm.mobile" type="tel" maxlength="11" placeholder="请填写手机号"></van-field>
                 <van-field label="所在工会" readonly v-model="signupForm.unionName"></van-field>
             </div>
 
@@ -1007,12 +1029,12 @@ layout("/layouts/platform_h5.html"){
 
             <div v-if="isDirectFamilyLine(signupForm)" class="tour-section">
                 <div class="tour-section-title">直系亲属线路</div>
-                <van-field label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
-                <van-field label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
-                <van-field readonly clickable is-link label="亲属关系" v-model="directRelativeForm.relationshipName" placeholder="请选择亲属关系" @click="openDirectRelativePicker"></van-field>
-                <van-field label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
-                <van-field label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
-                <van-field label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
+                <van-field required label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
+                <van-field required label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
+                <van-field required readonly clickable is-link label="亲属关系" v-model="directRelativeForm.relationshipName" placeholder="请选择亲属关系" @click="openDirectRelativePicker"></van-field>
+                <van-field required label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
+                <van-field required label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
+                <van-field required label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
             </div>
 
             <div v-if="allowFamily && !isDirectFamilyLine(signupForm)" class="tour-section">
@@ -1054,7 +1076,7 @@ layout("/layouts/platform_h5.html"){
                                     :title="familyTabTitle(family, familyIndex)">
                                 <div class="tour-family-form">
                                 <van-field required label="姓名" v-model="family.familyName" maxlength="100" placeholder="请填写姓名"></van-field>
-                                <van-field required label="年龄" v-model.number="family.age" type="digit" placeholder="请填写年龄"></van-field>
+                                <van-field required label="年龄" v-model.number="family.age" type="number" :formatter="formatFamilyAge" placeholder="请填写年龄"></van-field>
                                 <van-field required label="性别">
                                     <template #input>
                                         <van-radio-group v-model="family.gender" direction="horizontal">
@@ -1065,7 +1087,7 @@ layout("/layouts/platform_h5.html"){
                                 </van-field>
                                 <van-field :required="familyContactRequired(family)" label="身份证号码" v-model="family.idCard" maxlength="18" placeholder="请填写身份证号码" @blur="normalizeFamilyIdCard(family)"></van-field>
                                 <van-field :required="familyContactRequired(family)" label="手机号" v-model="family.mobile" type="tel" maxlength="30" placeholder="请填写手机号"></van-field>
-                                <van-field required readonly clickable is-link label="与本人关系" v-model="family.relationship" placeholder="请选择关系" @click="openRelationshipPicker"></van-field>
+                                <van-field required readonly clickable is-link label="与本人关系" v-model="family.relationship" placeholder="请选择关系" @click="openRelationshipPicker(familyIndex)"></van-field>
                                 <van-field v-if="fillBedInfo" readonly clickable is-link label="床型" v-model="family.bedType" placeholder="请选择房型" @click="openBedPicker('family')"></van-field>
                                 <van-field v-if="fillBedInfo" label="床位" v-model="family.bedInfo" maxlength="100" placeholder="请输入床位数量"></van-field>
                                 <van-field v-if="fillBedInfo" label="意向拼床人" v-model="family.intendedRoommate" maxlength="100" placeholder="请输入意向拼床人"></van-field>
@@ -1087,8 +1109,8 @@ layout("/layouts/platform_h5.html"){
                 <div v-else class="tour-family-empty">暂无亲属，请按需添加</div>
             </div>
         </div>
-        <div class="tour-bottom-bar">
-            <van-button v-if="signupForm.id" type="danger" plain block round :loading="cancelLoading" @click="cancelSignup">取消报名</van-button>
+        <div class="tour-bottom-bar tour-h5-fixed-bar">
+            <van-button v-if="signupForm.id" class="tour-cancel-button" type="default" block round :loading="cancelLoading" @click="cancelSignup">取消报名</van-button>
             <van-button type="info" block round :loading="signupLoading" @click="submitSignup">提交</van-button>
         </div>
     </van-popup>
@@ -1442,6 +1464,7 @@ layout("/layouts/platform_h5.html"){
                         userName: "",
                         gender: "",
                         idCard: "",
+                        mobile: "",
                         unitId: "",
                         unitName: "",
                         unionId: "",
@@ -1601,6 +1624,11 @@ layout("/layouts/platform_h5.html"){
             isBlankValue(value) {
                 return value === undefined || value === null || !String(value).trim()
             },
+            // 与 Web 端一致，亲属年龄限定为 0～120 岁整数，清空时保留必填状态。
+            formatFamilyAge(value) {
+                const age = parseInt(value, 10)
+                return Number.isNaN(age) ? "" : String(Math.min(120, Math.max(0, age)))
+            },
             // 年满16周岁的亲属才强制填写身份证号码和手机号。
             familyContactRequired(family) {
                 return family && !this.isBlankValue(family.age) && Number(family.age) >= 16
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/apply.html b/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/apply.html
index bdcdb04..8d62783 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/apply.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/apply.html
@@ -307,9 +307,9 @@ layout("/layouts/platform_tour_signup_h5.html"){
 
             <div v-if="isDirectFamilyLine(signupForm)" class="tour-apply-card">
                 <div class="tour-apply-title">直系亲属线路</div>
-                <van-field label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
-                <van-field label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
-                <van-field
+                <van-field required label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
+                <van-field required label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
+                <van-field required
                         label="亲属关系"
                         readonly
                         clickable
@@ -318,9 +318,9 @@ layout("/layouts/platform_tour_signup_h5.html"){
                         v-model="directRelativeForm.relationshipName"
                         @click="openDirectRelativePicker">
                 </van-field>
-                <van-field label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
-                <van-field label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
-                <van-field label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
+                <van-field required label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
+                <van-field required label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
+                <van-field required label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
             </div>
 
             <div class="tour-apply-card">
@@ -365,7 +365,7 @@ layout("/layouts/platform_tour_signup_h5.html"){
                                     :title="familyTabTitle(family, familyIndex)">
                                 <div class="tour-family-form">
                                 <van-field required label="姓名" v-model="family.familyName" maxlength="100" placeholder="请填写姓名"></van-field>
-                                <van-field required label="年龄" v-model.number="family.age" type="digit" placeholder="请填写年龄"></van-field>
+                                <van-field required label="年龄" v-model.number="family.age" type="number" :formatter="formatFamilyAge" placeholder="请填写年龄"></van-field>
                                 <van-field required label="性别">
                                     <template #input>
                                         <van-radio-group v-model="family.gender" direction="horizontal">
@@ -753,6 +753,11 @@ layout("/layouts/platform_tour_signup_h5.html"){
             isBlankValue(value) {
                 return value === undefined || value === null || !String(value).trim()
             },
+            // 与 Web 端一致，亲属年龄限定为 0～120 岁整数，清空时保留必填状态。
+            formatFamilyAge(value) {
+                const age = parseInt(value, 10)
+                return Number.isNaN(age) ? "" : String(Math.min(120, Math.max(0, age)))
+            },
             // 年满16周岁的亲属才强制填写身份证号码和手机号。
             familyContactRequired(family) {
                 return family && !this.isBlankValue(family.age) && Number(family.age) >= 16