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 01/11] 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) {

From 086eb62ee07c344bb613fc2a8702184afbaabb94 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:17:20 +0800
Subject: [PATCH 02/11] 26015

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

diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index e0bbff41..80a0f91c 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -28,7 +28,6 @@
           <div class="cards-left">活动人数</div>
           <div class="cards-right" @click="toSignUser()">
             <span style="color: #1c6bdf">{{ detail.realNum }}</span>
-            <u-icon name="arrow-right" color="#DDDDDD" size="28" style="margin-left: 8px"></u-icon>
           </div>
         </div>
 

From dab536a369a8ef27fc1cfdebd68f4e7aeb22df2f 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:19:05 +0800
Subject: [PATCH 03/11] 26013

---
 src/apps/AppResidentFile/AppResidentFile.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index cd80d654..07399788 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -129,7 +129,6 @@ export default {
           iconPath: 'home',
           selectedIconPath: 'home-fill',
           text: '统计分析',
-          isDot: true,
           customIcon: false,
         },
         {
@@ -182,7 +181,7 @@ export default {
   },
   watch: {},
   onLoad() {
-    document.title =  '居民信息管理' 
+    document.title = '居民信息管理'
     this.getEchart1()
     this.areaId = this.user.areaId
   },

From 7e6fcbc53ac286b2b890ea186ccd86b597a88308 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:25:32 +0800
Subject: [PATCH 04/11] 25939

---
 src/apps/AppResidentActivitie/AppResidentActivities.vue | 5 +++++
 src/apps/AppResidentActivitie/Detail.vue                | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index 32068554..c525a789 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -78,6 +78,11 @@ 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 80a0f91c..097aca6b 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -15,7 +15,7 @@
           <div class="right">
             <img :src="user.avatar" alt="" v-if="user.avatar" />
 
-            <span>{{ user.name }}</span>
+            <span>{{ detail.contactPerson }}</span>
           </div>
         </div>
 
@@ -146,10 +146,6 @@ export default {
     uni.$on('refresh', () => {
       this.getListInit()
     })
-
-    uni.$on('updateList', () => {
-      this.getDetail()
-    })
   },
   onShow() {
     document.title = '活动报名'

From 1309034d2fef8174486dca00a08b9873631befdc 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:26:43 +0800
Subject: [PATCH 05/11] 26018

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

diff --git a/src/apps/AppUniMsg/Add.vue b/src/apps/AppUniMsg/Add.vue
index bf6c06c0..dff100e8 100644
--- a/src/apps/AppUniMsg/Add.vue
+++ b/src/apps/AppUniMsg/Add.vue
@@ -7,7 +7,7 @@
         </u-form-item>
 
         <u-form-item label="发布组织" prop="publishUnitName" required :border-bottom="false" class="phones">
-          <u-input v-model="forms.publishUnitName" placeholder="请输入发布单位" maxlength="16" />
+          <u-input v-model="forms.publishUnitName" placeholder="请输入发布组织" maxlength="16" />
         </u-form-item>
 
         <u-form-item label="正文" prop="content" :border-bottom="false" label-position="top" class="contents">

From 6b2762b54a4332344047fa15ef3daa234d52636a 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:33:28 +0800
Subject: [PATCH 06/11] 26020

---
 src/apps/AppResidentDocument/DetailCard.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index 3bd6a211..af8b3165 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -7,7 +7,8 @@
 
       <div class="areaHint">
         <u-icon name="map-fill" color="#73ABFF"></u-icon>
-        <span>{{ currentAddress }}</span>
+        <span>{{ resident.currentAreaName }}</span>
+        <span v-if="resident.currentAddress">{{ resident.currentAddress }}</span>
       </div>
     </div>
 
@@ -59,13 +60,13 @@ export default {
     return {
       id: '',
       data: [],
-      currentAddress: '',
+      resident: {},
     }
   },
   computed: {},
   watch: {},
   onLoad(o) {
-    document.title =  '居民档案' 
+    document.title = '居民档案'
     this.id = o.id
     this.$dict.load('householdRelation', 'fileStatus').then(() => {
       this.getDetail()
@@ -78,7 +79,7 @@ export default {
         if (res.code == 0) {
           this.data = res.data
           this.$nextTick(() => {
-            this.currentAddress = res.data.resident.currentAddress
+            this.resident = res.data.resident
           })
         }
       })

From f75fbd173c1805782d935e7d0d26674d2c204cf8 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 24 Dec 2021 19:34:03 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppResidentDocument/DetailCard.vue   | 4 ++--
 src/apps/AppResidentDocument/DetailPeople.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index 3bd6a211..526b90df 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -26,8 +26,8 @@
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
                 <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
-
-                <span class="householdNames">
+                <span class="householdNames" v-if="item.householdName == 1">户主</span>
+                <span class="householdNames" v-else>
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}
                 </span>
               </div>
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index 86d1704b..84fa8c2a 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -9,8 +9,8 @@
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident && data.resident.name }}</span>
-
-          <span class="householdNames">
+          <span class="householdNames" v-if="data.resident.householdName == 1">户主</span>
+          <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>
         </div>
@@ -37,7 +37,7 @@
 
         <div class="item">
           <span>民族</span>
-          <span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
+          <span v-if="data.resident && data.resident.nation"> {{ $dict.getLabel('nation', data.resident.nation) }}</span>
         </div>
 
         <div class="item">

From 2aabf97bd0e4b1d6094b07d2cb1f7c868d8114e6 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:44:30 +0800
Subject: [PATCH 08/11] 26023

---
 src/apps/AppResidentActivitie/Add.vue | 8 +-------
 src/apps/AppWorkonline/Detail.vue     | 2 --
 src/apps/AppWorkonline/detail.vue     | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 711d609b..8bf374db 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -175,7 +175,6 @@ export default {
               content: this.forms.content,
               url: JSON.stringify(imgs) || [],
               areaId: this.forms.areaId,
-
               beginTime: this.forms.beginTime,
               endTime: this.forms.endTime,
               address: this.forms.address,
@@ -210,12 +209,7 @@ export default {
     },
 
     areaSelect(e) {
-      if (e.type == 5) {
-        this.forms.areaId = e.id
-      }
-      if (e.type == 4) {
-        this.forms.areaId = e.id
-      }
+      this.forms.areaId = e.id
     },
   },
 }
diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue
index f5f145a6..471796b7 100644
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -222,8 +222,6 @@
       <div class="reject" @click="agree(0)">拒绝</div>
       <div class="agree" @click="agree(1)">同意</div>
     </div>
-
-    <AiBack></AiBack>
   </div>
 </template>
 
diff --git a/src/apps/AppWorkonline/detail.vue b/src/apps/AppWorkonline/detail.vue
index f5f145a6..471796b7 100644
--- a/src/apps/AppWorkonline/detail.vue
+++ b/src/apps/AppWorkonline/detail.vue
@@ -222,8 +222,6 @@
       <div class="reject" @click="agree(0)">拒绝</div>
       <div class="agree" @click="agree(1)">同意</div>
     </div>
-
-    <AiBack></AiBack>
   </div>
 </template>
 

From 979253bc04bd329c8fecea20ff2b904f03835e23 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:56:03 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMarryAndDie/AllActiveList.vue               | 9 ++++++++-
 src/apps/AppMarryAndDie/AppMarryAndDie.vue              | 9 ++++++++-
 src/apps/AppMarryAndDie/CadreList.vue                   | 9 ++++++++-
 src/apps/AppMarryAndDie/FuneralList.vue                 | 9 ++++++++-
 src/apps/AppMarryAndDie/MarryList.vue                   | 9 ++++++++-
 src/apps/AppResidentActivitie/AppResidentActivities.vue | 9 ++++++++-
 src/apps/AppResidentActivitie/Detail.vue                | 4 ++--
 7 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppMarryAndDie/AllActiveList.vue b/src/apps/AppMarryAndDie/AllActiveList.vue
index 2b28c546..2fc700b8 100644
--- a/src/apps/AppMarryAndDie/AllActiveList.vue
+++ b/src/apps/AppMarryAndDie/AllActiveList.vue
@@ -45,7 +45,7 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index a44b4a3e..ce2370a9 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -80,7 +80,7 @@
             </div>
 
             <div class="imgs">
-              <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+              <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
             </div>
 
             <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
@@ -297,6 +297,13 @@ export default {
         this.getList()
       }
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppMarryAndDie/CadreList.vue b/src/apps/AppMarryAndDie/CadreList.vue
index 8d004f53..59e9f325 100644
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -45,7 +45,7 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppMarryAndDie/FuneralList.vue b/src/apps/AppMarryAndDie/FuneralList.vue
index bf79009e..107a40cc 100644
--- a/src/apps/AppMarryAndDie/FuneralList.vue
+++ b/src/apps/AppMarryAndDie/FuneralList.vue
@@ -45,7 +45,7 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppMarryAndDie/MarryList.vue b/src/apps/AppMarryAndDie/MarryList.vue
index 93340984..51545daa 100644
--- a/src/apps/AppMarryAndDie/MarryList.vue
+++ b/src/apps/AppMarryAndDie/MarryList.vue
@@ -45,7 +45,7 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index c525a789..40d83ab0 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -32,7 +32,7 @@
             <div class="areaNmae" v-if="item.areaName || item.address">{{ item.areaName }}{{ item.address }}</div>
           </div>
 
-          <img :src="item.url[0].url" alt="" />
+          <img :src="item.url[0].url" alt="" @click.stop="previewImage(item.url, item.url[0].url)" />
 
           <div class="hints" :style="{ background: item.status == 0 ? '#000000' : item.status == 1 ? '#42D784' : '#E4E4E4' }">{{ $dict.getLabel('villageActivityStatus', item.status) }}</div>
         </template>
@@ -128,6 +128,13 @@ export default {
     toDetail(item) {
       uni.navigateTo({ url: `./Detail?id=${item.id}&createUserId=${item.createUserId}` })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index 097aca6b..f1c536cb 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -2,7 +2,7 @@
   <div class="page">
     <div class="header-content">
       <div class="header-top">
-        <img :src="detail.url && detail.url[0].url" alt="" />
+        <img :src="detail.url && detail.url[0].url" alt="" @click.stop="previewImage(detail.url, detail.url[0].url)" />
       </div>
 
       <div class="header-middle">
@@ -70,7 +70,7 @@
               </div>
 
               <div class="card-img">
-                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(info.images, item.url)" />
+                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(imgList[index], e.url)" />
               </div>
 
               <!-- <div class="card-icon">

From 4b63247b7581dc2ecdb47470636ffb3d8c5efd4b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 24 Dec 2021 19:57:02 +0800
Subject: [PATCH 10/11] title

---
 src/apps/AppCountryAlbum/AppCountryAlbum.vue     | 4 +++-
 src/apps/AppGridManagement/AppGridManagement.vue | 3 +++
 src/apps/AppSpecialPeople/AppSpecialPeople.vue   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppCountryAlbum/AppCountryAlbum.vue b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
index 04e27b4c..3f74013e 100644
--- a/src/apps/AppCountryAlbum/AppCountryAlbum.vue
+++ b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
@@ -24,7 +24,9 @@ export default {
   },
 
   components: { Detail, List },
-
+  onShow() {
+    document.title = "乡村相册"
+  },
   methods: {
     onChange(e) {
       this.params = e.params
diff --git a/src/apps/AppGridManagement/AppGridManagement.vue b/src/apps/AppGridManagement/AppGridManagement.vue
index f6901e23..2cf62a20 100644
--- a/src/apps/AppGridManagement/AppGridManagement.vue
+++ b/src/apps/AppGridManagement/AppGridManagement.vue
@@ -30,6 +30,9 @@ export default {
       this.component = e.type
     }
   },
+  onShow() {
+    document.title = "网格管理"
+  }
 }
 </script>
 
diff --git a/src/apps/AppSpecialPeople/AppSpecialPeople.vue b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
index 3c48b94f..c94e687e 100644
--- a/src/apps/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/apps/AppSpecialPeople/AppSpecialPeople.vue
@@ -29,6 +29,9 @@ export default {
     onChange(e) {
       this.params = e.params
       this.component = e.type
+    },
+    onShow() {
+      document.title = "特殊人群"
     }
   },
 }

From 1ce7940ac5d388b9b1ba0cffaff30ead8b6487f2 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:58:54 +0800
Subject: [PATCH 11/11] 26026

---
 src/apps/AppMarryAndDie/AllActiveList.vue  | 2 +-
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 2 +-
 src/apps/AppMarryAndDie/CadreList.vue      | 2 +-
 src/apps/AppMarryAndDie/FuneralList.vue    | 2 +-
 src/apps/AppMarryAndDie/MarryList.vue      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppMarryAndDie/AllActiveList.vue b/src/apps/AppMarryAndDie/AllActiveList.vue
index 2fc700b8..3c9422de 100644
--- a/src/apps/AppMarryAndDie/AllActiveList.vue
+++ b/src/apps/AppMarryAndDie/AllActiveList.vue
@@ -52,7 +52,7 @@
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index ce2370a9..a97171c1 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -87,7 +87,7 @@
               {{ $dict.getLabel('marriageType', item.type) }}
             </span>
 
-            <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+            <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
               {{ $dict.getLabel('modeType', item.modeType) }}
             </span>
           </template>
diff --git a/src/apps/AppMarryAndDie/CadreList.vue b/src/apps/AppMarryAndDie/CadreList.vue
index 59e9f325..cd25a060 100644
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -52,7 +52,7 @@
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
diff --git a/src/apps/AppMarryAndDie/FuneralList.vue b/src/apps/AppMarryAndDie/FuneralList.vue
index 107a40cc..80adde35 100644
--- a/src/apps/AppMarryAndDie/FuneralList.vue
+++ b/src/apps/AppMarryAndDie/FuneralList.vue
@@ -52,7 +52,7 @@
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
diff --git a/src/apps/AppMarryAndDie/MarryList.vue b/src/apps/AppMarryAndDie/MarryList.vue
index 51545daa..a9bdc7ae 100644
--- a/src/apps/AppMarryAndDie/MarryList.vue
+++ b/src/apps/AppMarryAndDie/MarryList.vue
@@ -52,7 +52,7 @@
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>