diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index 5e16490..bfcfa99 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -189,7 +189,7 @@
- {{scope.row.startTime.split(' ').shift()}} - {{scope.row.endTime.split(' ').shift()}}
+ {{scope.row.startTime?scope.row.startTime.split(' ').shift():''}} - {{scope.row.endTime?scope.row.endTime.split(' ').shift():''}}
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 9c24bcb..80e7866 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -682,10 +682,17 @@ export default {
})
let dataArr = list.filter(e=>{// 数据平台
if(this.renewDisabled){/* 处于续费 */
- let time = e.endTime.split(" ")[0]
- let arr = time.split('-')
- e.startTime = arr[0]+'-'+arr[1]+'-'+'0'+(+arr[2]+1)
- e.endTime = ""
+ let end = Date.parse(e.endTime);
+ let now = +new Date()
+ console.log(end,now,'时间');
+ if(now