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