From 207865f79a395bec0476f197a89e92ea43a9e304 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 13 Feb 2025 14:46:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/search/order/detail.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/search/order/detail.vue b/src/views/search/order/detail.vue
index d8d23be8..0ac5a755 100644
--- a/src/views/search/order/detail.vue
+++ b/src/views/search/order/detail.vue
@@ -131,15 +131,11 @@
                                 </span>
                                 <span v-if="orderStatus == 20">
                                     {{
-                                        momentInit(goods.takeOverTime).diff(
-                                            goods.rentOverTime,
-                                            'day',
-                                        ) == 0
+                                        isNaN(momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day'))
+                                            ? '-'
+                                            : momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day') == 0
                                             ? 1
-                                            : momentInit(goods.takeOverTime).diff(
-                                                  goods.rentOverTime,
-                                                  'day',
-                                              )
+                                            : momentInit(goods.takeOverTime).diff(goods.rentOverTime, 'day')
                                     }}{{ ' ' + '天' }}
                                 </span>
                             </el-col>
@@ -188,9 +184,8 @@
                             style="font-weight: bold; margin-top: 10px"
                             v-if="orderStatus == 20"
                         >
-                            {{ goods.takeOverTime.slice(0, 10) }}至{{
-                                goods.rentOverTime.slice(0, 10)
-                            }}
+                            {{ goods.takeOverTime ? goods.takeOverTime.slice(0, 10) : '' }}至
+                            {{ goods.rentOverTime ? goods.rentOverTime.slice(0, 10) : '' }}
                         </div>
                     </div>
                 </div>
@@ -234,7 +229,7 @@
                 <el-table-column prop="days" align="center" label="租赁天数" />
                 <el-table-column prop="days" align="center" label="租期">
                     <template #default="{ row }">
-                        {{ `${row.preOutboundTime}至${row.rentOverTime} ` }}
+                        {{ `${row.preOutboundTime}至${row.rentOverTime || ''} ` }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="costs" align="center" label="租赁费用(元)" width="160">