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 1/2] 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 2/2] =?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">