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 @@
-
+
+ {{ helpMessage }}
+
@@ -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;
+ }
}
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 @@
-
- 【{{ announcement.subject }}】
- {{ announcement.content }}
+
【{{ announcement.subject }}】
+ {{ announcement.content }}
{{ $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 {