From 914fb04175c1f69d25e4a8b2b793f6cdf3b490f2 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 24 Dec 2025 17:56:13 +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/pages/work/contract/contractDetails/index.vue    | 11 ++++++++++-
 src/pages/work/contract/contractPreview/index.vue    |  2 +-
 src/pages/work/entry-management/face-photo/index.vue |  5 +++--
 src/pages/work/worker-entry-review/index.vue         |  7 ++++++-
 src/utils/httpFactory.js                             |  1 +
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/pages/work/contract/contractDetails/index.vue b/src/pages/work/contract/contractDetails/index.vue
index 100b52f..e8528bb 100644
--- a/src/pages/work/contract/contractDetails/index.vue
+++ b/src/pages/work/contract/contractDetails/index.vue
@@ -278,6 +278,13 @@
                                             mode="aspectFit"
                                             class="sign-image"
                                         />
+
+                                        <!-- <up-image
+                                            v-if="form.signaturePath"
+                                            :src="form.signaturePath"
+                                            mode="aspectFit"
+                                            class="sign-image"
+                                        /> -->
                                         <view v-else class="sign-empty-box"></view>
                                     </view>
                                     <view class="sign-buttons">
@@ -916,7 +923,9 @@ const handleGetWorkerInfo = async () => {
 
     if (photoRes !== 'is null') {
         const { signaturePhoto, facePhoto } = photoRes
-        form.value.signaturePath = import.meta.env.VITE_API_FILE_ASE_URL + signaturePhoto
+        form.value.signaturePath = signaturePhoto.startsWith('http')
+            ? signaturePhoto
+            : import.meta.env.VITE_API_FILE_ASE_URL + signaturePhoto
         form.value.signatureUrl = signaturePhoto
         form.value.faceUrl = facePhoto
     }
diff --git a/src/pages/work/contract/contractPreview/index.vue b/src/pages/work/contract/contractPreview/index.vue
index 8cb209d..c17fd0e 100644
--- a/src/pages/work/contract/contractPreview/index.vue
+++ b/src/pages/work/contract/contractPreview/index.vue
@@ -499,7 +499,7 @@ const handleSignProtocol = async (signaturePath, type) => {
         if (result.res === 1) {
             console.log(result, 'result签订协议成功')
             // 通知父页面更新附件签订状态
-            emitSigned(result.resMsg, type, params.startDate, params.endDate)
+            emitSigned(result.resMsg, type, params.startDate, params.endDate, result.obj)
             uni.$u.toast('签订协议成功')
             // 延迟返回，确保事件已发送
             setTimeout(() => {
diff --git a/src/pages/work/entry-management/face-photo/index.vue b/src/pages/work/entry-management/face-photo/index.vue
index de846f0..a79dfcd 100644
--- a/src/pages/work/entry-management/face-photo/index.vue
+++ b/src/pages/work/entry-management/face-photo/index.vue
@@ -217,8 +217,9 @@ onLoad((options) => {
             personnelInfo.value = JSON.parse(decodeURIComponent(options.personnelInfo))
             // 设置当前人脸照片
             if (personnelInfo.value.facePhoto) {
-                currentFacePhoto.value =
-                    import.meta.env.VITE_API_FILE_ASE_URL + personnelInfo.value.facePhoto
+                currentFacePhoto.value = personnelInfo.value.facePhoto.startsWith('http')
+                    ? personnelInfo.value.facePhoto
+                    : import.meta.env.VITE_API_FILE_ASE_URL + personnelInfo.value.facePhoto
 
                 console.log(currentFacePhoto.value, 'currentFacePhoto.value')
             }
diff --git a/src/pages/work/worker-entry-review/index.vue b/src/pages/work/worker-entry-review/index.vue
index 5798e64..ee1c3ea 100644
--- a/src/pages/work/worker-entry-review/index.vue
+++ b/src/pages/work/worker-entry-review/index.vue
@@ -72,7 +72,12 @@
                     {{ isViewDetail ? '审核详情' : '施工人员入场审核' }}
                 </view>
                 <scroll-view class="detail-body" scroll-y>
-                    <view v-if="isViewDetail">
+                    <view
+                        v-if="
+                            isViewDetail ||
+                            (activeTab == 0 && list.filter((item) => item.isChecked).length <= 1)
+                        "
+                    >
                         <view class="detail-row">
                             <text class="label">姓 名：</text>
                             <text class="value">{{ detail.name || '-' }}</text>
diff --git a/src/utils/httpFactory.js b/src/utils/httpFactory.js
index e36f73d..ffa3c85 100644
--- a/src/utils/httpFactory.js
+++ b/src/utils/httpFactory.js
@@ -56,6 +56,7 @@ export const createHttpClient = ({ baseURL, clientTag, tokenSelector }) => {
                 if (options.isUploadFile) {
                     if (token) {
                         options.header.Authorization = token
+                        options.header.Token = token
                     }
                     return
                 }