From 290cdb2f59d5fac6cf9287233fd5f426b60b22f0 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: Mon, 20 Dec 2021 16:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMarryAndDie/AllActiveList.vue  | 15 ++++++++++-----
 src/apps/AppMarryAndDie/AppMarryAndDie.vue |  6 +++++-
 src/apps/AppMarryAndDie/CadreList.vue      |  8 +++-----
 src/apps/AppMarryAndDie/FuneralList.vue    | 12 +++++++-----
 src/apps/AppMarryAndDie/MarryList.vue      | 12 +++++++-----
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/apps/AppMarryAndDie/AllActiveList.vue b/src/apps/AppMarryAndDie/AllActiveList.vue
index 95c7eded..4c61a416 100644
--- a/src/apps/AppMarryAndDie/AllActiveList.vue
+++ b/src/apps/AppMarryAndDie/AllActiveList.vue
@@ -4,7 +4,7 @@
       <AiCard>
         <template #custom>
           <div class="left">
-            <span class="nums"> 2 </span>
+            <span class="nums"> {{ num }} </span>
             <span class="hint">全部活动</span>
           </div>
 
@@ -71,7 +71,11 @@ export default {
       current: 1,
     }
   },
-  computed: {},
+  computed: {
+    num() {
+      return this.data.filter((item) => item.v1).reduce((counts, item) => (counts += item.v1 * 1), 0)
+    },
+  },
   watch: {},
   onLoad() {
     this.$dict.load('marriageType', 'modeType').then(() => {
@@ -88,9 +92,6 @@ export default {
       this.$http.post('/app/appmarriagefuneralinfo/queryDataStatistics').then((res) => {
         if (res.code == 0) {
           this.data = res.data
-          this.data.map((e, i) => {
-            console.log(e.v1, i)
-          })
 
           uni.hideLoading()
         }
@@ -130,6 +131,10 @@ export default {
       })
     },
   },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
 }
 </script>
 
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 1373f9f8..56d4baf9 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -147,7 +147,7 @@ export default {
           params: {
             size: 6,
             current: this.current,
-            // createUserId: this.user.id,
+            createUserId: this.user.id,
           },
         })
         .then((res) => {
@@ -256,6 +256,10 @@ export default {
       }
     },
   },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
 }
 </script>
 
diff --git a/src/apps/AppMarryAndDie/CadreList.vue b/src/apps/AppMarryAndDie/CadreList.vue
index a0da4700..a62d50f0 100644
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -4,7 +4,7 @@
       <AiCard>
         <template #custom>
           <div class="left">
-            <span class="nums"> 2 </span>
+            <span class="nums"> {{ total }} </span>
             <span class="hint">全部干部参与</span>
           </div>
 
@@ -69,6 +69,7 @@ export default {
       deletShow: false,
       deletId: '',
       current: 1,
+      total: '',
     }
   },
   computed: {},
@@ -88,10 +89,6 @@ export default {
       this.$http.post('/app/appmarriagefuneralinfo/queryDataStatistics').then((res) => {
         if (res.code == 0) {
           this.data = res.data
-          this.data.map((e, i) => {
-            console.log(e.v1, i)
-          })
-
           uni.hideLoading()
         }
       })
@@ -112,6 +109,7 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.total = res.data.total
             uni.hideLoading()
           }
         })
diff --git a/src/apps/AppMarryAndDie/FuneralList.vue b/src/apps/AppMarryAndDie/FuneralList.vue
index 7fb87ad2..e92da33b 100644
--- a/src/apps/AppMarryAndDie/FuneralList.vue
+++ b/src/apps/AppMarryAndDie/FuneralList.vue
@@ -4,7 +4,7 @@
       <AiCard>
         <template #custom>
           <div class="left">
-            <span class="nums"> 2 </span>
+            <span class="nums"> {{ total }} </span>
             <span class="hint">全部丧礼</span>
           </div>
 
@@ -69,6 +69,7 @@ export default {
       deletShow: false,
       deletId: '',
       current: 1,
+      total: '',
     }
   },
   computed: {},
@@ -88,10 +89,6 @@ export default {
       this.$http.post('/app/appmarriagefuneralinfo/queryDataStatistics').then((res) => {
         if (res.code == 0) {
           this.data = res.data
-          this.data.map((e, i) => {
-            console.log(e.v1, i)
-          })
-
           uni.hideLoading()
         }
       })
@@ -112,6 +109,7 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.total = res.data.total
             uni.hideLoading()
           }
         })
@@ -131,6 +129,10 @@ export default {
       })
     },
   },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
 }
 </script>
 
diff --git a/src/apps/AppMarryAndDie/MarryList.vue b/src/apps/AppMarryAndDie/MarryList.vue
index eb83cad8..45ec81c3 100644
--- a/src/apps/AppMarryAndDie/MarryList.vue
+++ b/src/apps/AppMarryAndDie/MarryList.vue
@@ -4,7 +4,7 @@
       <AiCard>
         <template #custom>
           <div class="left">
-            <span class="nums"> 2 </span>
+            <span class="nums"> {{ total }} </span>
             <span class="hint">全部婚礼</span>
           </div>
 
@@ -69,6 +69,7 @@ export default {
       deletShow: false,
       deletId: '',
       current: 1,
+      total: '',
     }
   },
   computed: {},
@@ -88,10 +89,6 @@ export default {
       this.$http.post('/app/appmarriagefuneralinfo/queryDataStatistics').then((res) => {
         if (res.code == 0) {
           this.data = res.data
-          this.data.map((e, i) => {
-            console.log(e.v1, i)
-          })
-
           uni.hideLoading()
         }
       })
@@ -112,6 +109,7 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.total = res.data.total
             uni.hideLoading()
           }
         })
@@ -131,6 +129,10 @@ export default {
       })
     },
   },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
 }
 </script>