diff --git a/src/components/videoCover/videoCover.scss b/src/components/videoCover/videoCover.scss index 840c184..3a64267 100644 --- a/src/components/videoCover/videoCover.scss +++ b/src/components/videoCover/videoCover.scss @@ -33,13 +33,18 @@ } .marker { + font-size: 24rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #FFFFFF; + height: 34rpx; + padding: 0 8rpx; position: absolute; background: rgba(#000, .5); color: #fff; - padding: 0 10px; - border-radius: 0 0 0 10px; + border-radius: 0 0 8px 0; top: 0; - right: 0; + left: 0; } Image { diff --git a/src/components/videoCover/videoCover.tsx b/src/components/videoCover/videoCover.tsx index c88d827..cc93e0d 100644 --- a/src/components/videoCover/videoCover.tsx +++ b/src/components/videoCover/videoCover.tsx @@ -30,8 +30,8 @@ const VideoCover: FC = (opt: VideoCoverProps) => { - {opt.content && {opt.content}} {opt.marker && {opt.marker}} + {opt.content && {opt.content}} {opt.title} diff --git a/src/pages/home/components/curRecommended.tsx b/src/pages/home/components/curRecommended.tsx index 07f5e59..8f42c20 100644 --- a/src/pages/home/components/curRecommended.tsx +++ b/src/pages/home/components/curRecommended.tsx @@ -47,6 +47,7 @@ const CurRecommended: FC = () => { id={c.id} depId={c.id} key={c.id} + marker={`共${c.class_hour}节`} />) } diff --git a/src/pages/home/components/feature.tsx b/src/pages/home/components/feature.tsx index d6ae52b..92e1f46 100644 --- a/src/pages/home/components/feature.tsx +++ b/src/pages/home/components/feature.tsx @@ -23,7 +23,7 @@ const Feature: FC = () => { { list.map(d => jump(d.url)}> - + {d.text} ) } diff --git a/src/pages/home/components/feature_recommended.tsx b/src/pages/home/components/feature_recommended.tsx index 04ba180..c60d10a 100644 --- a/src/pages/home/components/feature_recommended.tsx +++ b/src/pages/home/components/feature_recommended.tsx @@ -151,7 +151,7 @@ const FeatureRecommended: FC = (props) => { return ( - + { data.map(d => { return ( - + {/**/} - 点击搜索 + 点击搜索 ) } diff --git a/src/pages/home/home.module.scss b/src/pages/home/home.module.scss index 7dcda1f..6997627 100644 --- a/src/pages/home/home.module.scss +++ b/src/pages/home/home.module.scss @@ -80,9 +80,12 @@ margin-bottom: 40rpx; font-size: 28rpx; font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; color: #909795; line-height: 1; + + view { + margin-left: 8rpx; + } } .adware { @@ -101,21 +104,21 @@ font-family: PingFang SC-Bold, PingFang SC; font-weight: bold; color: #323635; - margin-top: 20px; + margin-top: 18rpx; } .courseTag { width: 162px; height: 46rpx; - margin: 0 auto 30rpx; + margin: 0 auto 10rpx; display: block; } .feature { color: #323635; background: #fff; - padding: 30rpx 0 30rpx 30rpx; + padding: 20rpx 0 25rpx 25rpx; margin-bottom: 40rpx; border-radius: 20rpx; position: relative; @@ -125,7 +128,7 @@ content: ''; display: block; position: absolute; - right: 0; + right: -1px; top: 0; bottom: 0; width: 40rpx; @@ -136,7 +139,7 @@ .featureTitle { max-width: 212px; height: 50rpx; - padding-bottom: 20rpx; + padding-bottom: 10rpx; } .featureText { @@ -144,7 +147,7 @@ } .featureTextTitle { - font-size: 32rpx; + font-size: 28rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #323635; @@ -155,7 +158,7 @@ } .featureTextDescription { - font-size: 28rpx; + font-size: 24rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #909795; @@ -163,7 +166,7 @@ white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; - line-height: 2; + line-height: 3; } .ranking { diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index 9c42b65..898f80c 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -51,8 +51,8 @@ const Home: FC = () => { cancelBack leftNode={ <> - - 医学道 + + 医学道 } >