From adeb6f3062e0ded7088d7a30e5861464d3a982c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 31 Dec 2021 14:07:32 +0800
Subject: [PATCH] 26122

---
 src/apps/AppResidentActivitie/Add.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 79f41a26..0c8302cf 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -207,9 +207,9 @@ export default {
       if (this.showStartTime == true) {
         var nowTime = new Date().getTime() * 1
 
-        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+        var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
 
-        if (nowTime > historyTime) {
+        if (nowTime > beginTimes) {
           this.forms.beginTime = ''
           return this.$u.toast('开始时间应大于当前时间')
         } else {
@@ -217,15 +217,18 @@ export default {
         }
       }
       if (this.showEndTime == true) {
-        var nowTime = new Date().getTime() * 1
+        if (!this.forms.beginTime) {
+          return this.$u.toast('请先选择开始时间')
+        }
+        var beginTimes = new Date(this.forms.beginTime).getTime() * 1
 
-        var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
+        var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
 
-        if (nowTime > historyTime) {
-          this.forms.endTime = ''
-          return this.$u.toast('结束时间应大于当前时间')
-        } else {
+        if (endTimes > beginTimes && endTimes != beginTimes) {
           this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
+        } else {
+          this.forms.endTime = ''
+          return this.$u.toast('结束时间应大于开始时间')
         }
       }
     },