diff --git a/src/assets/font/Unitext-BlackItalic.TTF b/src/assets/font/Unitext-BlackItalic.TTF new file mode 100644 index 0000000..5cb1d4d Binary files /dev/null and b/src/assets/font/Unitext-BlackItalic.TTF differ diff --git a/src/assets/images/CompanyJobsPage/btn_icon.png b/src/assets/images/CompanyJobsPage/btn_icon.png index 21fb968..3a3815a 100644 Binary files a/src/assets/images/CompanyJobsPage/btn_icon.png and b/src/assets/images/CompanyJobsPage/btn_icon.png differ diff --git a/src/assets/images/CompanyJobsPage/jobs_page_left_list_item_bg.png b/src/assets/images/CompanyJobsPage/jobs_page_left_list_item_bg.png new file mode 100644 index 0000000..ec42482 Binary files /dev/null and b/src/assets/images/CompanyJobsPage/jobs_page_left_list_item_bg.png differ diff --git a/src/assets/images/CompanyJobsPage/process_wrapper_close_bg.png b/src/assets/images/CompanyJobsPage/process_wrapper_close_bg.png new file mode 100644 index 0000000..d55c004 Binary files /dev/null and b/src/assets/images/CompanyJobsPage/process_wrapper_close_bg.png differ diff --git a/src/assets/images/Dashboard/QuickAccess/quick_access_title_icon.png b/src/assets/images/Dashboard/QuickAccess/quick_access_title_icon.png new file mode 100644 index 0000000..3287535 Binary files /dev/null and b/src/assets/images/Dashboard/QuickAccess/quick_access_title_icon.png differ diff --git a/src/assets/images/Dashboard/StartClass/start_class_bg.png b/src/assets/images/Dashboard/StartClass/start_class_bg.png index 17c24ad..0572b99 100644 Binary files a/src/assets/images/Dashboard/StartClass/start_class_bg.png and b/src/assets/images/Dashboard/StartClass/start_class_bg.png differ diff --git a/src/assets/images/Dashboard/StartClass/start_class_title_icon.png b/src/assets/images/Dashboard/StartClass/start_class_title_icon.png new file mode 100644 index 0000000..cdb6b1c Binary files /dev/null and b/src/assets/images/Dashboard/StartClass/start_class_title_icon.png differ diff --git a/src/assets/images/Dashboard/StudyStatus/study-status_bg.png b/src/assets/images/Dashboard/StudyStatus/study-status_bg.png new file mode 100644 index 0000000..b7bc414 Binary files /dev/null and b/src/assets/images/Dashboard/StudyStatus/study-status_bg.png differ diff --git a/src/assets/images/Dashboard/StudyStatus/study-status_title_icon.png b/src/assets/images/Dashboard/StudyStatus/study-status_title_icon.png new file mode 100644 index 0000000..48de141 Binary files /dev/null and b/src/assets/images/Dashboard/StudyStatus/study-status_title_icon.png differ diff --git a/src/assets/images/Rank/bg.png b/src/assets/images/Rank/bg.png new file mode 100644 index 0000000..b330ca8 Binary files /dev/null and b/src/assets/images/Rank/bg.png differ diff --git a/src/assets/images/Rank/title_icon.png b/src/assets/images/Rank/title_icon.png new file mode 100644 index 0000000..02f0047 Binary files /dev/null and b/src/assets/images/Rank/title_icon.png differ diff --git a/src/assets/images/Sidebar/sidebar_icon.png b/src/assets/images/Sidebar/sidebar_icon.png new file mode 100644 index 0000000..c41ff0e Binary files /dev/null and b/src/assets/images/Sidebar/sidebar_icon.png differ diff --git a/src/assets/images/Sidebar/sidebar_menu_item_active_bg .png b/src/assets/images/Sidebar/sidebar_menu_item_active_bg .png new file mode 100644 index 0000000..153dc29 Binary files /dev/null and b/src/assets/images/Sidebar/sidebar_menu_item_active_bg .png differ diff --git a/src/assets/images/Sidebar/visitor_count_bg.png b/src/assets/images/Sidebar/visitor_count_bg.png new file mode 100644 index 0000000..6a3aa08 Binary files /dev/null and b/src/assets/images/Sidebar/visitor_count_bg.png differ diff --git a/src/assets/images/StageProgress/active_bg.png b/src/assets/images/StageProgress/active_bg.png new file mode 100644 index 0000000..e7d175b Binary files /dev/null and b/src/assets/images/StageProgress/active_bg.png differ diff --git a/src/assets/images/StageProgress/star.png b/src/assets/images/StageProgress/star.png deleted file mode 100644 index 052e6de..0000000 Binary files a/src/assets/images/StageProgress/star.png and /dev/null differ diff --git a/src/assets/images/StageProgress/star_active.png b/src/assets/images/StageProgress/star_active.png deleted file mode 100644 index 326ec6b..0000000 Binary files a/src/assets/images/StageProgress/star_active.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step1.png b/src/assets/images/StageProgress/step1.png deleted file mode 100644 index b238e76..0000000 Binary files a/src/assets/images/StageProgress/step1.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step1_active.png b/src/assets/images/StageProgress/step1_active.png index a70f544..236e007 100644 Binary files a/src/assets/images/StageProgress/step1_active.png and b/src/assets/images/StageProgress/step1_active.png differ diff --git a/src/assets/images/StageProgress/step2.png b/src/assets/images/StageProgress/step2.png deleted file mode 100644 index ca587e9..0000000 Binary files a/src/assets/images/StageProgress/step2.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step2_active.png b/src/assets/images/StageProgress/step2_active.png deleted file mode 100644 index b00c29f..0000000 Binary files a/src/assets/images/StageProgress/step2_active.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step3.png b/src/assets/images/StageProgress/step3.png deleted file mode 100644 index 564eeb5..0000000 Binary files a/src/assets/images/StageProgress/step3.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step3_active.png b/src/assets/images/StageProgress/step3_active.png deleted file mode 100644 index 13bcd9b..0000000 Binary files a/src/assets/images/StageProgress/step3_active.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step4.png b/src/assets/images/StageProgress/step4.png deleted file mode 100644 index daf0ae0..0000000 Binary files a/src/assets/images/StageProgress/step4.png and /dev/null differ diff --git a/src/assets/images/StageProgress/step4_active.png b/src/assets/images/StageProgress/step4_active.png index 43060ab..f1db620 100644 Binary files a/src/assets/images/StageProgress/step4_active.png and b/src/assets/images/StageProgress/step4_active.png differ diff --git a/src/assets/images/StageProgress/step4_default.png b/src/assets/images/StageProgress/step4_default.png new file mode 100644 index 0000000..b3a09c4 Binary files /dev/null and b/src/assets/images/StageProgress/step4_default.png differ diff --git a/src/assets/images/StageProgress/step_active.png b/src/assets/images/StageProgress/step_active.png new file mode 100644 index 0000000..5d61534 Binary files /dev/null and b/src/assets/images/StageProgress/step_active.png differ diff --git a/src/assets/images/StageProgress/step_default.png b/src/assets/images/StageProgress/step_default.png new file mode 100644 index 0000000..c790f38 Binary files /dev/null and b/src/assets/images/StageProgress/step_default.png differ diff --git a/src/components/CoursesVideoPlayer/index.css b/src/components/CoursesVideoPlayer/index.css index ad7f9e8..d0404eb 100644 --- a/src/components/CoursesVideoPlayer/index.css +++ b/src/components/CoursesVideoPlayer/index.css @@ -1,5 +1,5 @@ .courses-video-player-wrapper { - width: 800px; + width: 836px; height: 798px; position: relative; @@ -10,7 +10,7 @@ } .courses-video-player { - width: 800px; + width: 100%; height: 545px; box-sizing: border-box; padding: 16px; @@ -55,7 +55,7 @@ } .courses-video-player-info { margin-top: 20px; - width: 800px; + width: 100%; height: 234px; border: 2px solid #fff; border-radius: 8px; @@ -67,7 +67,7 @@ align-items: center; .courses-video-player-audience-info { - width: 272px; + width: 308px; height: 100%; padding: 0 10px; border-right: 1px solid #f2f3f5; diff --git a/src/components/Rank/index.css b/src/components/Rank/index.css index 92939c4..e64e656 100644 --- a/src/components/Rank/index.css +++ b/src/components/Rank/index.css @@ -1,7 +1,7 @@ .module-class-rank { width: 360px; height: 413px; - background-color: #fff; + background-color: #fff7f1; border-radius: 16px; margin-right: 20px; border: 1px solid #fff; @@ -13,6 +13,18 @@ flex-direction: column; align-items: center; justify-content: flex-start; + position: relative; + + &::after { + content: ""; + width: 180px; + height: 110px; + position: absolute; + right: 0; + top: 0; + background-image: url("@/assets/images/Rank/bg.png"); + background-size: 100% 100%; + } .module-class-rank-title { height: 30px; @@ -21,6 +33,21 @@ font-weight: 500; line-height: 30px; color: #262626; + position: relative; + box-sizing: border-box; + padding-left: 30px; + + &::before { + position: absolute; + left: 0; + top: 50%; + transform: translateY(-50%); + width: 24px; + height: 24px; + content: ""; + background-image: url("@/assets/images/Rank/title_icon.png"); + background-size: 100% 100%; + } } .module-class-rank-spin, @@ -159,7 +186,7 @@ justify-content: flex-start; align-items: center; flex-shrink: 0; - background-color: #fafafa; + background-color: #fff; border-radius: 8px; box-sizing: border-box; padding: 0 10px; diff --git a/src/components/Sidebar/index.css b/src/components/Sidebar/index.css index 0a81c85..6ec14dc 100644 --- a/src/components/Sidebar/index.css +++ b/src/components/Sidebar/index.css @@ -1,5 +1,5 @@ .sidebar-expand-wrapper { - width: 280px; + width: 240px; box-sizing: border-box; position: relative; display: flex; @@ -15,41 +15,77 @@ width: 100%; height: 80px; display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; + box-sizing: border-box; + padding: 20px; > img { - width: 48px; + width: 143px; height: 48px; margin-right: 10px; transition: margin 0.3s ease; } - > p { - color: #262626; - font-size: 20px; - font-weight: 400; - opacity: 1; - transform: translateX(0); - transition: opacity 0.3s ease, transform 0.3s ease; - white-space: nowrap; - } } - .user-info { - width: 100%; - height: 80px; + .user-info-wrapper { + width: 208px; + height: 56px; display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; + border-radius: 8px; + background-color: #f4f7f9; + box-sizing: border-box; + padding: 0 10px; + .user-avatar { - width: 64px; - height: 64px; - border-radius: 12px; + width: 40px; + height: 40px; + border-radius: 6px; + margin-right: 10px; + } + + .user-info { + flex: 1; + display: flex; + justify-content: space-between; + align-items: flex-start; + flex-direction: column; + + > span { + font-weight: 400; + } + + .user-name { + font-size: 16px; + color: #1d2129; + } + .user-id { + font-size: 12px; + color: #86909c; + } } } .visitor-count { - width: 100%; - height: 41px; - text-align: center; + width: 208px; + height: 44px; + border-radius: 8px; + background-color: #e5f1ff; + position: relative; + margin-top: 10px; + box-sizing: border-box; + padding: 0 10px; + + &::after { + content: ""; + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-image: url("@/assets/images/Sidebar/visitor_count_bg.png"); + background-size: 100% 100%; + } .arco-statistic-value { font-size: 12px; @@ -70,25 +106,31 @@ .sidebar-menu-item-wrapper { width: 100%; + border-bottom: 1px solid #e4ecf2; + + &:last-child { + border-bottom: none; + } .sidebar-menu-title { width: 100%; - height: 36px; + height: 42px; text-align: left; - line-height: 36px; - color: #bfbfbf; - font-size: 14px; - font-weight: 400; + line-height: 42px; + color: #4e5969; + font-size: 16px; + font-weight: 500; } .sidebar-menu-item-active { - background-color: #e8f3ff; + background-image: url("@/assets/images/Sidebar/sidebar_menu_item_active_bg .png"); + background-size: 100% 100%; .sidebar-menu-icon { - color: #0275f2 !important; + color: #fff !important; } .sidebar-menu-text { - color: #0275f2 !important; + color: #fff !important; } } @@ -124,26 +166,18 @@ left: 50%; transform: translateX(-50%); display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; cursor: pointer; background-color: #fff; + border-top: 1px solid #e4ecf2; + box-sizing: border-box; + padding-left: 20px; > img { width: 22px; height: 22px; } - - .sidebar-btn-text { - margin-left: 10px; - color: #616065; - font-size: 16px; - font-weight: 400; - opacity: 1; - transform: translateX(0); - transition: opacity 0.3s ease, transform 0.3s ease; - white-space: nowrap; - } } } @@ -195,12 +229,7 @@ .sidebar-btn { width: 80px; - .sidebar-btn-text { - opacity: 0; - transform: translateX(-10px); - pointer-events: none; - transition: opacity 0.3s ease, transform 0.3s ease; - width: 0; - } + justify-content: center; + padding: 0; } } diff --git a/src/components/Sidebar/index.jsx b/src/components/Sidebar/index.jsx index e1a1747..f5ebcbb 100644 --- a/src/components/Sidebar/index.jsx +++ b/src/components/Sidebar/index.jsx @@ -2,7 +2,7 @@ import { useNavigate, useLocation } from "react-router-dom"; import { Statistic } from "@arco-design/web-react"; import { useSelector } from "react-redux"; import IconFont from "@/components/IconFont"; -import Logo from "@/assets/images/Sidebar/logo.png"; +import ICON from "@/assets/images/Sidebar/sidebar_icon.png"; import BTNICON from "@/assets/images/Sidebar/btn_icon.png"; import routes from "@/routes"; import "./index.css"; @@ -11,7 +11,7 @@ const Sidebar = ({ isCollapsed, setIsCollapsed }) => { const navigate = useNavigate(); const location = useLocation(); const studentInfo = useSelector((state) => state.student.studentInfo); - + console.log(studentInfo); const handleNavClick = (path) => { navigate(path); }; @@ -30,15 +30,18 @@ const Sidebar = ({ isCollapsed, setIsCollapsed }) => { }`} >
多多畅职教育系统
+
+ {item?.position}
{content.objective || '未填写'}
-{edu.description}
} -暂无教育背景
- )} -{exp.description}
-暂无工作经历
- )} -暂无专业技能
- )} -{project.description}
- {project.link && ( - - 项目链接 - - )} -暂无项目经历
- )} -📝 编辑模式:您可以基于系统模板修改个人信息
-- {selectedTemplate?.description || '基于系统模板的简历展示'} -
-