From f0f15024c02813477199c1c2841ea6834322f15a Mon Sep 17 00:00:00 2001
From: ditiqi <ditiqi@163.com>
Date: Thu, 27 Feb 2025 09:28:16 +0800
Subject: [PATCH] afff

---
 .../main/courses/components/CourseCard.tsx    |   6 +-
 .../main/courses/components/FilterSection.tsx |  27 +---
 apps/web/src/app/main/layout/MainFooter.tsx   | 130 ++++++++++--------
 apps/web/src/app/main/layout/MainLayout.tsx   |   2 +-
 .../course/detail/CourseDetailLayout.tsx      |   2 +-
 .../detail/CourseSyllabus/CourseSyllabus.tsx  |   4 +-
 6 files changed, 80 insertions(+), 91 deletions(-)

diff --git a/apps/web/src/app/main/courses/components/CourseCard.tsx b/apps/web/src/app/main/courses/components/CourseCard.tsx
index 597caf0..fa4b0d5 100755
--- a/apps/web/src/app/main/courses/components/CourseCard.tsx
+++ b/apps/web/src/app/main/courses/components/CourseCard.tsx
@@ -87,11 +87,11 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) {
 					</div>
 				</div>
 				<div className="flex items-center gap-2">
-					<span className="text-xs font-medium text-gray-500 flex items-center">
+					<span className="gap-1 text-xs font-medium text-gray-500 flex items-center">
 						<EyeOutlined />
 						{`观看次数 ${course?.meta?.views || 0}`}
 					</span>
-					<span className="text-xs font-medium text-gray-500 flex items-center">
+					<span className="gap-1 text-xs font-medium text-gray-500 flex items-center">
 						<BookOutlined />
 						{`学习人数 ${course?.studentIds?.length || 0}`}
 					</span>
@@ -102,7 +102,7 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) {
 						size="large"
 						className="w-full shadow-[0_8px_20px_-6px_rgba(59,130,246,0.5)] hover:shadow-[0_12px_24px_-6px_rgba(59,130,246,0.6)] 
             transform hover:translate-y-[-2px] transition-all duration-500 ease-out">
-						{edit ? "进行编辑" : "立即学习"}
+						{edit ? "编辑" : "立即学习"}
 					</Button>
 				</div>
 			</div>
diff --git a/apps/web/src/app/main/courses/components/FilterSection.tsx b/apps/web/src/app/main/courses/components/FilterSection.tsx
index b437058..110ba8c 100755
--- a/apps/web/src/app/main/courses/components/FilterSection.tsx
+++ b/apps/web/src/app/main/courses/components/FilterSection.tsx
@@ -19,7 +19,7 @@ export default function FilterSection() {
 		});
 	};
 	return (
-		<div className="bg-white z-0 p-6 rounded-lg mt-4 shadow-sm w-1/6 space-y-6 h-[820px] fixed overscroll-contain overflow-x-hidden">
+		<div className=" flex z-0 p-6 flex-col rounded-lg mt-4   space-y-6 h-[820px]  overscroll-contain overflow-x-hidden">
 			{taxonomies?.map((tax, index) => {
 				const items = Object.entries(selectedTerms).find(
 					([key, items]) => key === tax.slug
@@ -31,7 +31,7 @@ export default function FilterSection() {
 						</h3>
 						<TermParentSelector
 							value={items}
-							slug = {tax?.slug}
+							slug={tax?.slug}
 							className="w-70 max-h-[400px] overscroll-contain overflow-x-hidden"
 							onChange={(selected) =>
 								handleTermChange(
@@ -39,27 +39,8 @@ export default function FilterSection() {
 									selected as string[]
 								)
 							}
-							taxonomyId={tax?.id}
-						></TermParentSelector>
-						{/* <TermSelect
-							// open
-							className="w-72"
-							value={items}
-							dropdownRender={(menu) => (
-								<div style={{ padding: "8px" }}>{menu}</div>
-							)}
-							dropdownStyle={{ maxHeight: 400, overflow: "auto" }}
-							multiple
-							taxonomyId={tax?.id}
-							onChange={(selected) =>
-								handleTermChange(
-									tax?.slug,
-									selected as string[]
-								)
-							}></TermSelect>
-						{index < taxonomies.length - 1 && (
-							<Divider className="my-6" />
-						)} */}
+							taxonomyId={tax?.id}></TermParentSelector>
+						<Divider></Divider>
 					</div>
 				);
 			})}
diff --git a/apps/web/src/app/main/layout/MainFooter.tsx b/apps/web/src/app/main/layout/MainFooter.tsx
index 9d060dc..5ebe46f 100755
--- a/apps/web/src/app/main/layout/MainFooter.tsx
+++ b/apps/web/src/app/main/layout/MainFooter.tsx
@@ -1,68 +1,76 @@
-import { CloudOutlined, FileSearchOutlined, HomeOutlined, MailOutlined, PhoneOutlined } from '@ant-design/icons';
+import {
+	CloudOutlined,
+	FileSearchOutlined,
+	HomeOutlined,
+	MailOutlined,
+	PhoneOutlined,
+} from "@ant-design/icons";
 
 export function MainFooter() {
-    return (
-        <footer className="bg-gradient-to-b from-slate-800 to-slate-900 z-20  text-secondary-200">
-            <div className="container mx-auto px-4 py-6">
-                <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                    {/* 开发组织信息 */}
-                    <div className="text-center md:text-left space-y-2">
-                        <h3 className="text-white font-semibold text-sm flex items-center justify-center md:justify-start">
-                            软件与数据小组
-                        </h3>
-                        <p className="text-gray-400 text-xs italic">
-                            提供技术支持
-                        </p>
-                    </div>
+	return (
+		<footer className="bg-gradient-to-b from-slate-800 to-slate-900 relative z-50 text-secondary-200">
+			<div className="container mx-auto px-4 py-6">
+				<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+					{/* 开发组织信息 */}
+					<div className="text-center md:text-left space-y-2">
+						<h3 className="text-white font-semibold text-sm flex items-center justify-center md:justify-start">
+							软件与数据小组
+						</h3>
+						<p className="text-gray-400 text-xs italic">
+							提供技术支持
+						</p>
+					</div>
 
-                    {/* 联系方式 */}
-                    <div className="text-center space-y-2">
-                        <div className="flex items-center justify-center space-x-2">
-                            <PhoneOutlined className="text-gray-400" />
-                            <span className="text-gray-300 text-xs">628118</span>
-                        </div>
-                        <div className="flex items-center justify-center space-x-2">
-                            <MailOutlined className="text-gray-400" />
-                            <span className="text-gray-300 text-xs">gcsjs6@tx3l.nb.kj</span>
-                        </div>
-                    </div>
+					{/* 联系方式 */}
+					<div className="text-center space-y-2">
+						<div className="flex items-center justify-center space-x-2">
+							<PhoneOutlined className="text-gray-400" />
+							<span className="text-gray-300 text-xs">
+								628118
+							</span>
+						</div>
+						<div className="flex items-center justify-center space-x-2">
+							<MailOutlined className="text-gray-400" />
+							<span className="text-gray-300 text-xs">
+								gcsjs6@tx3l.nb.kj
+							</span>
+						</div>
+					</div>
 
-                    {/* 系统链接 */}
-                    <div className="text-center md:text-right space-y-2">
-                        <div className="flex items-center justify-center md:justify-end space-x-4">
-                            <a
-                                href="https://27.57.72.21"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问门户网站"
-                            >
-                                <HomeOutlined className="text-lg" />
-                            </a>
-                            <a
-                                href="https://27.57.72.14"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问烽火青云"
-                            >
-                                <CloudOutlined className="text-lg" />
-                            </a>
+					{/* 系统链接 */}
+					<div className="text-center md:text-right space-y-2">
+						<div className="flex items-center justify-center md:justify-end space-x-4">
+							<a
+								href="https://27.57.72.21"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问门户网站">
+								<HomeOutlined className="text-lg" />
+							</a>
+							<a
+								href="https://27.57.72.14"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问烽火青云">
+								<CloudOutlined className="text-lg" />
+							</a>
 
-                            <a
-                                href="http://27.57.72.38"
-                                className="text-gray-400 hover:text-white transition-colors"
-                                title="访问烽火律询"
-                            >
-                                <FileSearchOutlined className="text-lg" />
-                            </a>
-                        </div>
-                    </div>
-                </div>
+							<a
+								href="http://27.57.72.38"
+								className="text-gray-400 hover:text-white transition-colors"
+								title="访问烽火律询">
+								<FileSearchOutlined className="text-lg" />
+							</a>
+						</div>
+					</div>
+				</div>
 
-                {/* 版权信息 */}
-                <div className="border-t border-gray-700/50 mt-4 pt-4 text-center">
-                    <p className="text-gray-400 text-xs">
-                        © {new Date().getFullYear()} 南天烽火. All rights reserved.
-                    </p>
-                </div>
-            </div>
-        </footer>
-    );
+				{/* 版权信息 */}
+				<div className="border-t border-gray-700/50 mt-4 pt-4 text-center">
+					<p className="text-gray-400 text-xs">
+						© {new Date().getFullYear()} 南天烽火. All rights
+						reserved.
+					</p>
+				</div>
+			</div>
+		</footer>
+	);
 }
diff --git a/apps/web/src/app/main/layout/MainLayout.tsx b/apps/web/src/app/main/layout/MainLayout.tsx
index f5b462b..fa6627a 100755
--- a/apps/web/src/app/main/layout/MainLayout.tsx
+++ b/apps/web/src/app/main/layout/MainLayout.tsx
@@ -11,7 +11,7 @@ export function MainLayout() {
 		<MainProvider>
 			<div className=" min-h-screen  bg-gray-100">
 				<MainHeader />
-				<Content className=" pt-20 bg-gray-50   ">
+				<Content className="min-h-screen flex-grow pt-12 bg-gray-50   ">
 					<Outlet />
 				</Content>
 				<MainFooter />
diff --git a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
index cac3bf8..56831e4 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
@@ -24,7 +24,7 @@ export default function CourseDetailLayout() {
 			{/* 添加 Header 组件 */}
 			{/* 主内容区域 */}
 			{/* 为了防止 Header 覆盖内容，添加上边距 */}
-			<div className="pt-16 px-32">
+			<div className="pt-12 px-32">
 				{" "}
 				{/* 添加这个包装 div */}
 				<motion.div
diff --git a/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx b/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
index 10b756a..07b704a 100755
--- a/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
+++ b/apps/web/src/components/models/course/detail/CourseSyllabus/CourseSyllabus.tsx
@@ -58,9 +58,9 @@ export const CourseSyllabus: React.FC<CourseSyllabusProps> = ({
 				style={{
 					width: isOpen ? "25%" : "0",
 					right: 0,
-					top: isHeaderVisible ? "64px" : "0",
+					top: isHeaderVisible ? "56px" : "0",
 				}}
-				className="fixed top-0 bottom-0 z-20 bg-white shadow-xl">
+				className="fixed top-0 bottom-0 z-10 bg-white shadow-xl">
 				{isOpen && (
 					<div className="h-full flex flex-col">
 						<SyllabusHeader onToggle={onToggle} />