From 8a1d74d57b7dc38b0e624b0a53cda59aa5655532 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: Wed, 23 Feb 2022 11:19:32 +0800
Subject: [PATCH] 27597

---
 .../AppVillageActivity/AppVillageActivity.vue | 104 +++++++++---------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/mods/AppVillageActivity/AppVillageActivity.vue b/src/mods/AppVillageActivity/AppVillageActivity.vue
index d98dcdf..39e8003 100644
--- a/src/mods/AppVillageActivity/AppVillageActivity.vue
+++ b/src/mods/AppVillageActivity/AppVillageActivity.vue
@@ -9,8 +9,7 @@
       </div>
     </div>
     <div class="activity-list">
-      <div class="item" hover-class="bg-hover" @click="$linkTo(`/village/villageActivity/ActivityDetail?id=${item.id}`)"
-           v-for="(item, index) in list" :key="index">
+      <div class="item" hover-class="bg-hover" @click="$linkTo(`./ActivityDetail?id=${item.id}`)" v-for="(item, index) in list" :key="index">
         <div class="left">
           <h2>{{ item.title }}</h2>
           <div class="left-info">
@@ -23,7 +22,7 @@
         </div>
         <div class="right">
           <span :class="'status' + item.status">{{ item.statusName }}</span>
-          <image :src="item.url" mode="aspectFill"/>
+          <image :src="item.url" mode="aspectFill" />
         </div>
       </div>
       <AiEmpty v-if="!list.length"></AiEmpty>
@@ -33,15 +32,15 @@
 
 <script>
 export default {
-  name: "AppVillageActivity",
-  appName: "居民活动",
+  name: 'AppVillageActivity',
+  appName: '居民活动',
   data() {
     return {
       list: [],
       pageShow: false,
       current: 1,
       total: 0,
-      isMore: false
+      isMore: false,
     }
   },
 
@@ -56,53 +55,56 @@ export default {
     getList() {
       if (this.isMore) return
 
-      this.$instance.post(`/app/appvillageactivityinfo/listUp`, null, {
-        params: {
-          current: this.current,
-          size: 15,
-          areaId: uni.getStorageSync('areaId')
-        }
-      }).then(res => {
-        if (res.code == 0) {
-          this.total = res.data.total
-          if (this.current > 1) {
-            this.list = [...this.list, ...res.data.records].map(v => {
-              return {
-                ...v,
-                statusName: this.$dict.getLabel('villageActivityStatus', v.status),
-                url: v.url ? JSON.parse(v.url)[0].url : ''
-              }
-            })
+      this.$instance
+        .post(`/app/appvillageactivityinfo/listUp`, null, {
+          params: {
+            current: this.current,
+            size: 15,
+            areaId: uni.getStorageSync('areaId'),
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.total = res.data.total
+            if (this.current > 1) {
+              this.list = [...this.list, ...res.data.records].map((v) => {
+                return {
+                  ...v,
+                  statusName: this.$dict.getLabel('villageActivityStatus', v.status),
+                  url: v.url ? JSON.parse(v.url)[0].url : '',
+                }
+              })
+            } else {
+              this.list = res.data.records.map((v) => {
+                return {
+                  ...v,
+                  statusName: this.$dict.getLabel('villageActivityStatus', v.status),
+                  url: v.url ? JSON.parse(v.url)[0].url : '',
+                }
+              })
+            }
+            uni.hideLoading()
+            this.pageShow = true
+            if (res.data.records.length < 15) {
+              this.isMore = true
+
+              return false
+            }
+
+            this.current = this.current + 1
           } else {
-            this.list = res.data.records.map(v => {
-              return {
-                ...v,
-                statusName: this.$dict.getLabel('villageActivityStatus', v.status),
-                url: v.url ? JSON.parse(v.url)[0].url : ''
-              }
-            })
+            uni.hideLoading()
           }
+        })
+        .catch(() => {
           uni.hideLoading()
-          this.pageShow = true
-          if (res.data.records.length < 15) {
-            this.isMore = true
-
-            return false
-          }
-
-          this.current = this.current + 1
-        } else {
-          uni.hideLoading()
-        }
-      }).catch(() => {
-        uni.hideLoading()
-      })
-    }
+        })
+    },
   },
 
   onReachBottom() {
     this.getList()
-  }
+  },
 }
 </script>
 
@@ -133,7 +135,7 @@ export default {
       }
 
       i {
-        color: #4181FF;
+        color: #4181ff;
         font-style: normal;
         font-size: 28px;
       }
@@ -173,7 +175,7 @@ export default {
         align-items: center;
 
         i {
-          color: #4181FF;
+          color: #4181ff;
           font-style: normal;
           font-size: 26px;
         }
@@ -207,15 +209,15 @@ export default {
       }
 
       .status0 {
-        background: #42D784;
+        background: #42d784;
       }
 
       .status1 {
-        background: #1AAAFF;
+        background: #1aaaff;
       }
 
       .status2 {
-        background: #E4E4E4;
+        background: #e4e4e4;
       }
     }
   }