From ba5af1eae2517bf672c06e70e9fe23773b497d02 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Wed, 30 Aug 2023 10:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E5=B8=88=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal.scss           | 10 ++++++
 src/views/grateful/GratefulHomePage.vue | 15 +++++----
 src/views/grateful/GratefulNotice.vue   |  4 +--
 src/views/grateful/NoticeDetail.vue     |  4 +--
 src/views/grateful/ToolDown.vue         |  4 +--
 src/views/grateful/index.vue            | 41 ++++++++++++++++++++-----
 6 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index 93015bdd..22966332 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -473,9 +473,13 @@ body {margin: 0px;padding: 0px;}
   .xcontent{width: 1366px;}
   .xcontent2{
     width: 1366px;
+    //后添加的教师节
     .list {
       grid-template-columns: repeat(4, 332px);
     }
+    .liList{
+      margin-top: 10px;
+    }
   }
   .rankimg{
     width:76px;
@@ -522,6 +526,9 @@ body {margin: 0px;padding: 0px;}
     .list {
       grid-template-columns: repeat(4, 400px);
     }
+    .liList{
+      margin-top: 24px;
+    }
   }
   .rankimg{
     width:86px;
@@ -567,6 +574,9 @@ body {margin: 0px;padding: 0px;}
     .list {
       grid-template-columns: repeat(4, 445px);
     }
+    .liList{
+      margin-top: 32px;
+    }
   }
   .home-page-right{
     width: 395px;
diff --git a/src/views/grateful/GratefulHomePage.vue b/src/views/grateful/GratefulHomePage.vue
index 47fd54aa..0780c810 100644
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/src/views/grateful/GratefulHomePage.vue
@@ -15,9 +15,9 @@
                     <p class="ranking-title">通知</p>
                     <router-link to="/grateful/gratefulNotice" style="font-size: 14px;">查看更多</router-link>
                   </div>
-                  <ul class="ranking-data">
+                  <ul>
                     <li v-for="(item, index) in 6" :key="index"
-                      style="cursor: pointer;margin-top:10px;line-height: 22px;">
+                      style="cursor: pointer;line-height: 22px;" class="liList">
                       <router-link :to="'/case/detail?id=' + item.id" style="display: flex;align-items: center;">
                         <span class="portal-right-text blue-one">
                           <img :src="getPic(index)" alt="">
@@ -40,9 +40,9 @@
                     <p class="ranking-title">工具下载</p>
                     <router-link to="/grateful/toolDown" style="font-size: 14px;">查看更多</router-link>
                   </div>
-                  <ul class="ranking-data">
-                    <li v-for="(item, index) in 6" :key="index" style="cursor: pointer;margin-top:10px;line-height: 22px;"
-                      class="title-line-ellipsis">
+                  <ul>
+                    <li v-for="(item, index) in 6"  :key="index" style="cursor: pointer;line-height: 22px;"
+                      class="title-line-ellipsis liList">
                       <router-link :to="'/case/detail?id=' + item.id">
                         <span class="portal-right-text orange-one" v-if="index == 0">
                           <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
@@ -290,9 +290,8 @@ export default {
 
 .gratefulNav {
   display: grid;
-  grid-template-columns: 1.6fr 1fr 1fr;
-  column-gap: 60px;
-
+  grid-template-columns: 1.5fr 1fr 1fr;
+  column-gap: 40px;
   .navImg {
     img {
       width: 100%;
diff --git a/src/views/grateful/GratefulNotice.vue b/src/views/grateful/GratefulNotice.vue
index fb91475b..b3db6791 100644
--- a/src/views/grateful/GratefulNotice.vue
+++ b/src/views/grateful/GratefulNotice.vue
@@ -24,7 +24,7 @@
 
           </div>
         </div>
-        <div class="xcontent2-minor" style="margin-left: 25px;">
+        <!-- <div class="xcontent2-minor" style="margin-left: 25px;">
           <div class="portal-ranking ranking-bg">
             <p class="ranking-title">教师赋能排行榜</p>
             <ul class="xindex-ranking-course">
@@ -39,7 +39,7 @@
               </li>
             </ul>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
diff --git a/src/views/grateful/NoticeDetail.vue b/src/views/grateful/NoticeDetail.vue
index 515310f2..d7e117d0 100644
--- a/src/views/grateful/NoticeDetail.vue
+++ b/src/views/grateful/NoticeDetail.vue
@@ -20,7 +20,7 @@
             <div class="noticeContent">--内容列表内容--</div>
           </div>
         </div>
-        <div class="xcontent2-minor" style="margin-left: 25px">
+        <!-- <div class="xcontent2-minor" style="margin-left: 25px">
           <div class="portal-ranking ranking-bg">
             <p class="ranking-title">重要通知</p>
             <ul class="xindex-ranking-course">
@@ -35,7 +35,7 @@
               </li>
             </ul>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
diff --git a/src/views/grateful/ToolDown.vue b/src/views/grateful/ToolDown.vue
index 788b8a87..4d020690 100644
--- a/src/views/grateful/ToolDown.vue
+++ b/src/views/grateful/ToolDown.vue
@@ -25,7 +25,7 @@
             </pagination>
           </div>
         </div>
-        <div class="xcontent2-minor" style="margin-left: 25px">
+        <!-- <div class="xcontent2-minor" style="margin-left: 25px">
           <div class="portal-ranking ranking-bg">
             <p class="ranking-title">教师赋能排行榜</p>
             <ul class="xindex-ranking-course">
@@ -40,7 +40,7 @@
               </li>
             </ul>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
diff --git a/src/views/grateful/index.vue b/src/views/grateful/index.vue
index ffa5f6d1..7180d9b5 100644
--- a/src/views/grateful/index.vue
+++ b/src/views/grateful/index.vue
@@ -1,7 +1,15 @@
 <template>
   <div>
-    <div class="grateful header" v-if="$route.meta.hidden">
-      <img src="../../assets/images/grateful/gratefulbanner.png" alt="" />
+    <div class="grateful header" style="margin-bottom:30px" v-if="$route.meta.hidden">
+      <div class="portal-header">
+        <div class="portal-top" style="color: #fff;">
+          <div class="portal-top-left">
+            <div class="portal-top-logo">
+              <img src="../../assets/logo/logo-white.png" style="width:160px;height: 27px;" />
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="course-banner" v-if="!$route.meta.hidden">
       <div id="container" style="z-index: 99" v-if="resonimg.length == 1">
@@ -97,12 +105,31 @@ export default {
 }
 
 .header {
-  &::before {
-    content: url('../../assets/images/grateful/logo.png');
-    position: absolute;
-    top: 30px;
-    left: 40px;
+  height: 240px;
+  background: url('../../../public/images/courseBg.png') no-repeat;
+  background-size: 100% 100%;
+  .portal-header {
+    height: 72px;
+    display: flex;
+    background: rgba(255, 255, 255, 0.1);
+    border: 1px solid rgba(61, 61, 61, 0.15);
+    backdrop-filter: blur(10px);
+
+    .portal-top {
+      width: 100%;
+      margin: 0px 40px;
+      display: flex;
+      justify-content: space-between;
+
+      .portal-top-left {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+      }
+    }
   }
+
+
 }
 
 .bannbox {