From bae87dde064cb0c21919dd97a90ed1fcebc09cf8 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 22:39:41 +0800
Subject: [PATCH 1/2] 26043

---
 src/apps/AppMarryAndDie/Add.vue            | 2 +-
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue
index 78ecd89f..eef95d38 100644
--- a/src/apps/AppMarryAndDie/Add.vue
+++ b/src/apps/AppMarryAndDie/Add.vue
@@ -26,7 +26,7 @@
 
         <div class="line"></div>
 
-        <u-form-item label="地址" prop="address" :border-bottom="false" right-icon="arrow-right" class="addresss">
+        <u-form-item label="地址" prop="address" :border-bottom="false" class="addresss">
           <u-input v-model="forms.address" placeholder="请输入地址" />
         </u-form-item>
 
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 8664ddee..a78f63a8 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -10,7 +10,7 @@
             <span class="titlesContent">查看全部活动和本月新增</span>
           </div>
 
-          <img src="img/1.png" alt="" />
+          <img src="./img/1.png" alt="" />
         </div>
 
         <div class="card" @click="toList(1)">
@@ -19,7 +19,7 @@
             <span class="titlesContent">查看全部参与操办信息和本月新增</span>
           </div>
 
-          <img src="img/2.png" alt="" />
+          <img src="./img/2.png" alt="" />
         </div>
 
         <div class="card" @click="toList(2)">
@@ -28,7 +28,7 @@
             <span class="titlesContent">查看全部婚礼和本月新增</span>
           </div>
 
-          <img src="img/3.png" alt="" />
+          <img src="./img/3.png" alt="" />
         </div>
 
         <div class="card" @click="toList(3)">
@@ -37,7 +37,7 @@
             <span class="titlesContent">查看全部丧礼和本月新增</span>
           </div>
 
-          <img src="img/4.png" alt="" />
+          <img src="./img/4.png" alt="" />
         </div>
       </div>
 

From bcaacc3c79b4e5fdd071a3075aee2ecc6c330ac6 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 22:41:51 +0800
Subject: [PATCH 2/2] status

---
 src/apps/AppResidentActivitie/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index 344f425e..1bdbd3e2 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -99,7 +99,7 @@
         </div>
       </div>
 
-      <div class="fixedBtns" v-if="this.current == 0 && detail.status != 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
+      <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 && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">