From 28c1b20d7df0cb66706d6684d39da32d85c99007 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Thu, 14 Dec 2023 14:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/OrderDetail/components/fomItem.vue | 8 +++++---
 pages/OrderDetail/index.vue              | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/OrderDetail/components/fomItem.vue b/pages/OrderDetail/components/fomItem.vue
index 8f0f2fa..a65c9cf 100644
--- a/pages/OrderDetail/components/fomItem.vue
+++ b/pages/OrderDetail/components/fomItem.vue
@@ -3,7 +3,7 @@ export default {
   name: "fomItem",
   props: {
     data: {
-      type: Object
+      type: [Object,String]
     },
     name: {
       type: String
@@ -54,9 +54,11 @@ export default {
     },
     getShowStatus(){
         if(!this.isShow){
-          if(this.type === 'media' || this.type === 'text'){
+          if(this.type === 'media'){
             return (Object.keys(this.data).length>0);
-          }else{
+          }else if(this.type === 'text'){
+            return this.data?.length > 0;
+          } else{
             return (this.data.value || this.data.option || this.data.remark || (typeof this.data.upload === 'object' && Object.keys(this.data.upload).length > 0))
           }
         }else {
diff --git a/pages/OrderDetail/index.vue b/pages/OrderDetail/index.vue
index 10bbbd8..5a8e68a 100644
--- a/pages/OrderDetail/index.vue
+++ b/pages/OrderDetail/index.vue
@@ -267,7 +267,7 @@
             </template>
           </FomItem>
           <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.trash" name="垃圾携带"></FomItem>
-          <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.pet_secure" name="空调"></FomItem>
+          <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.appliance_info" name="门窗、灯、空调、水电等情况"></FomItem>
           <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.pet_secure" name="离开时萌宠安全确认"></FomItem>
           <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.close" name="普通锁"></FomItem>
           <FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" type="default" :data="service.endservice.close_mima" name="密码锁"></FomItem>
@@ -466,7 +466,8 @@
         orderDetail(id).then(data => {
             this.detail = data.data;
             if(this.detail.status>0){
-              this.getOrderServiceInfo(id);
+              //TODO
+              this.getOrderServiceInfo(266);
             }
         })
       },
@@ -524,6 +525,9 @@
           this.service.endservice.close_mima = res.data.endservice.close_mima;
           this.service.endservice.key = res.data.endservice.key;
 
+          this.service.endservice.leave = res.data.endservice.leave;
+          this.service.endservice.goOutTime = res.data.endservice.goOutTime;
+
 
 
         })