From d1040d3622073f8134260905a55f80d60714139a Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 13 Feb 2025 14:56:38 +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

---
 .../orderManagement/components/order-details.vue     | 12 ++++--------
 .../user/orderManagement/components/order-home.vue   | 12 ++++--------
 .../orderManagementCz/components/order-details.vue   | 12 ++++--------
 .../user/orderManagementCz/components/order-home.vue | 12 ++++--------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/views/user/orderManagement/components/order-details.vue b/src/views/user/orderManagement/components/order-details.vue
index 020bd2d..bb72f5a 100644
--- a/src/views/user/orderManagement/components/order-details.vue
+++ b/src/views/user/orderManagement/components/order-details.vue
@@ -305,15 +305,11 @@ const isOrderComplete = computed(() => {
                                     </span>
                                     <span v-if="props.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>
diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue
index 5cb927a..460d332 100644
--- a/src/views/user/orderManagement/components/order-home.vue
+++ b/src/views/user/orderManagement/components/order-home.vue
@@ -671,15 +671,11 @@ const costSubmit = () => {
                                         </span>
                                         <span v-if="item.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>
 
diff --git a/src/views/user/orderManagementCz/components/order-details.vue b/src/views/user/orderManagementCz/components/order-details.vue
index 020bd2d..bb72f5a 100644
--- a/src/views/user/orderManagementCz/components/order-details.vue
+++ b/src/views/user/orderManagementCz/components/order-details.vue
@@ -305,15 +305,11 @@ const isOrderComplete = computed(() => {
                                     </span>
                                     <span v-if="props.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>
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index b451608..34328ab 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -922,15 +922,11 @@ const wordUrl = ref('')
                                         </span>
                                         <span v-if="item.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>