From d58fd3c24926a0ab6d8ccce8b34fc7d09f02cb4f Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Tue, 26 Dec 2023 20:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Tabbar.vue           | 18 ++++++++++++++----
 src/views/myself/news/news.vue | 10 ++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/Tabbar.vue b/src/views/Tabbar.vue
index 2bba8ba..f799a96 100644
--- a/src/views/Tabbar.vue
+++ b/src/views/Tabbar.vue
@@ -2,7 +2,7 @@
 <template>
   <div>
     <!-- 头部导航 -->
-    <TopNavBar />
+    <TopNavBar @on-click-right="onClickNews" />
     <!-- 页面  -->
     <div class="tabbar-container">
       <router-view />
@@ -22,14 +22,24 @@ export default {
   },
   created() {},
   mounted() {},
-  methods: {}
+  methods: {
+    onClickNews() {
+      let currentRoute = this.$route.name;
+      this.$router.push({
+        name: 'news',
+        query: {
+          toRouter: currentRoute
+        }
+      });
+    }
+  }
 };
 </script>
 <style>
 .van-tabbar {
   z-index: 999 !important;
 }
-.tabbar-container{
-  padding:100.06px 0px;
+.tabbar-container {
+  padding: 100.06px 0px;
 }
 </style>
diff --git a/src/views/myself/news/news.vue b/src/views/myself/news/news.vue
index 435f2af..4e5563a 100644
--- a/src/views/myself/news/news.vue
+++ b/src/views/myself/news/news.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="news">
-    <van-nav-bar title="消息通知" left-arrow @click-left="onNavBack" left-text="返回" />
+    <!-- <van-nav-bar title="消息通知" left-arrow @click-left="onNavBack" left-text="返回" /> -->
+    <NavBar title="消息通知" @on-click-left="onNavBack"> </NavBar>
     <div class="list-con">
       <van-list v-model="loading" :finished="finished" :immediate-check="false" @load="onLoad">
         <div class="item">
@@ -33,7 +34,11 @@
 import DialogService from '@/services/dialog-service';
 import ToastService from '@/services/toast-service';
 import APIUser from '@/api/user';
+import NavBar from '@/components/NavBar';
 export default {
+  components: {
+    NavBar
+  },
   data() {
     return {
       personName: '',
@@ -50,7 +55,8 @@ export default {
     onNavBack() {
       //        this.$router.go(-1);
       // todo 此处不能修改为 go(-1)；因为情景有：微信推送时进入该页面，此时点击返回就该路由至首页。
-      this.$router.push({ name: 'location' });
+
+      this.$router.push({ name: this.$route.query.toRouter || 'location' });
     },
     getData(begNumber, pageNumber, firstLoad) {
       /* let url = "/api/Alarm/AlarmList";