From 8feb5cebb845d49fb2f5f70a59bedb6554908ea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 10 Nov 2023 17:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/message/message.vue              |  6 +++---
 pagesC/notice/notice.vue               | 25 +++++++++++++++++++++----
 pagesC/noticedetails/noticedetails.vue |  5 +++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pages/message/message.vue b/pages/message/message.vue
index 743bf17..3524ef7 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<view class="item" @tap="gonotice(listone,' 通知公告')">
+		<view class="item" @tap="gonotice(listone,'通知公告')">
 			<image src="../../static/pages/tongzhi.png" mode=""></image>
 			<view class="title">
 				通知公告
@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="item" @tap="gonotice(listtwo,' 健康推送')">
+		<view class="item" @tap="gonotice(listtwo,'健康推送')">
 			<image src="../../static/pages/jiankang.png" mode=""></image>
 			<view class="title">
 				健康推送
@@ -32,7 +32,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="item" @tap="gonotice(listfour,' 服务推送')">
+		<view class="item" @tap="gonotice(listfour,'服务推送')">
 			<image src="../../static/pages/fuwu.png" mode=""></image>
 			<view class="title">
 				服务推送
diff --git a/pagesC/notice/notice.vue b/pagesC/notice/notice.vue
index 22f06be..5661a78 100644
--- a/pagesC/notice/notice.vue
+++ b/pagesC/notice/notice.vue
@@ -18,7 +18,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="" v-else  style="margin-top: 100rpx;">
+		<view class="" v-else style="margin-top: 100rpx;">
 			<u-empty mode="order" icon-size='220' text="暂无"></u-empty>
 		</view>
 	</view>
@@ -63,9 +63,26 @@
 		},
 		methods: {
 			goToDetail(item) {
-				uni.navigateTo({
-					url: `/pagesC/noticedetails/noticedetails?item=${JSON.stringify(item)}&title=${this.title}`
-				})
+				console.log(this.title)
+				if (this.title == '服务推送') {
+					if (Number(item.sourceType) == 1) {
+						uni.navigateTo({
+							url: "/pagesB/SelectItem/SelectItem"
+						})
+					} else if (Number(item.sourceType) == 2) {
+						uni.navigateTo({
+							url: "/pagesB/ExpertlookOrder/ExpertlookOrder"
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pagesC/noticedetails/noticedetails?item=${JSON.stringify(item)}&title=${this.title}`
+						})
+					}
+				} else {
+					uni.navigateTo({
+						url: `/pagesC/noticedetails/noticedetails?item=${JSON.stringify(item)}&title=${this.title}`
+					})
+				}
 			},
 			info() {
 				getMegList(this.obj).then(res => {
diff --git a/pagesC/noticedetails/noticedetails.vue b/pagesC/noticedetails/noticedetails.vue
index 3c79000..954b844 100644
--- a/pagesC/noticedetails/noticedetails.vue
+++ b/pagesC/noticedetails/noticedetails.vue
@@ -25,6 +25,11 @@
 				title: '',
 			};
 		},
+		onReady() { //更改导航栏文字
+			uni.setNavigationBarTitle({
+				title: this.title,
+			});
+		},
 		onLoad(options) {
 			this.title = options.title
 			this.currentItem = JSON.parse(options.item)