结束订单字段

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 {

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;
+
 
 
         })