diff --git a/src/components/image/image.tsx b/src/components/image/image.tsx index 9651106..2071e52 100644 --- a/src/components/image/image.tsx +++ b/src/components/image/image.tsx @@ -38,7 +38,7 @@ const Img: FC = ({src, mode = 'aspectFill', width, height, fallback = sha return ( + className={`${props?.className} ${styles.imgBox}`}> {!isError && { const [data, setData] = useState([]) @@ -25,24 +26,22 @@ const History = () => { }, []) return ( - - - {data.length ? data.map((d, index) => - jump(d.userCourseRecord.course_id)}> - - - 共{d.userCourseRecord.hour_count}节/已学{d.userCourseRecord.finished_count}节 + + {data.length ? data.map((d, index) => + jump(d.userCourseRecord.course_id)}> + + + 共{d.userCourseRecord.hour_count}节/已学{d.userCourseRecord.finished_count}节 + + + {d.title} + + 观看{formatMinute(durations[d.id])} + 学习进度:{(d.userCourseRecord.finished_count / d.userCourseRecord.hour_count * 100).toFixed(0)}% - - {d.title} - - 观看{formatMinute(durations[d.id])} - 学习进度:{(d.userCourseRecord.finished_count / d.userCourseRecord.hour_count * 100).toFixed(0)}% - - - ) : } - + + ) : } ) } diff --git a/src/pages/business/videoInfo/components/catalogue.tsx b/src/pages/business/videoInfo/components/catalogue.tsx index fd8df74..55bbddd 100644 --- a/src/pages/business/videoInfo/components/catalogue.tsx +++ b/src/pages/business/videoInfo/components/catalogue.tsx @@ -9,7 +9,7 @@ import MyButton from "@/components/button/MyButton"; import videoEvents from "@/hooks/videoEvents"; import curRecord from '@/static/img/curRecord.png' import hourRecord from "@/static/img/hourRecord.png" -import {PageContainerInner} from "@/components/custom-page-container/custom-page-container"; +import CustomPageContainer from "@/components/custom-page-container/custom-page-container"; interface Props { data: CourseDepData | null @@ -181,7 +181,7 @@ const Catalogue: FC = ({data, setHors, id, playId}) => { setShow(true)}>... - setShow(false)}> @@ -199,7 +199,7 @@ const Catalogue: FC = ({data, setHors, id, playId}) => { setShow(false)} type='default' fillet>取消 - + ); } diff --git a/src/pages/home/home.config.ts b/src/pages/home/home.config.ts index 09216b4..6211ef6 100644 --- a/src/pages/home/home.config.ts +++ b/src/pages/home/home.config.ts @@ -1,6 +1,6 @@ export default definePageConfig({ navigationBarTitleText: '康一诺', - // navigationStyle: 'custom', + navigationStyle: 'custom', navigationBarBackgroundColor: '#92ecc5', navigationBarTextStyle: 'white', onReachBottomDistance: 50 diff --git a/src/pages/home/home.module.scss b/src/pages/home/home.module.scss index dff704e..e355f46 100644 --- a/src/pages/home/home.module.scss +++ b/src/pages/home/home.module.scss @@ -15,6 +15,15 @@ font-weight: 500; } +.header{ + +} + +.logo{ + width: 80rpx; + height: 80rpx; +} + .content { position: relative; diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index c2f9131..3eaef5a 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -1,5 +1,5 @@ import {FC, useState} from "react"; -import {View} from "@tarojs/components"; +import {Image, View} from "@tarojs/components"; import styles from "./home.module.scss"; import Adware from "@/pages/home/components/adware"; import Feature from "@/pages/home/components/feature"; @@ -9,11 +9,14 @@ import MyButton from "@/components/button/MyButton"; import {Profile} from "@/store"; import Taro from "@tarojs/taro"; import {HomeApi, HomeData} from "@/api"; +import logo from '@/static/img/logo.png' const Home: FC = () => { + const globalData = Taro.getApp().globalData const {token} = Profile.useContainer() const [data, setData] = useState(null) + console.log(globalData) function unLogin() { Taro.removeStorageSync('profile') @@ -28,6 +31,9 @@ const Home: FC = () => { return ( + + +