From 8566038c444ea4f881a7cfd433021d404071811a Mon Sep 17 00:00:00 2001
From: lenghui <h280650@163.com>
Date: Thu, 5 Dec 2024 11:12:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=8A=B6=E6=80=81=E7=A0=81=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vueHomilyLink/src/views/LiveView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vueHomilyLink/src/views/LiveView.vue b/vueHomilyLink/src/views/LiveView.vue
index 5571872..56400e5 100644
--- a/vueHomilyLink/src/views/LiveView.vue
+++ b/vueHomilyLink/src/views/LiveView.vue
@@ -41,8 +41,8 @@ const liveList = ref({});
 function getLive() {
     liveApi.getLiveList()
         .then(resp => {
-            if(resp.code == 0){
-                liveList.value = resp.data.liveList;
+            if(resp.code == 200){
+                liveList.value = resp.data;
                 console.log(liveList.value);
             }else{
                 ElMessage.error('获取直播列表失败');

From 3c8ffbba222021980199b77eb7947f5449414903 Mon Sep 17 00:00:00 2001
From: lenghui <h280650@163.com>
Date: Thu, 5 Dec 2024 11:49:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vueHomilyLink/src/components/Nav.vue | 38 ++++++++++++++++++++++--------------
 vueHomilyLink/src/views/HomeView.vue |  1 +
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/vueHomilyLink/src/components/Nav.vue b/vueHomilyLink/src/components/Nav.vue
index c97bcc8..5f90119 100644
--- a/vueHomilyLink/src/components/Nav.vue
+++ b/vueHomilyLink/src/components/Nav.vue
@@ -4,30 +4,38 @@
 
 <template>
     <div class="nav">
-        <div class="container">
-        <router-link to="/">首页</router-link>
-        <router-link to="/channel">频道</router-link>
-        <router-link to="/bogu">俱乐部</router-link>
-        <router-link to="/live">直播</router-link>
-        </div>
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+            background-color="rgb(197.7, 225.9, 255)" text-color="#fff" active-text-color="#ffd04b"
+            :router="true">
+            <el-menu-item index="/">首页</el-menu-item>
+            <el-menu-item index="/channel">频道</el-menu-item>
+            <el-menu-item index="/bogu">俱乐部</el-menu-item>
+            <el-menu-item index="/live">直播</el-menu-item>
+        </el-menu>
     </div>
 </template>
 
 <style scoped>
-.nav{
-    background-color: rgba(177, 174, 159, 0.493); 
-    height: 30px;
+.nav {
+    background-color: rgba(177, 174, 159, 0.493);
+    height: 40px;
     border-bottom: 1px solid #aaa;
     width: 1000px;
     margin-right: auto;
     margin-left: auto;
 }
-.container{
+
+.container {
     width: 1200px;
 }
-a{
-        margin-right: 40px;
-        margin-left: 50px;
-        color: black;
-    }
+
+a {
+    margin-right: 40px;
+    margin-left: 50px;
+    color: black;
+}
+
+.el-menu--horizontal {
+  --el-menu-horizontal-height: 40px;
+}
 </style>
\ No newline at end of file
diff --git a/vueHomilyLink/src/views/HomeView.vue b/vueHomilyLink/src/views/HomeView.vue
index cff47a3..b4ec13e 100644
--- a/vueHomilyLink/src/views/HomeView.vue
+++ b/vueHomilyLink/src/views/HomeView.vue
@@ -309,6 +309,7 @@ body {
         .class123{
             /*让页面分为左右结构*/
             display: flex;
+            margin-top: 30px
         }
 
         .corner-mark {

From d309de80fcb5d328399be02ee93fbd4e9aa3c8c3 Mon Sep 17 00:00:00 2001
From: lenghui <h280650@163.com>
Date: Thu, 5 Dec 2024 11:53:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vueHomilyLink/src/views/LiveView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vueHomilyLink/src/views/LiveView.vue b/vueHomilyLink/src/views/LiveView.vue
index 56400e5..557674f 100644
--- a/vueHomilyLink/src/views/LiveView.vue
+++ b/vueHomilyLink/src/views/LiveView.vue
@@ -100,7 +100,7 @@ function cancelBooking(liveId, userId) {
     margin-left: auto;
     margin-right: auto;
     /*宽度*/
-    width: 916px;
+    width: 1000px;
     font-family: Arial, sans-serif;
     padding: 0;
     flex-wrap: wrap;
@@ -113,7 +113,7 @@ function cancelBooking(liveId, userId) {
     background-color: #fff;
     border-radius: 8px;
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-    margin: 10px;
+    margin: 20px;
     overflow: hidden;
     border: #666;
     height: 190px;