From bf76ac361abd049aa0b2bf1fe69ae24a1e841edf Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 20 Sep 2024 19:01:33 +0800
Subject: [PATCH] uu

---
 .../buns-post-detail-templates/bpd-send-site-tmp.vue      | 8 +++++---
 pages/post/query.vue                                      | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/buns-post-detail-templates/bpd-send-site-tmp.vue b/components/buns-post-detail-templates/bpd-send-site-tmp.vue
index fce8e82..6233483 100644
--- a/components/buns-post-detail-templates/bpd-send-site-tmp.vue
+++ b/components/buns-post-detail-templates/bpd-send-site-tmp.vue
@@ -37,9 +37,11 @@
 				<u-text :text="(modelInfo.dispatchUnderlingSiteName)||'-'" size="30" :bold="true" align="center"></u-text>
 			</u-col>
 		</u-row>
-						
-		<u-text :text="`预计送达时间：${modelInfo.estimateDate || '-'}`" color="#B12D29" size="26" bold
-			margin="30rpx 0 0 0"></u-text>
+						
+		<view class="mt-30 clr-prm font-weight">
+			<text>预计送达时间：</text>
+			<text>{{modelInfo.estimateDate || '-'}}</text>
+		</view>
 	</view>				
 	
 </template>
diff --git a/pages/post/query.vue b/pages/post/query.vue
index 4c96a02..70a1452 100644
--- a/pages/post/query.vue
+++ b/pages/post/query.vue
@@ -155,10 +155,10 @@
 				}
 				// 更新缓存
 				setSessionSystemInfo({ postQueryHistory: this.historyList })
-				
-				if(resData.estimateDate){
-					resData.estimateDate = dayjs(resData.estimateDate).format('YYYY-MM-DD')
-				}
+				let estimateDate = resData.estimateDate
+				// 已签收取 签收时间
+				resData.waybillStatus == 50 && (estimateDate = resData.signDate)
+				estimateDate && (resData.estimateDate = dayjs(estimateDate).format('YYYY-MM-DD'))
 				// 通过对象合并才能修改父级 数据
 				Object.assign(this.modelInfo, resData || {})
 				// 判断是否有权限查看图片