From 8a899e63502939dbf034b90ba46741e0faa9023c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 08 五月 2026 18:49:32 +0800
Subject: [PATCH] 管理端bug修改

---
 small-program/pages/delivery-order-detail/delivery-order-detail.vue |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index 68513bd..27511f8 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -17,7 +17,12 @@
 				<view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 0">鏍囬�熻揪</view>
 				<view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 1">鏋侀�熻揪</view>
 			</view>
-			<view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
+			<view class="nr-desc" v-if="info.statusDesc && info.status !== 0">{{info.statusDesc || ''}}</view>
+			<view class="nr-desc" style="display: flex; align-items: center;" v-if="info.statusDesc && info.status === 0">
+				璇峰湪
+				<u-count-down :time="info.payCountdownMs" format="mm:ss"></u-count-down>
+				鍐呭畬鎴愭敮浠橈紝瓒呮椂璁㈠崟灏嗚嚜鍔ㄥ彇娑�
+			</view>
 			<view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
 				<map 
 					name="mapAddr"
@@ -153,9 +158,13 @@
 				</view>
 				<view class="item-x"></view>
 				<view class="item-list">
-					<view class="item-list-row">
+					<!-- <view class="item-list-row">
 						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">淇濅环閲戦</view>
 						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.declaredAmount || 0)/100).toFixed(2)}}</view>
+					</view> -->
+					<view class="item-list-row">
+						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">{{ info.type === 1 ? '閰嶉�佽垂' : '瀵勫瓨璐�' }}</view>
+						<view class="item-form-val" style="color: #333333; font-size: 24rpx;">楼{{((info.basicAmount || 0)/100).toFixed(2)}}</view>
 					</view>
 					<view class="item-list-row">
 						<view class="item-form-label" style="color: #333333; font-size: 28rpx;">琛屾潕淇濊垂</view>
@@ -248,9 +257,9 @@
 		</view>
 		<view class="footer" v-if="info.type===1">
 			<view class="footer-btns">
-				<view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status ==2">鑱旂郴闂ㄥ簵</view> 
-				<view class="btn kong" @click="contactPhone(info,2)" v-if="info.status ===3 || info.status ===4 ">鑱旂郴楠戞墜</view>
-				<view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5">鑱旂郴闂ㄥ簵</view>
+				<view class="btn kong" @click="contactPhone(info,0)" v-if="(info.status ===1 || info.status ==2) && info.takeShopId">鑱旂郴闂ㄥ簵</view> 
+				<view class="btn kong" @click="contactPhone(info,2)" v-if="[3,4,5].includes(info.status) && !info.takeShopId">鑱旂郴楠戞墜</view>
+				<view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5 && info.takeShopId">鑱旂郴闂ㄥ簵</view>
 				<view class="btn kong" v-if="info.status ===0"  @click="cancelOrder(info)">鍙栨秷璁㈠崟</view>
 				<view class="btn you" @click="payOrder(info)" v-if="info.status ===0">绔嬪嵆鏀粯</view>
 				<view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">鍒犻櫎璁㈠崟</view>
@@ -747,6 +756,11 @@
 	page {
 		background-color: #F8F9FB;
 	}
+	.u-count-down__text {
+		font-weight: 400 !important;
+    	font-size: 26rpx !important;
+		color: #ffffff !important;
+	}
 </style>
 <style lang="scss" scoped>
 	.detail {

--
Gitblit v1.9.3