From 07e55523aa49b2e66245d25b04899b58b4b0e006 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: Thu, 23 Dec 2021 17:36:57 +0800
Subject: [PATCH 1/2] 25853

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

diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 02f96e5e..822382c3 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -170,7 +170,7 @@ export default {
       var option = {
         xAxis: {
           type: 'category',
-          data: data.map((v) => v.name.replace('数量', '')),
+          data: data.map((v) => v.name.replace('数量', '').replace('和操办登记', '')),
           axisLine: {
             lineStyle: { color: '#157EFF' },
           },

From 20199752584a8315ba6498eec734e8e02b97a373 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: Thu, 23 Dec 2021 17:42:26 +0800
Subject: [PATCH 2/2] 25858

---
 src/apps/AppMarryAndDie/Add.vue            | 2 +-
 src/apps/AppMarryAndDie/AppMarryAndDie.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue
index 2200b785..f747bee0 100644
--- a/src/apps/AppMarryAndDie/Add.vue
+++ b/src/apps/AppMarryAndDie/Add.vue
@@ -135,7 +135,7 @@ export default {
               if (res.code == 0) {
                 this.$u.toast('发布成功')
                 this.flag = false
-                uni.navigateTo({ url: `./AppMarryAndDie` })
+                uni.navigateTo({ url: `./AppMarryAndDie?indexTabs=1` })
               }
             })
         } else {
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index 822382c3..6b687de8 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -131,7 +131,11 @@ export default {
     },
   },
   watch: {},
-  onLoad() {
+  onLoad(o) {
+    if (o.indexTabs) {
+      this.currentTabs = o.indexTabs
+    }
+
     this.$dict.load('marriageType', 'modeType').then(() => {
       this.getList()
       this.getEchart()