From 9075bd15f0d1793775a3df17b3324d1624d4c1cc Mon Sep 17 00:00:00 2001
From: 边少东 <2879594283@qq.com>
Date: Thu, 8 Dec 2022 14:36:08 +0800
Subject: [PATCH] feat：每日一习调整，添加视频列

---
 src/assets/main1.png             | Bin 0 -> 331086 bytes
 src/assets/main2.png             | Bin 0 -> 317390 bytes
 src/assets/main3.png             | Bin 0 -> 108138 bytes
 src/views/answerRank/stars.vue   |  2 +-
 src/views/dayStudy/dayStudy.vue  | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 src/views/dayStudy/studyList.vue | 63 ++++++++++++++++++++++++++++++++++-----------------------------
 6 files changed, 87 insertions(+), 63 deletions(-)
 create mode 100644 src/assets/main1.png
 create mode 100644 src/assets/main2.png
 create mode 100644 src/assets/main3.png

diff --git a/src/assets/main1.png b/src/assets/main1.png
new file mode 100644
index 0000000..3b5b1be
Binary files /dev/null and b/src/assets/main1.png differ
diff --git a/src/assets/main2.png b/src/assets/main2.png
new file mode 100644
index 0000000..7a21805
Binary files /dev/null and b/src/assets/main2.png differ
diff --git a/src/assets/main3.png b/src/assets/main3.png
new file mode 100644
index 0000000..6e8d044
Binary files /dev/null and b/src/assets/main3.png differ
diff --git a/src/views/answerRank/stars.vue b/src/views/answerRank/stars.vue
index 8b21c6e..480c793 100644
--- a/src/views/answerRank/stars.vue
+++ b/src/views/answerRank/stars.vue
@@ -78,7 +78,7 @@
         </div>
       </div>
     </div>
-    <tabbar4 active="yanxue"></tabbar4>
+    <!-- <tabbar4 active="yanxue"></tabbar4> -->
   </div>
 </template>
 
diff --git a/src/views/dayStudy/dayStudy.vue b/src/views/dayStudy/dayStudy.vue
index d6f39f0..efd69ae 100644
--- a/src/views/dayStudy/dayStudy.vue
+++ b/src/views/dayStudy/dayStudy.vue
@@ -1,12 +1,12 @@
 <template>
-    <div>
+    <div class="box">
         <div class="card" v-for="(v, i) in dataList" :key="i" @click="toPath(v)">
             <div class="card_pic">
                 <img :src="v.url" />
             </div>
             <div class="card_context">
-                <div class="title">建党百年党课</div>
-                <div class="group_font">走进红色故地，重温红色精神</div>
+                <div class="title">{{v.title}}</div>
+                <div class="group_font">{{v.greyTitle}}</div>
             </div>
         </div>
 
@@ -17,17 +17,31 @@
 <script>
 import Tabbar4 from "@/component/Tabbar4";
 import videoList from '@/views/dayStudy/data.json'
+import main1 from '@/assets/main1.png'
+import main2 from '@/assets/main2.png'
+import main3 from '@/assets/main3.png'
 export default {
     components: { Tabbar4 },
     data() {
         return {
             dataList: [
                 {
-                    url: "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/fe0668e6-ecd1-4df4-b416-f9bd6802c06c.png",
+                    url: main2,
+                    title: "研学红色历史 守好红色根脉",
+                    greyTitle: "红色研学实践成果",
                     path: 'studyList'
                 },
                 {
-                    url: "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/fe0668e6-ecd1-4df4-b416-f9bd6802c06c.png",
+                    url: main1,
+                    title: "重温总书记寄语 重走光辉百年路",
+                    greyTitle: "主题教育成果展示",
+                    path: 'YanxuePage'
+                },
+                {
+                    url: main3,
+                    title: "每日一题",
+                    greyTitle: "红色网上游知识竞赛",
+                    path: 'stars'
                 },
             ],
         };
@@ -42,36 +56,41 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.card {
-    width: 100vw;
-    height: 530px;
-    background-color: #fff;
-    margin-bottom: 30px;
-
-    .card_pic {
-        height: 400px;
-
-        img {
-            width: 100%;
-            height: 100%;
-        }
-    }
-    .card_context {
-        height: calc(530px - 400px);
-        padding: 20px 50px 10px;
-        box-sizing: border-box;
-        display: flex;
-        align-content: space-between;
-        flex-wrap: wrap;
+.box {
+    padding-bottom: 150px;
+    box-sizing: border-box;
 
-        .title {
-            width: 100%;
-            font-weight: bold;
-            font-size: 32px;
+    .card {
+        width: 100vw;
+        height: 535px;
+        background-color: #fff;
+        margin-bottom: 35px;
+    
+        .card_pic {
+            height: 400px;
+    
+            img {
+                width: 100%;
+                height: 100%;
+            }
         }
-        .group_font {
-            font-size: 28px;
-            color: #999;
+        .card_context {
+            height: calc(535px - 400px);
+            padding: 25px 50px 10px;
+            box-sizing: border-box;
+            display: flex;
+            align-content: space-between;
+            flex-wrap: wrap;
+    
+            .title {
+                width: 100%;
+                font-weight: bold;
+                font-size: 32px;
+            }
+            .group_font {
+                font-size: 28px;
+                color: #999;
+            }
         }
     }
 }
diff --git a/src/views/dayStudy/studyList.vue b/src/views/dayStudy/studyList.vue
index 0e0e4ae..45d771f 100644
--- a/src/views/dayStudy/studyList.vue
+++ b/src/views/dayStudy/studyList.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="box">
         <div class="card" v-for="(v, i) in videoList" :key="i" @click="toPath(v)">
             <div class="card_pic">
                 <img :src="v.url" />
@@ -35,36 +35,41 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.card {
-    width: 100vw;
-    height: 530px;
-    background-color: #fff;
-    margin-bottom: 30px;
+.box {
+    padding-bottom: 30px;
+    box-sizing: border-box;
 
-    .card_pic {
-        height: 400px;
-
-        img {
-            width: 100%;
-            height: 100%;
-        }
-    }
-    .card_context {
-        height: calc(530px - 400px);
-        padding: 20px 50px 10px;
-        box-sizing: border-box;
-        display: flex;
-        align-content: space-between;
-        flex-wrap: wrap;
-
-        .title {
-            width: 100%;
-            font-weight: bold;
-            font-size: 32px;
+    .card {
+        width: 100vw;
+        height: 535px;
+        background-color: #fff;
+        margin-bottom: 30px;
+    
+        .card_pic {
+            height: 400px;
+    
+            img {
+                width: 100%;
+                height: 100%;
+            }
         }
-        .group_font {
-            font-size: 28px;
-            color: #999;
+        .card_context {
+            height: calc(535px - 400px);
+            padding: 25px 50px 10px;
+            box-sizing: border-box;
+            display: flex;
+            align-content: space-between;
+            flex-wrap: wrap;
+    
+            .title {
+                width: 100%;
+                font-weight: bold;
+                font-size: 32px;
+            }
+            .group_font {
+                font-size: 28px;
+                color: #999;
+            }
         }
     }
 }
--
libgit2 0.21.0