From aa9720c3b86516cb12ffbaaa2d700f8079c1d0d6 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Thu, 7 Sep 2023 10:55:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue        | 2 +-
 src/layout/components/TopNav/Index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 816b1695..f001a465 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -243,7 +243,7 @@ export default {
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
           five: urlPre + "/boe/new-employee/index.html",
           six: urlPre + "/web/contributor/index",
-          seven:this.webBaseUrl + '/grateful'
+          seven: this.webBaseUrl + '/grateful/index'
         };
         window.open(obj[val]);
       }
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index aaed1f99..3df8ad38 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -268,7 +268,7 @@ export default {
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
           five: urlPre + "/boe/new-employee/index.html",
-          seven: this.webBaseUrl + '/grateful'
+          seven: this.webBaseUrl + '/grateful/index'
         };
         window.open(obj[val]);
       }

From 0a37fab1574f7e0c9e35debcecd2284738975f63 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Thu, 7 Sep 2023 11:56:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/grateful/GratefulHomePage.vue | 4 ++--
 src/views/grateful/NoticeDetail.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/grateful/GratefulHomePage.vue b/src/views/grateful/GratefulHomePage.vue
index 373ddff0..ea0989d4 100644
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/src/views/grateful/GratefulHomePage.vue
@@ -10,7 +10,7 @@
               background: `url(${fileBaseUrl + item.image
                 }) no-repeat 100% / 100%`,
             }"></div>
-            <img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" />
+            <img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
           </swiper-slide>
         </swiper>
       </div>
@@ -22,7 +22,7 @@
               background: `url(${fileBaseUrl + item.image
                 }) no-repeat 100% / 100%`,
             }"></div>
-            <img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" />
+            <img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
           </swiper-slide>
           <div class="swiper-pagination" slot="pagination"></div>
         </swiper>
diff --git a/src/views/grateful/NoticeDetail.vue b/src/views/grateful/NoticeDetail.vue
index 92103511..5f0ebb2b 100644
--- a/src/views/grateful/NoticeDetail.vue
+++ b/src/views/grateful/NoticeDetail.vue
@@ -23,7 +23,7 @@
               <div class="title">{{ name }}</div>
               <!--内容列表内容-->
               <div class="timeAndAuthor">
-                <div class="author">发布人：{{ createName }}</div>
+                <!-- <div class="author">发布人：{{ createName }}</div> -->
                 <div class="case-info-date portal-time">
                   <i class="el-icon-time" style="margin-right: 5px;"></i>
                   <time-show :time="createTime"></time-show>

From 0c0b6bd67f22ab6bd0c38b9a2e7a4e3d2836c463 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Thu, 7 Sep 2023 14:09:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/grateful/NoticeDetail.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 src/views/grateful/NoticeDetail.vue

diff --git a/src/views/grateful/NoticeDetail.vue b/src/views/grateful/NoticeDetail.vue
old mode 100644
new mode 100755
index 5f0ebb2b..550d27f5
--- a/src/views/grateful/NoticeDetail.vue
+++ b/src/views/grateful/NoticeDetail.vue
@@ -29,7 +29,7 @@
                   <time-show :time="createTime"></time-show>
                 </div>
               </div>
-              <div class="topTitle">通知内容</div>
+              <div class="topTitle"></div>
               <!-- <div class="noticeContent" style="white-space: pre;">{{ content }}</div> -->
               <div class="noticeContent" v-html="content"></div>
             </div>
@@ -137,11 +137,8 @@ export default {
   }
 
   .topTitle {
-    display: flex;
-    justify-content: center;
-    font-size: 18px;
-    font-weight: 600;
-    margin-bottom: 30px;
+    width: 100%;
+    height: 50px;
   }
 
   .noticeContent {

From 558f44ccc70a1177d0842df762a2d288e01aa7f2 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Thu, 7 Sep 2023 14:29:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/grateful/NoticeDetail.vue | 6 ++++++
 1 file changed, 6 insertions(+)
 mode change 100755 => 100644 src/views/grateful/NoticeDetail.vue

diff --git a/src/views/grateful/NoticeDetail.vue b/src/views/grateful/NoticeDetail.vue
old mode 100755
new mode 100644
index 550d27f5..a2e2b166
--- a/src/views/grateful/NoticeDetail.vue
+++ b/src/views/grateful/NoticeDetail.vue
@@ -120,6 +120,7 @@ export default {
     .title {
       font-weight: 600;
       padding: 20px;
+      font-size: 28px;
       display: flex;
       justify-content: space-between;
     }
@@ -143,6 +144,11 @@ export default {
 
   .noticeContent {
     padding: 0 80px;
+
+    ::v-deep p {
+      min-height: 28px !important;
+      line-height: 28px !important;
+    }
   }
 }
 </style>