From e5791c184dcc05fb8a7b17169be92123bf722484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 31 Mar 2022 14:58:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=AC=E5=91=8A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Announcement/index.vue        | 1 +
 src/layout/components/Page/index.vue         | 9 +++++++--
 src/views/myhome/components/Announcement.vue | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/Announcement/index.vue b/src/components/Announcement/index.vue
index f10afa7c6..b916e1c5e 100644
--- a/src/components/Announcement/index.vue
+++ b/src/components/Announcement/index.vue
@@ -60,6 +60,7 @@ export default {
 }
 .announcement-main {
   word-wrap:break-word;
+  white-space: pre-wrap;
 }
 .link-more {
   font-size: 10px;
diff --git a/src/layout/components/Page/index.vue b/src/layout/components/Page/index.vue
index 45dd844f4..b69380fa3 100644
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -7,7 +7,9 @@
       </template>
     </PageHeading>
     <PageContent>
-      <el-alert v-if="helpMessage" type="success"> <span v-html="helpMessage" /> </el-alert>
+      <el-alert v-if="helpMessage" type="success">
+        <span class="announcement-main">{{ helpMessage }}</span>
+      </el-alert>
       <slot />
     </PageContent>
   </div>
@@ -34,7 +36,6 @@ export default {
   },
   computed: {
     iTitle() {
-      // return ''
       return this.title || this.$route.meta.title
     }
   }
@@ -52,5 +53,9 @@ export default {
   .print-margin{
     margin-top: 10px;
   }
+  .announcement-main {
+    word-wrap:break-word;
+    white-space: pre-wrap;
+  }
 }
 </style>
diff --git a/src/views/myhome/components/Announcement.vue b/src/views/myhome/components/Announcement.vue
index 72083e9ed..0384805ab 100644
--- a/src/views/myhome/components/Announcement.vue
+++ b/src/views/myhome/components/Announcement.vue
@@ -5,8 +5,8 @@
     </div>
     <ul class="content">
       <li v-if="announcement.content" class="item">
-        <span class="item-title">【{{ announcement.subject }}】</span>
-        <span>{{ announcement.content }}</span>
+        <p class="item-title">【{{ announcement.subject }}】</p>
+        <p class="item-content">{{ announcement.content }}</p>
         <span v-if="announcement.link">
           <el-link :href="announcement.link" target="_blank" class="item-url">
             {{ $t('common.ViewMore') }}
@@ -70,6 +70,11 @@ ul,li {
       text-align: center;
       font-size: 15px;
       vertical-align: middle;
+      margin-left: -10px;
+    }
+    .item-content {
+      white-space: pre-wrap;
+      margin: 0;
     }
   }
   .item-url {