From 9d54dd48655b4eb0e18fec6d2a44df58db7a5a05 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Mon, 6 Jul 2020 17:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85-=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9=E5=BC=82=E5=B8=B8=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC=E6=97=B6=E6=8E=92=E7=89=88=E9=94=99=E4=B9=B1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=20=E9=80=9A=E7=9F=A5=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A-=E6=8E=92=E7=89=88=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpages/home/pages/newsDetail/newsDetail.wxss         | 1 +
 .../subpages/home/pages/notice/notice.wxss                 | 7 ++++++-
 epdc-resident-mp-yushan/utils/util.js                      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epdc-resident-mp-yushan/subpages/home/pages/newsDetail/newsDetail.wxss b/epdc-resident-mp-yushan/subpages/home/pages/newsDetail/newsDetail.wxss
index a84887f..e7ebfd1 100644
--- a/epdc-resident-mp-yushan/subpages/home/pages/newsDetail/newsDetail.wxss
+++ b/epdc-resident-mp-yushan/subpages/home/pages/newsDetail/newsDetail.wxss
@@ -24,6 +24,7 @@
   line-height: 68rpx;
   color: #333333;
   padding-top: 40rpx;
+  word-break: break-all;
 }
 .detail-subtitle {
   display: flex;
diff --git a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxss b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxss
index fa08f58..d8dc2b5 100644
--- a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxss
+++ b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxss
@@ -1,6 +1,11 @@
+page {
+  width: 100%;
+  height: auto;
+  overflow-y: auto;
+  background: #f7f7f7;
+}
 .notice {
   width: 100%;
-  height: 100vh;
   background: #f7f7f7;
 }
 .nav {
diff --git a/epdc-resident-mp-yushan/utils/util.js b/epdc-resident-mp-yushan/utils/util.js
index b58ea36..8883cfd 100644
--- a/epdc-resident-mp-yushan/utils/util.js
+++ b/epdc-resident-mp-yushan/utils/util.js
@@ -15,7 +15,7 @@ const formatNumber = n => {
 }
 
 const formatRichText = html => {
-  let newContent= html.replace(/\<img/gi, '<img style="width:100%;height:auto;display:block;"');
+  let newContent= html.replace(/\<img/gi, '<img style="width:100%;height:auto;display:block;"').replace(/\<div style=\"/gi,'<div style="width:100%;word-break:break-all;word-wrap:normal;').replace(/\s{2,}/g,"")
   return newContent
 }