From e331bfc0f4bff37710983e0202d7a4434f8e1cf5 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 10 Nov 2025 15:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ContractForm/index.vue         |  71 ++--
 src/components/NavBarModal/index.vue          |  93 +++--
 src/pages.json                                |  82 +++--
 src/pages/ContractDetails/index.vue           |   6 +-
 src/pages/WageCardDetails/index.vue           |   5 +-
 src/pages/att-count/index.vue                 |   6 +-
 src/pages/att-count/person-details/index.vue  |   6 +-
 src/pages/attendance/record/index.vue         |  16 +-
 .../home/child-pages/all-project/index.vue    |  16 +-
 .../home/child-pages/entryUnsettled/index.vue |  16 +-
 .../home/child-pages/lot-project/index.vue    |  17 +-
 .../home/child-pages/personInfo/index.vue     |  67 +++-
 src/pages/home/child-pages/useSub/index.vue   | 109 ++++--
 src/pages/home/child-pages/useTeam/index.vue  |  17 +-
 .../components/bindSetting.vue                |   8 +-
 src/pages/machine-setting/index.vue           |   6 +-
 src/pages/my/edit-password/index.vue          |   5 +-
 .../person-check/aptitude-query/index.vue     |   9 +-
 src/pages/person-check/index.vue              |   6 +-
 src/pages/person-details/index.vue            |   8 +-
 .../child-pages/addAndEditPerson.vue          |  49 +--
 .../person-entry/child-pages/editPerson.vue   |   6 +-
 .../child-pages/projectSetting.vue            |  97 +++--
 src/pages/person-entry/index.vue              |  51 +--
 src/pages/person-exit/data-upload/index.vue   |   6 +-
 src/pages/person-exit/index.vue               |   5 +-
 .../child-pages/addProject.vue                | 346 ++++++++++--------
 src/pages/shProjectDetails/index.vue          |   6 +-
 src/static/image/home/close.png               | Bin 0 -> 3526 bytes
 src/static/image/home/open.png                | Bin 0 -> 3436 bytes
 src/static/image/home/search.png              | Bin 0 -> 11398 bytes
 31 files changed, 748 insertions(+), 387 deletions(-)
 create mode 100644 src/static/image/home/close.png
 create mode 100644 src/static/image/home/open.png
 create mode 100644 src/static/image/home/search.png

diff --git a/src/components/ContractForm/index.vue b/src/components/ContractForm/index.vue
index 6ec6313..c484fd7 100644
--- a/src/components/ContractForm/index.vue
+++ b/src/components/ContractForm/index.vue
@@ -8,14 +8,19 @@
             :model="contractInfoForm"
             :rules="contractInfoFormRules"
         >
-            <up-cell style="padding: 0 13px">
+            <up-cell style="padding: 0 13px" v-if="isShowBottomAndTop">
                 <template #icon>
                     <text class="red-text">
                         非必填，后期可在合同见证模块补录合同，但如果部分填写，则需把信息全部完善
                     </text>
                 </template>
             </up-cell>
-            <up-form-item label="合同类型" prop="postName" :borderBottom="true">
+            <up-form-item
+                label="合同类型"
+                prop="postName"
+                :borderBottom="true"
+                v-if="isShowBottomAndTop"
+            >
                 <up-cell style="width: 100%" :border="false">
                     <template #icon> 纸质合同 </template>
                 </up-cell>
@@ -112,7 +117,7 @@
             >
                 <up-upload
                     multiple
-                    :maxCount="1"
+                    :maxCount="3"
                     :name="item.name"
                     accept="image"
                     :fileList="item.fileList"
@@ -125,7 +130,7 @@
             </up-form-item>
         </up-form>
 
-        <view class="red-text tip-container">
+        <view class="red-text tip-container" v-if="isShowBottomAndTop">
             <text> 提醒事项： </text>
             <text> 1： 未完成合同上传未【黄灯人员】</text>
             <text> 2： 生成工资册之前必须上传合同信息，工资册根据合同核定标准生成</text>
@@ -167,30 +172,30 @@ const contractImageList = ref([
         name: 'contract',
         title: '人员手持合同照',
     },
-    {
-        type: 2,
-        fileList: [],
-        name: 'contract',
-        title: '工作内容页',
-    },
-    {
-        type: 3,
-        fileList: [],
-        name: 'contract',
-        title: '薪酬约定页',
-    },
-    {
-        type: 4,
-        fileList: [],
-        name: 'contract',
-        title: '本人签名页',
-    },
-    {
-        type: 5,
-        fileList: [],
-        name: 'contract',
-        title: '其他照片',
-    },
+    // {
+    //     type: 2,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '工作内容页',
+    // },
+    // {
+    //     type: 3,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '薪酬约定页',
+    // },
+    // {
+    //     type: 4,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '本人签名页',
+    // },
+    // {
+    //     type: 5,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '其他照片',
+    // },
 ]) // 合同见证照片
 
 const contractInfoFormRules = ref({
@@ -319,7 +324,7 @@ const checkFormStatus = () => {
     let emptyFieldCount = 0
     let filledFieldCount = 0
     const fieldsList = [
-        'contractCode', // 合同编号
+        // 'contractCode', // 合同编号
         'wageCriterion', // 工资核定标准
         'contractStopDate', // 合同终止日期
         'contractStartDate', // 合同
@@ -367,7 +372,7 @@ const validateContractForm = async () => {
                     // console.log(status)
                     if (status === 'partial') {
                         uni.$u.toast('请完善合同见证中的所有信息')
-                        return reject(new Error('合同信息未完善'))
+                        return reject({ isValid: false, msg: '提交失败，请完善合同见证中的信息' })
                     } else {
                         let data = {}
                         if (contractImageIdList.value.length > 0) {
@@ -421,6 +426,12 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+
+    // 是否显示底部和顶部
+    isShowBottomAndTop: {
+        type: Boolean,
+        default: true,
+    },
 })
 
 // 增加监听
diff --git a/src/components/NavBarModal/index.vue b/src/components/NavBarModal/index.vue
index 55ac62f..0210f9b 100644
--- a/src/components/NavBarModal/index.vue
+++ b/src/components/NavBarModal/index.vue
@@ -1,15 +1,16 @@
 <template>
     <!-- 导航栏 -->
-    <up-navbar :title="navBarTitle">
+    <up-navbar class="nav-bar-modal" :title="navBarTitle">
         <template #left>
             <view class="u-nav-slot" @tap="onHandleBack">
-                <up-icon name="arrow-left" size="20" color="#2979ff" />
-                返回
+                <up-icon name="arrow-left" size="18" :color="PRIMARY_COLOR" />
             </view>
         </template>
 
-        <template #right v-if="showUploadRecord">
-            <text style="color: #2979ff" @tap="onHandleUploadRecord">上传记录</text>
+        <template #right>
+            <slot name="right">
+                <!-- <up-icon name="home-fill" size="22" :color="PRIMARY_COLOR" @tap="onHandleHome" /> -->
+            </slot>
         </template>
     </up-navbar>
 </template>
@@ -18,44 +19,80 @@
 const props = defineProps({
     // 标题名称
     navBarTitle: {
-        type: String,
-        default: () => '个人中心',
-    },
-
-    // 是否显示上传记录的标志
-    showUploadRecord: {
-        type: Boolean,
-        default: () => false,
-    },
-
-    // 上传记录的url地址
-    uploadRecordUrl: {
         type: String,
         default: () => '',
     },
 })
 
+const PRIMARY_COLOR = '#007aff'
+
 // 返回按钮
 const onHandleBack = () => {
     uni.navigateBack()
 }
 
-// 查看上传记录
-const onHandleUploadRecord = () => {
-    uni.navigateTo({
-        url: props.uploadRecordUrl,
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
     })
 }
 </script>
 
-<style scoped>
-.u-nav-slot {
-    display: flex;
-    align-items: center;
-    color: #2979ff;
+<style scoped lang="scss">
+@import '@/uni.scss';
+
+.nav-bar-modal {
+    ::v-deep .u-navbar__content {
+        padding: 0 18px;
+        min-height: 50px;
+        background: linear-gradient(
+            90deg,
+            rgba($uni-color-primary, 0.08),
+            rgba($uni-color-primary, 0.02)
+        );
+
+        box-shadow: 0 10px 30px rgba(27, 72, 132, 0.06);
+        backdrop-filter: blur(12px);
+        transition:
+            background 0.3s ease,
+            box-shadow 0.3s ease;
+    }
+
+    ::v-deep .u-navbar__content__title {
+        font-size: 17px;
+        font-weight: 600;
+        color: #1c1d21;
+        letter-spacing: 0.4px;
+    }
+
+    ::v-deep .u-navbar__content__right {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        font-size: 14px;
+        color: #5e6170;
+    }
 }
 
-::v-deep .u-navbar__content__title {
-    font-weight: bold;
+.u-nav-slot {
+    // display: inline-flex;
+    // align-items: center;
+    // justify-content: center;
+    // width: 34px;
+    // height: 34px;
+    // border-radius: 50%;
+    // background: rgba($uni-color-primary, 0.16);
+    // box-shadow: 0 6px 16px rgba($uni-color-primary, 0.18);
+    // transition:
+    //     transform 0.2s ease,
+    //     box-shadow 0.2s ease,
+    //     background 0.2s ease;
+}
+
+.u-nav-slot:active {
+    transform: translateY(1px);
+    box-shadow: 0 3px 10px rgba($uni-color-primary, 0.25);
+    background: rgba($uni-color-primary, 0.24);
 }
 </style>
diff --git a/src/pages.json b/src/pages.json
index ce4692f..3ec3852 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -45,7 +45,8 @@
         {
             "path": "pages/attendance/record/index",
             "style": {
-                "navigationBarTitleText": "打卡记录"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 我的
@@ -60,7 +61,8 @@
         {
             "path": "pages/my/edit-password/index",
             "style": {
-                "navigationBarTitleText": "修改密码"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -68,7 +70,8 @@
         {
             "path": "pages/person-entry/index",
             "style": {
-                "navigationBarTitleText": "人员入场"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -78,6 +81,7 @@
             "path": "pages/person-entry/child-pages/addAndEditPerson",
             "style": {
                 // "navigationBarTitleText": "新增人员信息"
+                "navigationBarTitleText": "custom",
                 "navigationStyle": "custom"
             }
         },
@@ -86,7 +90,8 @@
         {
             "path": "pages/person-entry/child-pages/editPerson",
             "style": {
-                "navigationBarTitleText": "修改人员信息"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -94,14 +99,16 @@
         {
             "path": "pages/person-entry/child-pages/faceRecognition",
             "style": {
-                "navigationBarTitleText": "人脸识别查找"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 上海人员多工程设置
         {
             "path": "pages/person-entry/child-pages/projectSetting",
             "style": {
-                "navigationBarTitleText": "上海人员多工程设置"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -109,7 +116,8 @@
         {
             "path": "pages/person-exit/index",
             "style": {
-                "navigationBarTitleText": "人员出场"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -117,56 +125,66 @@
         {
             "path": "pages/person-exit/data-upload/index",
             "style": {
-                "navigationBarTitleText": "人员出场资料上传"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 人员检查
         {
             "path": "pages/person-check/index",
             "style": {
-                "navigationBarTitleText": "人员资质查询"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 人员检查  ---- 人员资质查询
         {
             "path": "pages/person-check/aptitude-query/index",
             "style": {
-                "navigationBarTitleText": "人员资质查询"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 考勤统计
         {
             "path": "pages/att-count/index",
             "style": {
-                "navigationBarTitleText": "考勤统计"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 考勤统计 ---- 个人详情
         {
             "path": "pages/att-count/person-details/index",
             "style": {
-                "navigationBarTitleText": "个人详情"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 人员详情
         {
             "path": "pages/person-details/index",
             "style": {
-                "navigationBarTitleText": "人员详情"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 合同详情
         {
             "path": "pages/ContractDetails/index",
             "style": {
-                "navigationBarTitleText": "合同详情"
+                // "navigationBarTitleText": "合同详情"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 工资卡详情
         {
             "path": "pages/WageCardDetails/index",
             "style": {
-                "navigationBarTitleText": "工资卡详情"
+                // "navigationBarTitleText": "工资卡详情"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 选择工程
@@ -181,28 +199,36 @@
         {
             "path": "pages/machine-setting/index",
             "style": {
-                "navigationBarTitleText": "考勤机设置"
+                // "navigationBarTitleText": "考勤机设置"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 考勤机设置 ---- 绑定设置
         {
             "path": "pages/machine-setting/components/bindSetting",
             "style": {
-                "navigationBarTitleText": "考勤机设置"
+                // "navigationBarTitleText": "考勤机设置"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 上海多工程设置明细
         {
             "path": "pages/shProjectDetails/index",
             "style": {
-                "navigationBarTitleText": "上海多工程设置明细"
+                // "navigationBarTitleText": "上海多工程设置明细"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 新增入场工程
         {
             "path": "pages/shProjectDetails/child-pages/addProject",
             "style": {
-                "navigationBarTitleText": "新增入场工程"
+                // "navigationBarTitleText": "新增入场工程"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
 
@@ -210,42 +236,48 @@
         {
             "path": "pages/home/child-pages/all-project/index",
             "style": {
-                "navigationBarTitleText": "总工程"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 首页二级页面 ---- 标段工程
         {
             "path": "pages/home/child-pages/lot-project/index",
             "style": {
-                "navigationBarTitleText": "标段工程"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 首页二级页面 ---- 在用分包
         {
             "path": "pages/home/child-pages/useSub/index",
             "style": {
-                "navigationBarTitleText": "在用分包"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 首页二级页面 ---- 在用班组
         {
             "path": "pages/home/child-pages/useTeam/index",
             "style": {
-                "navigationBarTitleText": "在用班组"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 首页二级页面 ---- 在场人员
         {
             "path": "pages/home/child-pages/personInfo/index",
             "style": {
-                "navigationBarTitleText": "人员列表"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         },
         // 首页二级页面 ---- 出场未结算
         {
             "path": "pages/home/child-pages/entryUnsettled/index",
             "style": {
-                "navigationBarTitleText": "出场未上传《离场结算确认单》"
+                "navigationBarTitleText": "custom",
+                "navigationStyle": "custom"
             }
         }
     ],
diff --git a/src/pages/ContractDetails/index.vue b/src/pages/ContractDetails/index.vue
index 39ef942..40d8715 100644
--- a/src/pages/ContractDetails/index.vue
+++ b/src/pages/ContractDetails/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 合同详情 -->
-    <view class="contract-details">
+    <NavBarModal navBarTitle="合同详情" />
+    <view class="contract-details" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view> 合同见证照片 </view>
         <view class="contract-image">
             <view
@@ -32,7 +33,8 @@
 <script setup name="ContractDetails">
 import { onLoad } from '@dcloudio/uni-app'
 import { ref } from 'vue'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const contractInfo = ref({})
 const contractFileTitle = {
     1: '人员手持合同照',
diff --git a/src/pages/WageCardDetails/index.vue b/src/pages/WageCardDetails/index.vue
index c9fdce6..9748430 100644
--- a/src/pages/WageCardDetails/index.vue
+++ b/src/pages/WageCardDetails/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 工资卡详情 -->
-    <view class="wage-card-details">
+    <NavBarModal navBarTitle="工资卡详情" />
+    <view class="wage-card-details" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view> 工资卡见证照片 </view>
         <view class="wage-card-image">
             <view
@@ -32,6 +33,8 @@
 <script setup name="WageCardDetails">
 import { onLoad } from '@dcloudio/uni-app'
 import { ref } from 'vue'
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const wageCardInfo = ref({})
 const wageCardFileTitle = {
     1: '手持银行卡、承诺书',
diff --git a/src/pages/att-count/index.vue b/src/pages/att-count/index.vue
index 3758ed4..8281fdc 100644
--- a/src/pages/att-count/index.vue
+++ b/src/pages/att-count/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 考勤统计 -->
-    <view class="att-count app-container">
+    <NavBarModal navBarTitle="考勤统计" />
+    <view class="att-count app-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="project-name"> {{ activeProjectName || '请选择工程' }} </view>
         <view class="date-picker-box">
             <view>
@@ -95,7 +96,8 @@ import { getAttCountListAPI } from '@/services/att-count'
 
 import dayjs from 'dayjs'
 import Empty from '@/static/image/Empty.png'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const commonStore = useCommonStore()
 const tableContentHeight = ref('') // 表格内容高度
 const activeProjectName = ref('') // 当前选择的工程名称
diff --git a/src/pages/att-count/person-details/index.vue b/src/pages/att-count/person-details/index.vue
index 3870cae..deb6688 100644
--- a/src/pages/att-count/person-details/index.vue
+++ b/src/pages/att-count/person-details/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 个人详情 -->
-    <view class="attendance-record">
+    <NavBarModal navBarTitle="个人详情" />
+    <view class="attendance-record" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view style="width: 28%; margin-right: 12rpx">
                 <up-select
@@ -51,7 +52,8 @@
 import { onLoad } from '@dcloudio/uni-app'
 import { ref, computed, onMounted, nextTick } from 'vue'
 import { getAttCountPersonDetailsAPI } from '@/services/att-count.js'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const inputRef = ref(null)
 const searchNameValue = ref('') // 搜索姓名
 const statusId = ref('') // 状态
diff --git a/src/pages/attendance/record/index.vue b/src/pages/attendance/record/index.vue
index 13ad5e5..6234717 100644
--- a/src/pages/attendance/record/index.vue
+++ b/src/pages/attendance/record/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 打卡记录 -->
-    <view class="attendance-record app-container">
+    <NavBarModal navBarTitle="打卡记录" />
+
+    <view
+        class="attendance-record app-container"
+        :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }"
+    >
         <view class="search-content">
             <view style="width: 28%; margin-right: 12rpx">
                 <up-select
@@ -21,7 +26,7 @@
                     v-model="queryParams.workerName"
                 >
                     <template #suffix>
-                        <up-icon name="search" size="24" color="#909399" @tap="onSearchName" />
+                        <up-icon :name="SearchIcon" size="24" @tap="onSearchName" />
                     </template>
                 </up-input>
             </view>
@@ -31,7 +36,7 @@
             <view style="width: 12%">序号</view>
             <view style="width: 30%">姓名</view>
             <view style="width: 22%">考勤状态</view>
-            <view style="width: 34%">时间</view>
+            <view style="width: 36%">时间</view>
         </view>
 
         <scroll-view
@@ -59,7 +64,7 @@
                         text="未考勤"
                     />
                 </view>
-                <view style="width: 34%">{{ item.attTime }}</view>
+                <view style="width: 36%">{{ item.attTime }}</view>
             </view>
 
             <view class="loading-text">
@@ -80,7 +85,10 @@ import { ref, computed, onMounted, nextTick } from 'vue'
 import { getAttendanceRecordAPI } from '@/services/attendance'
 
 import Empty from '@/static/image/Empty.png'
+import SearchIcon from '@/static/image/home/search.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
 
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const inputRef = ref(null)
 const selectHeight = ref(0) // 选择框高度
 const total = ref(0) // 总条数
diff --git a/src/pages/home/child-pages/all-project/index.vue b/src/pages/home/child-pages/all-project/index.vue
index e576a5b..bae0920 100644
--- a/src/pages/home/child-pages/all-project/index.vue
+++ b/src/pages/home/child-pages/all-project/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 总工程 -->
-    <view class="machine-setting">
+    <NavBarModal navBarTitle="总工程">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="machine-setting" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <up-input
                 clearable
@@ -57,10 +62,12 @@ import { getHomeIndexAllProjectAPI } from '@/services/home-index.js'
 import { useCommonStore } from '@/stores'
 
 import Empty from '@/static/image/Empty.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
 
 const inputRef = ref(null) // 输入框
 const allProjectList = ref([]) // 总工程列表
 const total = ref(0) // 总条数
+const { safeAreaInsets } = uni.getSystemInfoSync()
 
 const commonStore = useCommonStore() // 工程信息
 const queryParams = ref({
@@ -112,6 +119,13 @@ const onMachineSettingItem = (item) => {
     })
 }
 
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
+
 onMounted(() => {
     getAllProjectListFun()
 })
diff --git a/src/pages/home/child-pages/entryUnsettled/index.vue b/src/pages/home/child-pages/entryUnsettled/index.vue
index 9763cd3..a74af20 100644
--- a/src/pages/home/child-pages/entryUnsettled/index.vue
+++ b/src/pages/home/child-pages/entryUnsettled/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 出场未结算 -->
-    <view class="project-list-container">
+    <NavBarModal navBarTitle="出场未上传《离场结算确认单》">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="project-list-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view class="search-wrapper">
                 <up-input
@@ -79,6 +84,8 @@ import { getHomeIndexEntryUnsettledMsgAPI } from '@/services/home-index.js'
 
 import { onLoad } from '@dcloudio/uni-app'
 import Empty from '@/static/image/Empty.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 
 const inputRef = ref(null) // 输入框
 const personList = ref([]) // 人员列表
@@ -134,6 +141,13 @@ const hasMore = computed(() => {
 onLoad(async (options) => {
     getPersonListFun()
 })
+
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/home/child-pages/lot-project/index.vue b/src/pages/home/child-pages/lot-project/index.vue
index 2b2f6b2..f0728df 100644
--- a/src/pages/home/child-pages/lot-project/index.vue
+++ b/src/pages/home/child-pages/lot-project/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 标段工程 -->
-    <view class="project-list-container">
+    <NavBarModal navBarTitle="标段工程">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="project-list-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view class="search-wrapper">
                 <up-input
@@ -184,6 +189,9 @@ import {
 
 import { onLoad } from '@dcloudio/uni-app'
 import Empty from '@/static/image/Empty.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
+
+const { safeAreaInsets } = uni.getSystemInfoSync()
 
 const inputRef = ref(null) // 输入框
 const projectList = ref([]) // 工程列表
@@ -474,6 +482,13 @@ onLoad(async (options) => {
 
     getAllProjectListFun()
 })
+
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/home/child-pages/personInfo/index.vue b/src/pages/home/child-pages/personInfo/index.vue
index 16743bc..e1d94f7 100644
--- a/src/pages/home/child-pages/personInfo/index.vue
+++ b/src/pages/home/child-pages/personInfo/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 标段工程 -->
-    <view class="project-list-container">
+    <NavBarModal navBarTitle="在场人员">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="project-list-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view class="search-wrapper">
                 <up-input
@@ -11,7 +16,7 @@
                     placeholder="输入姓名"
                 >
                     <template #suffix>
-                        <up-icon name="search" size="24" color="#909399" @tap="onSearchName" />
+                        <up-icon :name="searchIcon" size="24" color="#909399" @tap="onSearchName" />
                     </template>
                 </up-input>
                 <up-icon
@@ -22,7 +27,31 @@
                     @tap="onOpenFilter"
                 />
             </view>
-            <view class="data-summary">已查询 {{ total }} 条数据</view>
+
+            <view v-if="isAdvancedOpen" class="advanced-search">
+                <up-input
+                    clearable
+                    class="search-name"
+                    v-model="queryParams.subName"
+                    placeholder="输入分包名称"
+                />
+                <up-input
+                    clearable
+                    class="search-name"
+                    v-model="queryParams.proName"
+                    placeholder="输入工程名称"
+                />
+            </view>
+            <view class="data-summary">
+                <text> 已查询 {{ total }} 条数据 </text>
+
+                <up-icon
+                    size="28"
+                    @tap="toggleAdvanced"
+                    style="transform: rotate(270deg)"
+                    :name="isAdvancedOpen ? closeIcon : openIcon"
+                />
+            </view>
         </view>
 
         <scroll-view scroll-y class="project-list-content" @scrolltolower="onHandleScrollToLower">
@@ -158,13 +187,20 @@ import { getSubCompanySelectList, getPostTypeList } from '@/utils/common'
 import { onLoad } from '@dcloudio/uni-app'
 import Empty from '@/static/image/Empty.png'
 
+import searchIcon from '@/static/image/home/search.png'
+import openIcon from '@/static/image/home/open.png'
+import closeIcon from '@/static/image/home/close.png'
+
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
+
 const inputRef = ref(null) // 输入框
 const projectList = ref([]) // 工程列表
 const total = ref(0) // 总条数
 const isLoading = ref(false) // 加载状态
 const showFilterPanel = ref(false) // 筛选面板显示状态
-
 const subCompanyList = ref([]) // 分公司列表
+const isAdvancedOpen = ref(false) // 是否展开其他筛选
 const commonStore = useCommonStore() // 工程信息
 const commonPath = '/pages/home/child-pages/'
 
@@ -172,6 +208,8 @@ const commonPath = '/pages/home/child-pages/'
 const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
+    subName: '', // 分包名称
+    proName: '', // 工程名称
 
     proId: '',
     subId: '',
@@ -340,6 +378,10 @@ const onSearchName = () => {
     getPersonListFun()
 }
 
+const toggleAdvanced = () => {
+    isAdvancedOpen.value = !isAdvancedOpen.value
+}
+
 // 获人员列表数据
 const getPersonListFun = async (isRefresh = false) => {
     const queryParamsCopy = JSON.parse(JSON.stringify(queryParams.value))
@@ -519,6 +561,13 @@ onLoad(async (options) => {
     }
     getPersonListFun()
 })
+
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
 </script>
 
 <style scoped lang="scss">
@@ -553,10 +602,20 @@ onLoad(async (options) => {
         }
     }
 
+    .advanced-search {
+        margin-top: 20rpx;
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 20rpx;
+    }
+
     .data-summary {
         margin-top: 20rpx;
         font-size: 24rpx;
         color: #4ca4fe;
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
     }
 }
 
diff --git a/src/pages/home/child-pages/useSub/index.vue b/src/pages/home/child-pages/useSub/index.vue
index dcc0f58..e75e827 100644
--- a/src/pages/home/child-pages/useSub/index.vue
+++ b/src/pages/home/child-pages/useSub/index.vue
@@ -1,21 +1,51 @@
 <template>
-    <!-- 在建工程 -->
-    <view class="project-list-container">
+    <!-- 在用分包 -->
+    <NavBarModal navBarTitle="在用分包">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="project-list-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
-            <view class="search-wrapper">
+            <view class="search-header">
+                <view class="search-wrapper">
+                    <up-input
+                        clearable
+                        ref="inputRef"
+                        class="search-name"
+                        v-model="queryParams.subName"
+                        placeholder="输入分包名称"
+                    >
+                        <template #suffix>
+                            <up-icon :name="searchIcon" size="26" @tap="onSearchName" />
+                        </template>
+                    </up-input>
+                </view>
+            </view>
+            <view v-if="isAdvancedOpen" class="advanced-search">
                 <up-input
                     clearable
-                    ref="inputRef"
                     class="search-name"
                     v-model="queryParams.proName"
-                    placeholder="输入分包名称"
-                >
-                    <template #suffix>
-                        <up-icon name="search" size="24" color="#909399" @tap="onSearchName" />
-                    </template>
-                </up-input>
+                    placeholder="输入工程名称"
+                />
+                <up-input
+                    clearable
+                    class="search-name"
+                    v-model="queryParams.subCompanyName"
+                    placeholder="输入分公司名称"
+                />
+            </view>
+            <view class="data-summary">
+                <text> 已查询 {{ total }} 条数据 </text>
+
+                <up-icon
+                    size="28"
+                    @tap="toggleAdvanced"
+                    style="transform: rotate(270deg)"
+                    :name="isAdvancedOpen ? closeIcon : openIcon"
+                />
             </view>
-            <view class="data-summary">已查询 {{ total }} 条数据</view>
         </view>
 
         <scroll-view scroll-y class="project-list-content" @scrolltolower="onHandleScrollToLower">
@@ -74,7 +104,11 @@ import { ref, computed, onMounted } from 'vue'
 import { getHomeIndexUseSubMsgAPI } from '@/services/home-index.js'
 import { onLoad } from '@dcloudio/uni-app'
 import Empty from '@/static/image/Empty.png'
-
+import searchIcon from '@/static/image/home/search.png'
+import openIcon from '@/static/image/home/open.png'
+import closeIcon from '@/static/image/home/close.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const inputRef = ref(null) // 输入框
 const projectList = ref([]) // 工程列表
 const total = ref(0) // 总条数
@@ -88,9 +122,17 @@ const queryParams = ref({
     pageSize: 10,
     proId: '', //标段工程ID
     mainProId: '', // 总工程ID
+    subName: '', // 分包名称
     proName: '', // 工程名称
+    subCompanyName: '', // 分公司名称
 })
 
+const isAdvancedOpen = ref(false) // 是否展开高级筛选
+
+const toggleAdvanced = () => {
+    isAdvancedOpen.value = !isAdvancedOpen.value
+}
+
 // 工程信息行列表
 const rowList = ref([
     {
@@ -207,6 +249,13 @@ onLoad((options) => {
     queryParams.value.mainProId = options?.mainProId
     getUseSubProjectListFun()
 })
+
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
 </script>
 
 <style scoped lang="scss">
@@ -226,25 +275,39 @@ onLoad((options) => {
     border-radius: 10rpx;
     border: 1px solid #e5e5e5;
     box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.08);
+    box-sizing: border-box;
 
-    .search-wrapper {
-        display: flex;
-        align-items: center;
+    // .search-header {
+    //     display: flex;
+    //     align-items: center;
+
+    //     .search-wrapper {
+    //         width: 85%;
+    //         // flex: 1;
+    //     }
+
+    //     .search-actions {
+    //         display: flex;
+    //         align-items: center;
+    //         justify-content: center;
+    //         flex: 1;
+    //     }
+    // }
+
+    .advanced-search {
+        margin-top: 20rpx;
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
         gap: 20rpx;
-
-        .search-name {
-            flex: 1;
-        }
-
-        .filter-icon {
-            padding: 10rpx;
-        }
     }
 
     .data-summary {
         margin-top: 20rpx;
         font-size: 24rpx;
         color: #4ca4fe;
+        display: flex;
+        align-items: center;
+        gap: 20rpx;
     }
 }
 
diff --git a/src/pages/home/child-pages/useTeam/index.vue b/src/pages/home/child-pages/useTeam/index.vue
index 04555bc..8ed0788 100644
--- a/src/pages/home/child-pages/useTeam/index.vue
+++ b/src/pages/home/child-pages/useTeam/index.vue
@@ -1,6 +1,11 @@
 <template>
     <!-- 在用班组 -->
-    <view class="project-list-container">
+    <NavBarModal navBarTitle="在用班组">
+        <template #right>
+            <up-icon name="home-fill" size="22" color="#007aff" @tap="onHandleHome" />
+        </template>
+    </NavBarModal>
+    <view class="project-list-container" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view class="search-wrapper">
                 <up-input
@@ -75,7 +80,8 @@ import { ref, computed, onMounted } from 'vue'
 import { getHomeIndexUseTeamMsgAPI } from '@/services/home-index.js'
 import { onLoad } from '@dcloudio/uni-app'
 import Empty from '@/static/image/Empty.png'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const inputRef = ref(null) // 输入框
 const projectList = ref([]) // 班组列表
 const total = ref(0) // 总条数
@@ -194,6 +200,13 @@ onLoad((options) => {
     queryParams.value.subId = options?.subId
     getAllProjectListFun()
 })
+
+// 首页按钮
+const onHandleHome = () => {
+    uni.switchTab({
+        url: '/pages/home/index',
+    })
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/machine-setting/components/bindSetting.vue b/src/pages/machine-setting/components/bindSetting.vue
index e33179e..7236d11 100644
--- a/src/pages/machine-setting/components/bindSetting.vue
+++ b/src/pages/machine-setting/components/bindSetting.vue
@@ -1,7 +1,11 @@
 <template>
     <view>
         <!-- 绑定设置 -->
-        <view class="bind-setting-container">
+        <NavBarModal navBarTitle="绑定设置" />
+        <view
+            class="bind-setting-container"
+            :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }"
+        >
             <!-- 通讯编码 -->
             <view class="form-item">
                 <text class="label-text">考勤机编码</text>
@@ -77,6 +81,8 @@
 
 <script setup name="bindSetting">
 import { ref, onMounted } from 'vue'
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 import {
     getSubcontractorListAPI,
     getSubTeamContractListAPI,
diff --git a/src/pages/machine-setting/index.vue b/src/pages/machine-setting/index.vue
index 3650911..d3f9986 100644
--- a/src/pages/machine-setting/index.vue
+++ b/src/pages/machine-setting/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 考勤机设置 -->
-    <view class="machine-setting">
+    <NavBarModal navBarTitle="考勤机设置" />
+    <view class="machine-setting" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <up-input
                 clearable
@@ -77,7 +78,8 @@ import { debounce } from 'lodash-es'
 import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
 import { getMachineListAPI } from '@/services/machine-setting.js'
 import { useCommonStore } from '@/stores'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 import Empty from '@/static/image/Empty.png'
 
 const inputRef = ref(null) // 输入框
diff --git a/src/pages/my/edit-password/index.vue b/src/pages/my/edit-password/index.vue
index bd15398..ba23d65 100644
--- a/src/pages/my/edit-password/index.vue
+++ b/src/pages/my/edit-password/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 修改密码页面 -->
-    <view class="edit-password">
+    <NavBarModal navBarTitle="修改密码" />
+    <view class="edit-password" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <up-steps :current="currenSteps">
             <up-steps-item title="验证账号"> </up-steps-item>
             <up-steps-item title="设置密码"></up-steps-item>
@@ -125,7 +126,9 @@
 import { nextTick, ref, onMounted } from 'vue'
 import { useMemberStore } from '@/stores'
 import { checkPasswordApi, editPasswordApi } from '@/services/my.js'
+import NavBarModal from '@/components/NavBarModal/index.vue'
 
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const memberStore = useMemberStore() // 用户信息
 const showPassword_1 = ref(false) // 密码是否显示
 const showPassword_2 = ref(false) // 密码是否显示
diff --git a/src/pages/person-check/aptitude-query/index.vue b/src/pages/person-check/aptitude-query/index.vue
index 9e55dc0..e80eee1 100644
--- a/src/pages/person-check/aptitude-query/index.vue
+++ b/src/pages/person-check/aptitude-query/index.vue
@@ -1,6 +1,10 @@
 <template>
     <!-- 人员资质查询 -->
-    <view class="aptitude-query app-container">
+    <NavBarModal navBarTitle="人员资质查询" />
+    <view
+        class="aptitude-query app-container"
+        :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }"
+    >
         <!-- <view class="taps-container">
             <view :class="{ active: activeName === '姓名' }" @tap="activeName = '姓名'">
                 姓名
@@ -70,7 +74,8 @@ import { getAttendanceRecordAPI } from '@/services/attendance.js'
 import { useCommonStore } from '@/stores'
 import { debounce } from 'lodash-es'
 import Empty from '@/static/image/Empty.png'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const personList = ref([])
 const total = ref(0)
 const commonStore = useCommonStore() // 工程信息
diff --git a/src/pages/person-check/index.vue b/src/pages/person-check/index.vue
index 70a8a8b..a4470a1 100644
--- a/src/pages/person-check/index.vue
+++ b/src/pages/person-check/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 人员资质查询 -->
-    <view class="person-check">
+    <NavBarModal navBarTitle="人员资质查询" />
+    <view class="person-check" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="person-check-item">
             <view @tap="onFaceRecognition">
                 <up-image width="60px" height="60px" :src="FaceIcon" />
@@ -28,7 +29,8 @@
 import { ref } from 'vue'
 import FaceIcon from '@/static/image/face.png'
 import CheckIcon from '@/static/image/person-qua.png'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const showLoading = ref(false) // 是否显示加载中
 
 const onFaceRecognition = () => {
diff --git a/src/pages/person-details/index.vue b/src/pages/person-details/index.vue
index 12fb973..59abbc7 100644
--- a/src/pages/person-details/index.vue
+++ b/src/pages/person-details/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 人员详情 -->
-    <view class="person-details">
+    <NavBarModal navBarTitle="人员详情" />
+    <view class="person-details" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <TitleTipModal TitleTip="基本信息" />
         <view class="person-info">
             <view class="person-info-left">
@@ -141,7 +142,8 @@ import YellowLight from '@/static/image/person/yellow_light.png'
 import { getPersonDetailsByIdAPI, getPersonContractAndWageCardAPI } from '@/services/attendance.js'
 import { onLoad } from '@dcloudio/uni-app'
 import dayjs from 'dayjs'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const statusName = ref('黄灯')
 const redLightShow = ref(false)
 const todayAttTime = ref(null)
@@ -308,7 +310,7 @@ onLoad((options) => {
 .status-light {
     position: absolute;
     right: 20rpx;
-    top: 140rpx;
+    top: 220rpx;
     border-radius: 50%;
 }
 
diff --git a/src/pages/person-entry/child-pages/addAndEditPerson.vue b/src/pages/person-entry/child-pages/addAndEditPerson.vue
index c01eedd..2327202 100644
--- a/src/pages/person-entry/child-pages/addAndEditPerson.vue
+++ b/src/pages/person-entry/child-pages/addAndEditPerson.vue
@@ -99,7 +99,7 @@ const navBarTitle = ref('新增人员信息')
 const currentStep = ref(0) // 当前步骤
 const nextBtnRef = ref(null) // 下一步按钮ref
 const nextBtnHeight = ref(0) // 下一步按钮高度
-const paddingTop = ref(46) // 顶部padding
+const paddingTop = ref(54) // 顶部padding
 const personIdCardFormRef = ref(null) // 身份证信息表单ref
 const personKeyInfoFormRef = ref(null) // 关键信息表单ref
 const personContractFormRef = ref(null) // 合同见证表单ref
@@ -151,29 +151,36 @@ const contractImageList = ref([
         name: 'contract',
         title: '人员手持合同照',
     },
+    // {
+    //     type: 2,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '工作内容页',
+    // },
+    // {
+    //     type: 3,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '薪酬约定页',
+    // },
+    // {
+    //     type: 4,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '本人签名页',
+    // },
+    // {
+    //     type: 5,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '其他照片',
+    // },
+
     {
-        type: 2,
+        type: 6,
         fileList: [],
         name: 'contract',
-        title: '工作内容页',
-    },
-    {
-        type: 3,
-        fileList: [],
-        name: 'contract',
-        title: '薪酬约定页',
-    },
-    {
-        type: 4,
-        fileList: [],
-        name: 'contract',
-        title: '本人签名页',
-    },
-    {
-        type: 5,
-        fileList: [],
-        name: 'contract',
-        title: '其他照片',
+        title: '附件',
     },
 ]) // 合同图片
 const contractStatus = ref('') // 合同状态
diff --git a/src/pages/person-entry/child-pages/editPerson.vue b/src/pages/person-entry/child-pages/editPerson.vue
index e27e7ce..0196c58 100644
--- a/src/pages/person-entry/child-pages/editPerson.vue
+++ b/src/pages/person-entry/child-pages/editPerson.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 修改人员信息 -->
-    <view class="aptitude-query">
+    <NavBarModal navBarTitle="修改人员信息" />
+    <view class="aptitude-query" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-container">
             <up-search
                 bgColor="#fff"
@@ -65,7 +66,8 @@ import { getPersonListAPI } from '@/services/person-entry'
 import { useCommonStore } from '@/stores'
 
 import Empty from '@/static/image/Empty.png'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const commonStore = useCommonStore() // 工程信息
 const personList = ref([]) // 人员列表
 const total = ref(0) // 总条数
diff --git a/src/pages/person-entry/child-pages/projectSetting.vue b/src/pages/person-entry/child-pages/projectSetting.vue
index b4c3a5f..0ab5262 100644
--- a/src/pages/person-entry/child-pages/projectSetting.vue
+++ b/src/pages/person-entry/child-pages/projectSetting.vue
@@ -1,55 +1,54 @@
 <template>
     <!-- 上海人员多工程设置 -->
-    <view>
-        <view
-            class="project-setting-container"
-            :style="{
-                paddingTop: safeAreaInsets?.top + paddingTop + 'px',
-            }"
-        >
-            <!-- 身份证号码输入 -->
-            <view class="input-section">
-                <view class="input-label">身份证号码:</view>
-                <up-input
-                    v-model="idCardNumber"
-                    placeholder="输入身份证号码"
-                    :clearable="true"
-                    :maxlength="18"
-                    class="id-card-input"
-                />
-            </view>
-
-            <!-- 设置说明 -->
-            <view class="instruction-section">
-                <view class="instruction-title">上海人员多工程设置说明:</view>
-                <view class="instruction-list">
-                    <view class="instruction-item"> 1.请确保该人员已经入场一个上海工程 </view>
-                    <view class="instruction-item">
-                        2.每个工程,人员只能存在一条在场数据,即一个工程只能入场一次
-                    </view>
-                    <view class="instruction-item">
-                        3.如需出场,请至
-                        <text class="instruction-link" @tap="onHandlePersonExit">【人员出场】</text>
-                        模块进行单个工程出场操作
-                    </view>
-                </view>
-            </view>
-
-            <!-- 下一步按钮 -->
-            <view class="next-btn">
-                <up-button type="primary" text="下一步" @tap="onHandleNext" />
-            </view>
-
-            <up-loading-icon
-                :vertical="true"
-                duration="2000"
-                color="#3c9cff"
-                :show="showLoading"
-                textColor="#3c9cff"
-                text="正在处理，请稍后..."
-                style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
+    <NavBarModal navBarTitle="上海人员多工程设置" />
+    <view
+        class="project-setting-container"
+        :style="{
+            paddingTop: safeAreaInsets?.top + paddingTop + 'px',
+        }"
+    >
+        <!-- 身份证号码输入 -->
+        <view class="input-section">
+            <view class="input-label">身份证号码:</view>
+            <up-input
+                v-model="idCardNumber"
+                placeholder="输入身份证号码"
+                :clearable="true"
+                :maxlength="18"
+                class="id-card-input"
             />
         </view>
+
+        <!-- 设置说明 -->
+        <view class="instruction-section">
+            <view class="instruction-title">上海人员多工程设置说明:</view>
+            <view class="instruction-list">
+                <view class="instruction-item"> 1.请确保该人员已经入场一个上海工程 </view>
+                <view class="instruction-item">
+                    2.每个工程,人员只能存在一条在场数据,即一个工程只能入场一次
+                </view>
+                <view class="instruction-item">
+                    3.如需出场,请至
+                    <text class="instruction-link" @tap="onHandlePersonExit">【人员出场】</text>
+                    模块进行单个工程出场操作
+                </view>
+            </view>
+        </view>
+
+        <!-- 下一步按钮 -->
+        <view class="next-btn">
+            <up-button type="primary" text="下一步" @tap="onHandleNext" />
+        </view>
+
+        <up-loading-icon
+            :vertical="true"
+            duration="2000"
+            color="#3c9cff"
+            :show="showLoading"
+            textColor="#3c9cff"
+            text="正在处理，请稍后..."
+            style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
+        />
     </view>
 </template>
 
@@ -60,7 +59,7 @@ import { getShProjectSettingByIdNumberAPI } from '@/services/shProjectSetting'
 
 const { safeAreaInsets } = uni.getSystemInfoSync()
 const navBarTitle = ref('上海人员多工程设置')
-const paddingTop = ref(10) // 顶部padding
+const paddingTop = ref(54) // 顶部padding
 const idCardNumber = ref('') // 身份证号码
 const showLoading = ref(false) // 是否显示加载中
 
diff --git a/src/pages/person-entry/index.vue b/src/pages/person-entry/index.vue
index 244bae2..709225e 100644
--- a/src/pages/person-entry/index.vue
+++ b/src/pages/person-entry/index.vue
@@ -1,28 +1,32 @@
 <template>
     <!-- 人员入场 -->
-    <view
-        :key="item.name"
-        class="person-handle"
-        v-for="item in handleList"
-        @tap="handleTapPersonEntry(item)"
-        :style="{
-            background: `linear-gradient(to bottom, ${item.bgc_color_1}, ${item.bgc_color_2})`,
-        }"
-    >
-        <image :src="item.icon" mode="widthFix" class="icon-img" />
-        <view>
-            <view>{{ item.title }}</view>
-        </view>
+    <NavBarModal navBarTitle="人员入场" />
 
-        <up-loading-icon
-            :vertical="true"
-            duration="2000"
-            color="#3c9cff"
-            :show="showLoading"
-            textColor="#3c9cff"
-            text="正在识别中，请稍后..."
-            style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
-        />
+    <view :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
+        <view
+            :key="item.name"
+            class="person-handle"
+            v-for="item in handleList"
+            @tap="handleTapPersonEntry(item)"
+            :style="{
+                background: `linear-gradient(to bottom, ${item.bgc_color_1}, ${item.bgc_color_2})`,
+            }"
+        >
+            <image :src="item.icon" mode="widthFix" class="icon-img" />
+            <view>
+                <view>{{ item.title }}</view>
+            </view>
+
+            <up-loading-icon
+                :vertical="true"
+                duration="2000"
+                color="#3c9cff"
+                :show="showLoading"
+                textColor="#3c9cff"
+                text="正在识别中，请稍后..."
+                style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
+            />
+        </view>
     </view>
 </template>
 
@@ -31,10 +35,11 @@ import AddIcon from '@/static/image/person/add.png'
 import EditIcon from '@/static/image/person/edit.png'
 import FaceIcon from '@/static/image/person/face.png'
 import ProSettingIcon from '@/static/image/person/pro_setting.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
 import { ref } from 'vue'
 
 const showLoading = ref(false) // 是否显示加载中
-
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const handleList = [
     {
         name: 'add',
diff --git a/src/pages/person-exit/data-upload/index.vue b/src/pages/person-exit/data-upload/index.vue
index 2f33e6f..739659e 100644
--- a/src/pages/person-exit/data-upload/index.vue
+++ b/src/pages/person-exit/data-upload/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 人员出场资料上传 -->
-    <view class="data-upload">
+    <NavBarModal navBarTitle="人员出场资料上传" />
+    <view class="data-upload" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="exit-tip">
             <view class="red-text exit-tip-item">1. 出场前请确保人员合同及工资卡已上传完整</view>
             <view class="red-text exit-tip-item">2. 人员出场，合同自动失效，不再考勤打卡</view>
@@ -81,7 +82,8 @@ import { useCommonStore } from '@/stores'
 import { onLoad } from '@dcloudio/uni-app'
 import { editPersonEntryExitApi } from '@/services/person-entry.js'
 import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm.js'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const commonStore = useCommonStore()
 const exitParams = ref({}) // 出场参数
 const fileList = ref([]) // 离场工资结算确认单
diff --git a/src/pages/person-exit/index.vue b/src/pages/person-exit/index.vue
index f21e9d3..827b2c2 100644
--- a/src/pages/person-exit/index.vue
+++ b/src/pages/person-exit/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 人员出场 -->
-    <view class="person-exit">
+    <NavBarModal navBarTitle="人员出场" />
+    <view class="person-exit" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view class="search-content">
             <view style="width: 28%; margin-right: 12rpx">
                 <up-select
@@ -105,7 +106,9 @@ import { getPersonExitListAPI } from '@/services/person-exit.js'
 import { useCommonStore } from '@/stores'
 
 import Empty from '@/static/image/Empty.png'
+import NavBarModal from '@/components/NavBarModal/index.vue'
 
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const inputRef = ref(null)
 const selectHeight = ref(0) // 选择框高度
 const personExitList = ref([]) // 出场人员列表
diff --git a/src/pages/shProjectDetails/child-pages/addProject.vue b/src/pages/shProjectDetails/child-pages/addProject.vue
index 5889530..80de276 100644
--- a/src/pages/shProjectDetails/child-pages/addProject.vue
+++ b/src/pages/shProjectDetails/child-pages/addProject.vue
@@ -1,154 +1,155 @@
 <template>
     <!-- 添加入场数据 -->
-    <view>
-        <view
-            class="add-project-container"
-            :style="{
-                paddingBottom: nextBtnHeight + 'px',
-                paddingTop: safeAreaInsets?.top + paddingTop + 'px',
-            }"
-        >
-            <!-- 提示信息 -->
-            <view class="instruction-section">
-                <text class="instruction-text">
-                    提交后,系统自动生成一条入场数据,该人员基础信息、合同信息、工资卡信息共用
-                </text>
-            </view>
-
-            <!-- 表单区域 -->
-            <view class="form-container">
-                <up-form
-                    labelWidth="120"
-                    labelPosition="left"
-                    :model="formData"
-                    :rules="formRules"
-                    ref="formRef"
-                >
-                    <!-- 姓名 -->
-                    <up-form-item label="姓名" prop="name" :borderBottom="true">
-                        <up-input
-                            v-model="formData.name"
-                            placeholder="请输入姓名"
-                            :clearable="false"
-                            :disabled="true"
-                        />
-                    </up-form-item>
-
-                    <!-- 身份证号 -->
-                    <up-form-item label="身份证号" prop="idNumber" :borderBottom="true">
-                        <up-input
-                            v-model="formData.idNumber"
-                            placeholder="请输入身份证号"
-                            :clearable="false"
-                            :disabled="true"
-                        />
-                    </up-form-item>
-
-                    <!-- 工种 -->
-                    <up-form-item label="工种" prop="postName" :borderBottom="true">
-                        <up-cell
-                            isLink
-                            size="large"
-                            style="width: 100%"
-                            @tap="onOpenPicker(1)"
-                            :border="false"
-                        >
-                            <template #icon>
-                                <text
-                                    :class="{ 'color-text': formData.postName }"
-                                    class="time-text"
-                                >
-                                    {{ formData.postName || '选择选项' }}
-                                </text>
-                            </template>
-                        </up-cell>
-                    </up-form-item>
-
-                    <!-- 入场工程 -->
-                    <up-form-item label="入场工程" prop="proName" :borderBottom="true">
-                        <up-cell
-                            isLink
-                            size="large"
-                            style="width: 100%"
-                            @tap="onOpenPicker(2)"
-                            :border="false"
-                        >
-                            <template #icon>
-                                <text :class="{ 'color-text': formData.proName }" class="time-text">
-                                    {{ formData.proName || '选择选项' }}
-                                </text>
-                            </template>
-                        </up-cell>
-                    </up-form-item>
-
-                    <!-- 入场分包 -->
-                    <up-form-item label="入场分包" prop="subName" :borderBottom="true">
-                        <up-cell
-                            isLink
-                            size="large"
-                            style="width: 100%"
-                            @tap="onOpenPicker(3)"
-                            :border="false"
-                        >
-                            <template #icon>
-                                <text :class="{ 'color-text': formData.subName }" class="time-text">
-                                    {{ formData.subName || '选择选项' }}
-                                </text>
-                            </template>
-                        </up-cell>
-                    </up-form-item>
-
-                    <!-- 入场班组 -->
-                    <up-form-item label="入场班组" prop="teamName" :borderBottom="true">
-                        <up-cell
-                            isLink
-                            size="large"
-                            style="width: 100%"
-                            @tap="onOpenPicker(4)"
-                            :border="false"
-                        >
-                            <template #icon>
-                                <text
-                                    :class="{ 'color-text': formData.teamName }"
-                                    class="time-text"
-                                >
-                                    {{ formData.teamName || '选择选项' }}
-                                </text>
-                            </template>
-                        </up-cell>
-                    </up-form-item>
-                </up-form>
-            </view>
-
-            <!-- 底部按钮 -->
-            <view class="next-btn" ref="nextBtnRef">
-                <up-button
-                    color="#909399"
-                    text="取消"
-                    @tap="onHandleCancel"
-                    style="margin-right: 10px"
-                />
-                <up-button
-                    type="primary"
-                    text="提交"
-                    @tap="onHandleSubmit"
-                    style="margin-right: 10px"
-                />
-                <up-button color="#67c23a" text="提交并继续添加" @tap="onHandleSubmitAndContinue" />
-            </view>
-
-            <!-- 加载中 -->
-            <up-loading-icon
-                :vertical="true"
-                duration="2000"
-                color="#3c9cff"
-                :show="showLoading"
-                textColor="#3c9cff"
-                text="数据正在提交，请稍后..."
-                style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
-            />
+    <NavBarModal navBarTitle="新增入场工程" />
+    <view
+        class="add-project-container"
+        :style="{
+            paddingBottom: nextBtnHeight + 'px',
+            paddingTop: safeAreaInsets?.top + 54 + 'px',
+        }"
+    >
+        <!-- 提示信息 -->
+        <view class="instruction-section">
+            <text class="instruction-text">
+                提交后,系统自动生成一条入场数据,该人员基础信息、合同信息、工资卡信息共用
+            </text>
         </view>
 
+        <!-- 表单区域 -->
+        <scroll-view scroll-y class="form-container">
+            <TitleTipModal TitleTip="基本信息" style="margin-top: 20rpx" />
+            <up-form
+                labelWidth="120"
+                labelPosition="left"
+                :model="formData"
+                :rules="formRules"
+                ref="formRef"
+            >
+                <!-- 姓名 -->
+                <up-form-item label="姓名" prop="name" :borderBottom="true">
+                    <up-input
+                        v-model="formData.name"
+                        placeholder="请输入姓名"
+                        :clearable="false"
+                        :disabled="true"
+                    />
+                </up-form-item>
+
+                <!-- 身份证号 -->
+                <up-form-item label="身份证号" prop="idNumber" :borderBottom="true">
+                    <up-input
+                        v-model="formData.idNumber"
+                        placeholder="请输入身份证号"
+                        :clearable="false"
+                        :disabled="true"
+                    />
+                </up-form-item>
+
+                <!-- 工种 -->
+                <up-form-item label="工种" prop="postName" :borderBottom="true">
+                    <up-cell
+                        isLink
+                        size="large"
+                        style="width: 100%"
+                        @tap="onOpenPicker(1)"
+                        :border="false"
+                    >
+                        <template #icon>
+                            <text :class="{ 'color-text': formData.postName }" class="time-text">
+                                {{ formData.postName || '选择选项' }}
+                            </text>
+                        </template>
+                    </up-cell>
+                </up-form-item>
+
+                <!-- 入场工程 -->
+                <up-form-item label="入场工程" prop="proName" :borderBottom="true">
+                    <up-cell
+                        isLink
+                        size="large"
+                        style="width: 100%"
+                        @tap="onOpenPicker(2)"
+                        :border="false"
+                    >
+                        <template #icon>
+                            <text :class="{ 'color-text': formData.proName }" class="time-text">
+                                {{ formData.proName || '选择选项' }}
+                            </text>
+                        </template>
+                    </up-cell>
+                </up-form-item>
+
+                <!-- 入场分包 -->
+                <up-form-item label="入场分包" prop="subName" :borderBottom="true">
+                    <up-cell
+                        isLink
+                        size="large"
+                        style="width: 100%"
+                        @tap="onOpenPicker(3)"
+                        :border="false"
+                    >
+                        <template #icon>
+                            <text :class="{ 'color-text': formData.subName }" class="time-text">
+                                {{ formData.subName || '选择选项' }}
+                            </text>
+                        </template>
+                    </up-cell>
+                </up-form-item>
+
+                <!-- 入场班组 -->
+                <up-form-item label="入场班组" prop="teamName" :borderBottom="true">
+                    <up-cell
+                        isLink
+                        size="large"
+                        style="width: 100%"
+                        @tap="onOpenPicker(4)"
+                        :border="false"
+                    >
+                        <template #icon>
+                            <text :class="{ 'color-text': formData.teamName }" class="time-text">
+                                {{ formData.teamName || '选择选项' }}
+                            </text>
+                        </template>
+                    </up-cell>
+                </up-form-item>
+            </up-form>
+            <TitleTipModal TitleTip="合同见证" style="margin-top: 20rpx" />
+            <ContractForm
+                :isShowBottomAndTop="false"
+                ref="personContractFormRef"
+                :contractInfo="contractInfo"
+                :contractImageList="contractImageList"
+            />
+        </scroll-view>
+
+        <!-- 底部按钮 -->
+        <view class="next-btn" ref="nextBtnRef">
+            <up-button
+                color="#909399"
+                text="取消"
+                @tap="onHandleCancel"
+                style="margin-right: 10px"
+            />
+            <up-button
+                type="primary"
+                text="提交"
+                @tap="onHandleSubmit"
+                style="margin-right: 10px"
+            />
+            <up-button color="#67c23a" text="提交并继续添加" @tap="onHandleSubmitAndContinue" />
+        </view>
+
+        <!-- 加载中 -->
+        <up-loading-icon
+            :vertical="true"
+            duration="2000"
+            color="#3c9cff"
+            :show="showLoading"
+            textColor="#3c9cff"
+            text="数据正在提交，请稍后..."
+            style="position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%)"
+        />
+
         <!-- 工种选择器 -->
         <up-picker
             :show="postPickerShow"
@@ -195,6 +196,8 @@
 import { ref, onMounted, nextTick } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import NavBarModal from '@/components/NavBarModal/index.vue'
+import ContractForm from '@/components/ContractForm/index.vue'
+import TitleTipModal from '@/components/TitleTipModal/index'
 import {
     getPostTypeSelectListAPI,
     getSubSelectListByConditionAPI,
@@ -211,6 +214,7 @@ const nextBtnHeight = ref(0) // 下一步按钮高度
 const formRef = ref(null) // 表单ref
 const showLoading = ref(false) // 是否显示加载中
 const workerId = ref('') // 人员ID
+const personContractFormRef = ref(null) // 合同见证表单ref
 
 // 表单数据
 const formData = ref({
@@ -226,6 +230,39 @@ const formData = ref({
     postId: '',
     id: '',
 })
+const contractInfo = ref({}) // 合同信息
+const contractImageList = ref([
+    {
+        type: 1,
+        fileList: [],
+        name: 'contract',
+        title: '人员手持合同照',
+    },
+    // {
+    //     type: 2,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '工作内容页',
+    // },
+    // {
+    //     type: 3,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '薪酬约定页',
+    // },
+    // {
+    //     type: 4,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '本人签名页',
+    // },
+    // {
+    //     type: 5,
+    //     fileList: [],
+    //     name: 'contract',
+    //     title: '其他照片',
+    // },
+]) // 合同图片
 
 // 表单验证规则
 const formRules = ref({
@@ -387,7 +424,13 @@ const submitData = async (isContinue) => {
         if (!valid) {
             return
         }
+        const res = await personContractFormRef.value.validateContractForm()
+        if (res.isValid) {
+            console.log(res, 'res校验通过')
+            return
+        }
 
+        console.log(res, 'res校验失败')
         showLoading.value = true
         // TODO: 这里需要调用实际的API提交数据
         const result = await addShProjectEntryAPI(formData.value)
@@ -419,8 +462,9 @@ const submitData = async (isContinue) => {
             }
         }
     } catch (error) {
+        console.log(error, 'error---')
         showLoading.value = false
-        uni.$u.toast('提交失败，请重试')
+        uni.$u.toast(error?.msg || '提交失败，请完善基本信息！')
     }
 }
 
@@ -544,6 +588,8 @@ onLoad((options) => {
 .add-project-container {
     height: 100%;
     display: flex;
+    padding: 20rpx;
+    box-sizing: border-box;
     flex-direction: column;
     background-color: #fff;
 }
@@ -552,7 +598,6 @@ onLoad((options) => {
     padding: 20rpx 30rpx;
     background-color: #fff2f0;
     border-left: 6rpx solid #ff4d4f;
-    margin: 0 30rpx 0;
 
     .instruction-text {
         color: #ff4d4f;
@@ -563,8 +608,9 @@ onLoad((options) => {
 
 .form-container {
     flex: 1;
-    margin-top: 20rpx;
+    // margin-top: 20rpx;
     overflow-y: auto;
+    // background-color: skyblue;
 }
 
 .next-btn {
diff --git a/src/pages/shProjectDetails/index.vue b/src/pages/shProjectDetails/index.vue
index 24f69d4..ea0ab3e 100644
--- a/src/pages/shProjectDetails/index.vue
+++ b/src/pages/shProjectDetails/index.vue
@@ -1,6 +1,7 @@
 <template>
     <!-- 上海多工程设置明细 -->
-    <view class="person-exit">
+    <NavBarModal navBarTitle="上海多工程设置" />
+    <view class="person-exit" :style="{ paddingTop: safeAreaInsets?.top + 54 + 'px' }">
         <view style="margin: 20rpx 0">
             <up-button type="primary" text="新增入场工程" @tap="onHandleAddProject" />
         </view>
@@ -58,7 +59,8 @@ import { useCommonStore } from '@/stores'
 
 import Empty from '@/static/image/Empty.png'
 import { onLoad } from '@dcloudio/uni-app'
-
+import NavBarModal from '@/components/NavBarModal/index.vue'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const shProjectList = ref([]) // 出场人员列表
 const total = ref(0) // 总条数
 const commonStore = useCommonStore() // 工程信息
diff --git a/src/static/image/home/close.png b/src/static/image/home/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..311557eef42f7ca409305e0c7bf958de18a1a417
GIT binary patch
literal 3526
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
At^fc4

literal 0
HcmV?d00001

diff --git a/src/static/image/home/open.png b/src/static/image/home/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bba0ab6cd5a7cc700f3c052ce7394f11b5cd40d
GIT binary patch
literal 3436
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
UW-rUj(&!36H?=aUqB7Y319Ugv5C8xG

literal 0
HcmV?d00001

diff --git a/src/static/image/home/search.png b/src/static/image/home/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..726cedeef7047f71a96ca1dcecbac84253e2ec39
GIT binary patch
literal 11398
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
UkX*2kSO5S307*qoM6N<$g0ANMJ^%m!

literal 0
HcmV?d00001