From 9fa6635b3914b5e4906570cfa25d2c5348422a0d Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 4 Aug 2021 11:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customer/AddCustomer.vue |  2 +-
 src/views/order/AddOrder.vue       | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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 @@
                             </el-table-column>
                             <el-table-column prop="endTime" label="合同期限" align="center">
                                 <template slot-scope="scope">
-                                    {{scope.row.startTime.split(' ').shift()}}&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;{{scope.row.endTime.split(' ').shift()}}
+                                    {{scope.row.startTime?scope.row.startTime.split(' ').shift():''}}&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;{{scope.row.endTime?scope.row.endTime.split(' ').shift():''}}
                                 </template>
                             </el-table-column>
                             <el-table-column prop="dataOrCourseName" label="产品内容" align="center">
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<end){
+                                let time = e.endTime.split(" ")[0]
+                                let arr = time.split('-')
+                                e.startTime = arr[0]+'-'+arr[1]+'-'+'0'+(+arr[2]+1)
+                            }else{/* 过期 */
+                                e.startTime = ''
+                            }
+                            e.endTime = ''
                             e.periodOfUse = ''
                         }else{
                             e.startTime = e.startTime.split(" ")[0]