From f8209a092a9722398033d242dd23cc508b166102 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, 24 Dec 2021 19:16:20 +0800
Subject: [PATCH] 25942

---
 src/apps/AppResidentActivitie/Add.vue          |  1 -
 .../AppResidentActivities.vue                  |  4 ----
 src/apps/AppResidentActivitie/Detail.vue       | 18 +++++++++++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 63381ef9..711d609b 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -80,7 +80,6 @@ export default {
 
         contactPhone: '',
       },
-
       showStartTime: false,
       showEndTime: false,
       flag: false,
diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index cac9a182..32068554 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -78,10 +78,6 @@ export default {
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getList()
     })
-    uni.$on('updateList', () => {
-      this.current = 1
-      this.getList()
-    })
   },
   onShow() {
     document.title = '居民活动'
diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index 69fcb46a..e0bbff41 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -102,7 +102,7 @@
       <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
     </div>
 
-    <AiFixedBtn v-if="this.createUserId == this.user.id">
+    <AiFixedBtn v-if="this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
     </AiFixedBtn>
   </div>
@@ -133,6 +133,8 @@ export default {
       ],
       current: 0,
       timeEndTime: '',
+      timeEnd: '',
+      timeNow: '',
     }
   },
   onLoad(option) {
@@ -145,6 +147,10 @@ export default {
     uni.$on('refresh', () => {
       this.getListInit()
     })
+
+    uni.$on('updateList', () => {
+      this.getDetail()
+    })
   },
   onShow() {
     document.title = '活动报名'
@@ -154,6 +160,16 @@ export default {
       this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.detail = res.data
+          console.log('结束时间', this.detail.endTime)
+          this.timeEnd = new Date(this.detail.endTime).getTime()
+          console.log('过去时间戳', this.timeEnd)
+          this.timeNow = new Date().getTime()
+          console.log('当前时间戳', this.timeNow)
+          console.log('过去时间戳加上24小时', this.timeEnd * 1 + 24 * 60 * 60 * 1000)
+
+          if (this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000) {
+            console.log('可以添加')
+          }
 
           if (this.detail) {
             if (this.detail.url) {