From 56ef4fdf8cf37b6704a8992a4a6dea6c05d4cf24 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 15:37:20 +0800
Subject: [PATCH] 25942

---
 .../AppResidentActivitie/AppResidentActivities.vue   |  4 ++--
 src/apps/AppResidentActivitie/Detail.vue             | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index ca4a80a9..f8d9f8c5 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -75,7 +75,7 @@ export default {
   },
   watch: {},
   onLoad() {
-    document.title =  '居民活动' 
+    document.title = '居民活动'
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getList()
     })
@@ -123,7 +123,7 @@ export default {
     },
 
     toDetail(item) {
-      uni.navigateTo({ url: `./Detail?id=${item.id}` })
+      uni.navigateTo({ url: `./Detail?id=${item.id}&createUserId=${item.createUserId}` })
     },
   },
   onReachBottom() {
diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index d0ffa975..27e3113a 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -20,7 +20,7 @@
 
         <div class="cards">
           <div class="cards-left">活动时间</div>
-          <div class="cards-right">{{ detail.beginTime && detail.beginTime.substring(0, detail.beginTime.length - 2) }}</div>
+          <div class="cards-right">{{ detail.beginTime && detail.beginTime.substring(0, detail.beginTime.length - 3) }}</div>
         </div>
 
         <div class="cards">
@@ -105,7 +105,7 @@
       <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0" @click="toAdd">编辑活动</div>
     </div>
 
-    <AiFixedBtn>
+    <AiFixedBtn v-if="this.createUserId == this.user.id">
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
     </AiFixedBtn>
   </div>
@@ -122,6 +122,7 @@ export default {
   data() {
     return {
       id: '',
+      createUserId: '',
       detail: {},
       activeList: [],
       imgList: [],
@@ -134,11 +135,13 @@ export default {
         },
       ],
       current: 0,
+      timeEndTime: '',
     }
   },
   onLoad(option) {
-    document.title =  '活动报名' 
+    document.title = '活动报名'
     this.id = option.id
+    this.createUserId = option.createUserId
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getDetail()
     })
@@ -151,9 +154,8 @@ export default {
     getDetail() {
       this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
-          // res.data.beginTime = res.data.beginTime.substring(0, 16)
-          // res.data.endTime = res.data.endTime.substring(0, 16)
           this.detail = res.data
+
           if (this.detail) {
             if (this.detail.url) {
               this.detail.url = JSON.parse(res.data.url || '[]')