From 58839d0567a44029a2ca0165e7357089b8b7e1d4 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 25 Feb 2026 16:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/addjigou/all.vue            |  2 +-
 pages/addjigou/where.vue          |  1 +
 pages/addoldman/jianhurenall.vue  |  2 +-
 pages/addstaff/all.vue            |  2 +-
 pages/addsupplier/all.vue         |  4 +--
 pages/addsupplier/information.vue |  3 ++
 pages/login/workjoin.vue          |  2 +-
 pages/oldmanindex/all.vue         | 56 ++++++++++++++++++++-----------
 pages/oldmanindex/index.vue       |  2 +-
 pages/oldmanindex/paysuccess.vue  |  3 +-
 10 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue
index ddd9d50..9b18139 100644
--- a/pages/addjigou/all.vue
+++ b/pages/addjigou/all.vue
@@ -335,7 +335,7 @@
 		z-index: 2;
 		position: absolute;
 		right: 20rpx;
-		top: 15%;
+		top: 27%;
 	}
 	.container {
 		display: flex;
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index 616c9b2..f9e8974 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -355,6 +355,7 @@
 						uni.showModal({
 							title: '提示',
 							content: '当前无变更，是否提交？',
+							confirmColor:'#007CFF',
 							success: function (res) {
 								if (res.confirm) {
 									flag.value = true;
diff --git a/pages/addoldman/jianhurenall.vue b/pages/addoldman/jianhurenall.vue
index c2c36d0..0a541f4 100644
--- a/pages/addoldman/jianhurenall.vue
+++ b/pages/addoldman/jianhurenall.vue
@@ -396,6 +396,6 @@
 		z-index: 2;
 		position: absolute;
 		right: 20rpx;
-		top: 15%;
+		top: 27%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/addstaff/all.vue b/pages/addstaff/all.vue
index 5e2ac7e..996bd10 100644
--- a/pages/addstaff/all.vue
+++ b/pages/addstaff/all.vue
@@ -693,6 +693,6 @@
 		z-index: 2;
 		position: absolute;
 		right: 20rpx;
-		top: 15%;
+		top: 27%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/addsupplier/all.vue b/pages/addsupplier/all.vue
index 82188b0..b77fa78 100644
--- a/pages/addsupplier/all.vue
+++ b/pages/addsupplier/all.vue
@@ -558,7 +558,7 @@
 		.photo-font {
 			font-size: 28rpx;
 			margin-top: 10rpx;
-			color: #666;
+			color: #000;
 		}
 
 	}
@@ -658,6 +658,6 @@
 		z-index: 2;
 		position: absolute;
 		right: 20rpx;
-		top: 15%;
+		top: 27%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/addsupplier/information.vue b/pages/addsupplier/information.vue
index 4c23979..454090a 100644
--- a/pages/addsupplier/information.vue
+++ b/pages/addsupplier/information.vue
@@ -556,6 +556,7 @@
 					display: flex;
 					align-items: center;
 					font-size: 32rpx;
+					color: #000;
 				}
 
 				.content-img {
@@ -670,6 +671,7 @@
 			font-size: 30rpx;
 			z-index: 2;
 			width: 250rpx;
+			color: #000;
 		}
 
 		.one-right {
@@ -732,6 +734,7 @@
 			.photo-weight {
 				font-size: 30rpx;
 				font-weight: 600;
+				color: #000;
 			}
 
 			.photo-font {
diff --git a/pages/login/workjoin.vue b/pages/login/workjoin.vue
index dcec391..16ae52c 100644
--- a/pages/login/workjoin.vue
+++ b/pages/login/workjoin.vue
@@ -42,7 +42,7 @@
 
 									<text style="color: #999;" v-if="!item.franchiseTime"> 申请日期：</text>
 									<text v-if="!item.franchiseTime">
-										{{item.commitTime}}
+										{{item.createTime}}
 									</text>
 
 								</view>
diff --git a/pages/oldmanindex/all.vue b/pages/oldmanindex/all.vue
index c5a7127..b8aade2 100644
--- a/pages/oldmanindex/all.vue
+++ b/pages/oldmanindex/all.vue
@@ -12,25 +12,31 @@
 		
 		
 		<view :style="{height:`${uni.getStorageSync('moveHeight') + 30}px`}"></view>
+		<view style="width: 638rpx;
+					min-height: 80rpx;
+					border-radius: 10rpx;
+					display: flex;
+					justify-content: space-between;
+					margin: 30rpx auto 0;
+					padding:20rpx;
+					background: RGBA(255, 240, 240, 1);
+					border: 1px solid RGBA(247, 175, 174, 1);"
+			v-if="alldata.elderModifyStatus==3||alldata.elderModifyStatus==5">
+				<view style="width: 35rpx;height: 35rpx;border-radius: 50%;background: RGBA(237, 72, 69, 1);color: #fff;text-align: center;line-height: 35rpx;margin-right: 10rpx;">i</view>
+				<text style="color: rgba(102, 102, 102, 1); width: 70%;word-break: break-all;">
+					驳回原因：{{alldata.elderModifyContent}}
+				</text>
+				<text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text>
+		</view>
 		<view class="white-content">
 			<view class="content-title" style="margin: 20rpx 0;justify-content: space-between;">
 				<view style="display: flex;">
 					<view class="shu"></view>
 					<view class="content-weight" style="margin-top: -2rpx;">监护人信息</view>
 					<image class="shu-img"
-						:src="applyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[applyStatus-1]}.png`:``" />
-						<view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;">
-								<text v-if="alldata.elderModifyStatus==1" >待审核</text>
-								<text v-if="alldata.elderModifyStatus==2" style="color: #0089FE;">审核通过</text>
-								<text v-if="alldata.elderModifyStatus==3">审核驳回</text>
-						</view>
+						:src="alldata.elderModifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.elderModifyStatus-1]}.png`:``" />
 				</view>
 			</view>
-			
-			<view style="margin:0 auto 20rpx;width: 100%;color: red;display: flex;" v-if="alldata.elderModifyStatus==3&&alldata.guardianModifyContent">
-				<text style="color: #222;margin-left: 30rpx;width: 20%;white-space: nowrap;">驳回原因：</text>	
-				<text style="word-break: break-all; width: 73%;">{{alldata.elderModifyContent}}</text>
-			</view>
 			<view class="white-photo" @click="getMessage(headImge0)">
 				<view class="photo-left">
 					<view class="photo-weight">人像面</view>
@@ -57,27 +63,37 @@
 		</view>
 		
 		<view class="white-content">
-
+			<view style="width: 638rpx;
+						min-height: 80rpx;
+						border-radius: 10rpx;
+						display: flex;
+						justify-content: space-between;
+						margin: 30rpx auto 0;
+						padding:20rpx;
+						background: RGBA(255, 240, 240, 1);
+						border: 1px solid RGBA(247, 175, 174, 1);"
+				v-if="alldata.modifyStatus==3||alldata.modifyStatus==5">
+					<view style="width: 35rpx;height: 35rpx;border-radius: 50%;background: RGBA(237, 72, 69, 1);color: #fff;text-align: center;line-height: 35rpx;margin-right: 10rpx;">i</view>
+					<text style="color: rgba(102, 102, 102, 1); width: 70%;word-break: break-all;">
+						驳回原因：{{alldata.auditContent}}
+					</text>
+					<text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text>
+			</view>
 			<view class="content-title" style="margin: 20rpx 0;justify-content: space-between;">
 				<view style="display: flex;">
 					<view class="shu"></view>
 					<view class="content-weight" style="margin-top: -2rpx;">长者信息</view>
 					<image class="shu-img"
-						:src="applyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[applyStatus-1]}.png`:``" />
-						<view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;">
+						:src="alldata.modifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.modifyStatus-1]}.png`:``" />
+						<!-- <view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;">
 								<text v-if="alldata.modifyStatus==1" >待审核</text>
 								<text v-if="alldata.modifyStatus==2" style="color: #0089FE;">审核通过</text>
 								<text v-if="alldata.modifyStatus==3">审核驳回</text>
-						</view>
+						</view> -->
 				</view>
 			</view>
 
 		</view>
-		<view style="margin:0 auto 20rpx;width: 100%;color: red;display: flex;" v-if="alldata.modifyStatus==3&&alldata.auditContent">
-			<text style="color: #222;margin-left: 30rpx;width: 20%;white-space: nowrap;">驳回原因：</text>	
-			<text style="word-break: break-all; width: 73%;">{{alldata.auditContent}}</text>
-		</view>
-		
 
 		<view class="white-content">
 
diff --git a/pages/oldmanindex/index.vue b/pages/oldmanindex/index.vue
index a8be5ca..3b97951 100644
--- a/pages/oldmanindex/index.vue
+++ b/pages/oldmanindex/index.vue
@@ -239,7 +239,7 @@
 						<view style="display: flex;width: 100%;margin-top: 30rpx;align-items: center;">
 							<view class="blue-shu"></view>
 							<view class="blue-font">
-								绑定护理单元
+								长者入住
 							</view>
 
 						</view>
diff --git a/pages/oldmanindex/paysuccess.vue b/pages/oldmanindex/paysuccess.vue
index c0c742a..776d8bb 100644
--- a/pages/oldmanindex/paysuccess.vue
+++ b/pages/oldmanindex/paysuccess.vue
@@ -7,7 +7,8 @@
 				缴费成功
 			</view>
 			<view class="bottom-font">
-				<text style="color: #068DFF;">{{ seconds }}秒后</text>自动跳转到长者端 ...
+				<!-- <text style="color: #068DFF;">{{ seconds }}秒后</text> -->
+				自动跳转到长者端 ...
 			</view>
 		</view>