From 1eaf8a721885484945142e37456b30ca8200b084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Tue, 4 Jul 2023 16:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/change-department/index.tsx | 1 - src/pages/change-password/index.tsx | 8 ++++---- src/pages/course/index.tsx | 2 +- src/pages/course/video.tsx | 8 ++++---- src/pages/index/index.tsx | 2 +- src/pages/login/index.tsx | 8 ++++---- src/pages/member/index.tsx | 14 ++++++++++---- src/pages/study/index.tsx | 2 +- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/pages/change-department/index.tsx b/src/pages/change-department/index.tsx index 0f848cf..16ca000 100644 --- a/src/pages/change-department/index.tsx +++ b/src/pages/change-department/index.tsx @@ -10,7 +10,6 @@ import backIcon from "../../assets/images/commen/icon-back.png"; const ChangeDepartmentPage = () => { const dispatch = useDispatch(); const navigate = useNavigate(); - const [loading, setLoading] = useState(false); const departments = useSelector( (state: any) => state.loginUser.value.departments ); diff --git a/src/pages/change-password/index.tsx b/src/pages/change-password/index.tsx index 5e0ef52..e80225d 100644 --- a/src/pages/change-password/index.tsx +++ b/src/pages/change-password/index.tsx @@ -7,10 +7,10 @@ import backIcon from "../../assets/images/commen/icon-back.png"; const ChangePasswordPage = () => { const navigate = useNavigate(); - const [loading, setLoading] = useState(false); - const [oldPassword, setOldPassword] = useState(""); - const [newPassword, setNewPassword] = useState(""); - const [againPassword, setAgainPassword] = useState(""); + const [loading, setLoading] = useState(false); + const [oldPassword, setOldPassword] = useState(""); + const [newPassword, setNewPassword] = useState(""); + const [againPassword, setAgainPassword] = useState(""); useEffect(() => { document.title = "修改密码"; diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx index 4df38e7..71e4705 100644 --- a/src/pages/course/index.tsx +++ b/src/pages/course/index.tsx @@ -65,7 +65,7 @@ const CoursePage = () => { useEffect(() => { if (learnRecord?.progress) { - setUserCourseProgress(learnRecord.progress / 100); + setUserCourseProgress(Math.floor(learnRecord.progress / 100)); } else if (learnHourRecord) { setUserCourseProgress(1); } else { diff --git a/src/pages/course/video.tsx b/src/pages/course/video.tsx index a9defbc..8f2265d 100644 --- a/src/pages/course/video.tsx +++ b/src/pages/course/video.tsx @@ -23,14 +23,14 @@ const CoursePlayPage = () => { const params = useParams(); const systemConfig = useSelector((state: any) => state.systemConfig.value); const user = useSelector((state: any) => state.loginUser.value.user); - const [playUrl, setPlayUrl] = useState(""); + const [playUrl, setPlayUrl] = useState(""); const [playDuration, setPlayDuration] = useState(0); - const [playendedStatus, setPlayendedStatus] = useState(false); + const [playendedStatus, setPlayendedStatus] = useState(false); const [lastSeeValue, setLastSeeValue] = useState({}); const [course, setCourse] = useState(null); const [hour, setHour] = useState({}); - const [loading, setLoading] = useState(false); - const [isLastpage, setIsLastpage] = useState(false); + const [loading, setLoading] = useState(false); + const [isLastpage, setIsLastpage] = useState(false); const [totalHours, setTotalHours] = useState([]); const [playingTime, setPlayingTime] = useState(0); const [watchedSeconds, setWatchedSeconds] = useState(0); diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 63f005f..733ee82 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -20,7 +20,7 @@ const IndexPage = () => { const ref = useRef(null); const navigate = useNavigate(); const result = new URLSearchParams(useLocation().search); - const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState(false); const [tabKey, setTabKey] = useState(result.get("tab") || "0"); const [coursesList, setCoursesList] = useState([]); const [categories, setCategories] = useState([]); diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index f7bc2ec..00b5e35 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -15,10 +15,10 @@ import banner from "../../assets/images/login/banner.png"; const LoginPage = () => { const dispatch = useDispatch(); const navigate = useNavigate(); - const [loading, setLoading] = useState(false); - const [email, setEmail] = useState(""); - const [password, setPassword] = useState(""); - const [bodyHeight, setBodyHeight] = useState(0); + const [loading, setLoading] = useState(false); + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + const [bodyHeight, setBodyHeight] = useState(0); useEffect(() => { document.title = "登录"; diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index de40364..be64460 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -13,10 +13,10 @@ import moreIcon from "../../assets/images/commen/icon-more.png"; const MemberPage = () => { const dispatch = useDispatch(); const navigate = useNavigate(); - const [loading, setLoading] = useState(false); - const [currentDepartment, setCurrentDepartment] = useState(""); - const [visible, setVisible] = useState(false); - const [init, setInit] = useState(false); + const [loading, setLoading] = useState(false); + const [currentDepartment, setCurrentDepartment] = useState(""); + const [visible, setVisible] = useState(false); + const [init, setInit] = useState(false); const [stats, setStats] = useState({}); const [fileList, setFileList] = useState([ { @@ -64,12 +64,18 @@ const MemberPage = () => { setLearnTodayDay(todayData[0]); setLearnTodayHour(todayData[1]); setLearnTodayMin(todayData[2]); + if (todayData[2] === 0 && todayData[3] > 0) { + setLearnTodayMin(1); + } } let totalData = studyTimeFormat(res.data.stats.learn_duration); if (totalData) { setLearnTotalDay(totalData[0]); setLearnTotalHour(totalData[1]); setLearnTotalMin(totalData[2]); + if (totalData[2] === 0 && totalData[3] > 0) { + setLearnTodayMin(1); + } } setLoading(false); }); diff --git a/src/pages/study/index.tsx b/src/pages/study/index.tsx index 29afaf8..34b6aa5 100644 --- a/src/pages/study/index.tsx +++ b/src/pages/study/index.tsx @@ -7,7 +7,7 @@ import { CoursesModel } from "./compenents/courses-model"; import moment from "moment"; const StudyPage = () => { - const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState(false); const [todayCourses, setTodayCourses] = useState([]); const [yesterdayCourses, setYesterdayCourses] = useState([]); const [courses, setCourses] = useState([]);