From 136baa0c22edaf0e10637f82ad3e39d8e9eae1dd Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 26 Mar 2024 18:04:58 +0800
Subject: [PATCH] =?UTF-8?q?[fix=2083057]=20=E6=B6=88=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=89=93=E5=BC=80?=
 =?UTF-8?q?page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/ShowAnnouncement.vue | 6 +++++-
 src/views/system/UserAnnouncementList.vue | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/tools/ShowAnnouncement.vue b/src/components/tools/ShowAnnouncement.vue
index b5935df2..3af0798e 100644
--- a/src/components/tools/ShowAnnouncement.vue
+++ b/src/components/tools/ShowAnnouncement.vue
@@ -9,7 +9,8 @@
    >
     <template slot="footer">
       <a-button key="back" @click="handleCancel">关闭</a-button>
-      <a-button v-if="record.openType==='url'" type="primary" @click="toHandle">去处理</a-button>
+      <!-- url是当前页跳转，page新标签页跳转 -->
+      <a-button v-if="['url', 'page'].indexOf(record.openType) !== -1" type="primary" @click="toHandle">去处理</a-button>
     </template>
     <a-card class="daily-article" :loading="loading">
       <a-card-meta
@@ -81,6 +82,9 @@ export default {
         this.visible = false
         // 链接跳转
         this.$router.push({ path: this.record.openPage })
+      } else if (this.record.openType === 'page') {
+        this.visible = false
+        this.$openPageNewSheet({ path: this.record.openPage })
       }
     }
   }
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 19044af5..e689000a 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -201,6 +201,10 @@ export default {
         this.$router.push({ path: record.openPage })
         // 如果是跳转其他页面请求详情（作用是为了标记已读）
         getMsgDetail({ id: record.id })
+      } else if (record.openType === 'page') {
+        this.$openPageNewSheet({ path: record.openPage })
+        // 如果是跳转其他页面请求详情（作用是为了标记已读）
+        getMsgDetail({ id: record.id })
       } else {
         this.$router.push({
           path: '/isps/userAnnouncementDetail',