From 9a6d9d159878629a638b0ece7c904a21ac9a841a Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 13 Jun 2024 13:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/order_detail.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pages/order/order_detail.vue b/pages/order/order_detail.vue
index 9d23811..c1b3b97 100644
--- a/pages/order/order_detail.vue
+++ b/pages/order/order_detail.vue
@@ -5,8 +5,9 @@
 				<text class="title">
 					<text>{{listinfo.name}}</text>
 				</text>
+			
 				<text class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
-					<text>待支付</text>
+					<text> 待支付 </text>
 				</text>
 				<text class="status" v-if="listinfo.status == 'unsend'">
 					<text>待发货</text>
@@ -29,6 +30,7 @@
 				<text class="status" v-if="listinfo.status == 'merge'">
 					<text>合台</text>
 				</text>
+
 			</view>
 			<view class="tag-wrap">
 				<text class="tag" v-if="listinfo.sendType == 'post'">快递</text>
@@ -36,16 +38,22 @@
 				<text class="tag" v-if="listinfo.sendType == 'takeself'">自提</text>
 				<text class="tag" v-if="listinfo.sendType == 'table'">堂食</text>
 			</view>
-			<view class="number-wrap" v-if="listinfo.status != 'unpaid' || listinfo.status != 'paying'">
+			<view class="number-wrap" v-if="listinfo.status != 'unpaid' && listinfo.status != 'paying'">
 				<text class="t">取餐号</text>
 				<text class="number">{{listinfo.tableName}}</text>
 			</view>
 		</view>
 		<view class="card">
-			<view class="head border">
+			<view class="head border" style="position: relative;">
 				<text class="title">
 					<text>点单详情</text>
 				</text>
+				
+				<view style="display: flex;align-items: center;" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
+					<!-- <text style="font-size:24rpx;">支付时间:</text> -->
+					<uni-countdown :show-day="false" color="#ff0000" border-color="#00B26A" splitorColor="#000"
+						:font-size="14" :hour="0" :minute="12" :second="12" />
+				</view>
 			</view>
 			<view class="shop-info">
 				<view class="item" v-for="(item,index) in listinfo.details" :key="index">