up

pages/order/parkorder.vue

@@ -56,7 +56,7 @@
 				}, {
 					name: '已完成',
 					idx: "2"
-				},{
+				}, {
 					name: '已过期',
 					idx: "3"
 				}],
@@ -66,7 +66,7 @@
 				statusArr: {
 					0: "已取消",
 					1: "待完成",
-					2: "已完成",
+					2: "已完成",
 					3: "已过期"
 				}
 			}
@@ -116,11 +116,26 @@
 					data: {
 						status: this.list[this.current].idx
 					},
-					utilSuccess: function(res) {
+					utilSuccess: function(res) {
+						var list= [];
 						for (var mod of res) {
 							mod.status_name = that.statusArr[mod.status];
+							if (mod.visit_order) {
+
+								mod.time = mod.visit_order.date + " " + mod.visit_order.time;
+							} else {
+								if (mod.activity_order) {
+									mod.time = that.$moment(mod.activity_order.activity.start_time).format(
+										"YYYY-MM-DD HH:mm")+"～"+that.$moment(mod.activity_order.activity.end_time).format(
+										"HH:mm");
+									//mod.time = mod.activity_order.date + " " + mod.activity_order.time;
+								}
+
+							}
+							
+							list.push(mod);
 						}
-						that.listOrder = res;
+						that.listOrder = list;
 						this.isloading = false;
 					},
 					utilFail: function(res) {
@@ -240,4 +255,4 @@
 		border-bottom: 2rpx solid #F7F6F4;
 		font-size: 24rpx;
 	}
-</style>
+</style>

pages/order/parkorderinfo.vue

@@ -79,8 +79,24 @@
 					data: {
 						id: id
 					},
-					utilSuccess: function(res) {
+					utilSuccess: function(res) {
-						that.info = res;
+						if (res.visit_order) {
+						
+							res.time = res.visit_order.date + " " + res.visit_order.time;
+						} else {
+							if (res.activity_order) {
+								
+								res.time = that.$moment(res.activity_order.activity.start_time).format(
+									"YYYY-MM-DD HH:mm")+"～"+that.$moment(res.activity_order.activity.end_time).format(
+									"HH:mm");
+								//res.time = res.activity_order.date + " " + res.activity_order.time;
+							}
+						
+						}
+						that.info = res;
+						
+						
+						
 					},
 					utilFail: function(res) {
 						uni.showToast({