From 0f10f23e7f6bffabd1b92ffac39a3f4b10be2302 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 10:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMarryAndDie/Add.vue            |  3 ---
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue
index e7a56bfc..b7109f4e 100644
--- a/src/apps/AppMarryAndDie/Add.vue
+++ b/src/apps/AppMarryAndDie/Add.vue
@@ -82,7 +82,6 @@ export default {
   },
   computed: { ...mapState(['user']) },
   onLoad() {
-    console.log(this.user.id)
     this.$dict.load('marriageType', 'modeType')
     this.forms.areaId = this.user.areaId
   },
@@ -147,12 +146,10 @@ export default {
 
     selectStatus(e) {
       if (this.showStstus == true) {
-        console.log(e)
         this.forms.type = e[0].label
         this.forms.typeValue = e[0].value
       }
       if (this.showModeType == true) {
-        console.log(e)
         this.forms.modeType = e[0].label
         this.forms.modeTypeValue = e[0].value
       }
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 150eafd8..173e8468 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -143,10 +143,10 @@ export default {
   onLoad(o) {
     if (o.indexTabs) {
       this.currentTabs = o.indexTabs
+      this.getList()
     }
 
     this.$dict.load('marriageType', 'modeType').then(() => {
-      this.getList()
       this.getEchart()
     })
   },
@@ -262,27 +262,27 @@ export default {
 
     toList(num) {
       if (num == 0) {
-        console.log('全部')
         uni.navigateTo({ url: `./AllActiveList` })
       }
       if (num == 1) {
-        console.log('干部')
         uni.navigateTo({ url: `./CadreList` })
       }
       if (num == 2) {
-        console.log('婚礼')
         uni.navigateTo({ url: `./MarryList` })
       }
       if (num == 3) {
-        console.log('丧礼')
         uni.navigateTo({ url: `./FuneralList` })
       }
     },
 
     change(index) {
       this.currentTabs = index
-      this.getList()
-      this.getEchart()
+      if (this.currentTabs == 0) {
+        this.getEchart()
+      }
+      if (this.currentTabs == 1) {
+        this.getList()
+      }
     },
   },
   onReachBottom() {