From 9f5e6af772b69c190235e88c1b3c8834cbec2a94 Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Tue, 5 Sep 2023 12:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8Ctop3=EF=BC=8C=E5=8A=9F=E8=83=BD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E8=AF=BE=E7=A8=8B=E6=8E=A8=E8=8D=90=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/videoCover/videoCover.scss     | 11 +++++++---
 src/components/videoCover/videoCover.tsx      |  2 +-
 src/pages/home/components/curRecommended.tsx  |  1 +
 src/pages/home/components/feature.tsx         |  2 +-
 .../home/components/feature_recommended.tsx   |  2 +-
 src/pages/home/components/search.tsx          |  4 ++--
 src/pages/home/home.module.scss               | 21 +++++++++++--------
 src/pages/home/home.tsx                       |  4 ++--
 8 files changed, 28 insertions(+), 19 deletions(-)

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<VideoCoverProps> = (opt: VideoCoverProps) => {
       <View className='video' onClick={jump}>
         <View className='upper'>
           <Img height={180} src={opt.thumb} mode='widthFix'/>
-          {opt.content && <View className='content'>{opt.content}</View>}
           {opt.marker && <View className='marker'>{opt.marker}</View>}
+          {opt.content && <View className='content'>{opt.content}</View>}
         </View>
         <View className='box'>
           <View className='title'>{opt.title}</View>
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}节`}
               />)
             }
           </View>
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 = () => {
     <View className='flex justify-around' style={{marginBottom: '20px'}}>
       {
         list.map(d => <View className='text-center' onClick={() => jump(d.url)}>
-          <Image src={d.image} style={{width: '48px', height: '48px'}}/>
+          <Image src={d.image} style={{width: '48px', height: '48px', verticalAlign: 'middle'}}/>
           <View className={styles.featureList}>{d.text}</View>
         </View>)
       }
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> = (props) => {
 
   return (
     <View className={styles.feature}>
-      <Swiper nextMargin='30px' style={{height: '440rpx'}}>
+      <Swiper nextMargin='30px' style={{height: '450rpx'}}>
         {
           data.map(d => <SwiperItem key={d.url}>
             <Image
diff --git a/src/pages/home/components/search.tsx b/src/pages/home/components/search.tsx
index 2f6071f..e1ee676 100644
--- a/src/pages/home/components/search.tsx
+++ b/src/pages/home/components/search.tsx
@@ -13,9 +13,9 @@ export const Search: FC = () => {
 
   return (
     <View className={styles.search} onClick={jump}>
-      <Image src={search} mode='widthFix' style={{width: 18,verticalAlign:'middle'}}/>
+      <Image src={search} mode='widthFix' style={{width: 16, height: 16, verticalAlign: 'middle'}}/>
       {/*<Icon name='search' size={18} color='#808080'/>*/}
-      <View className='ml-1'>点击搜索</View>
+      <View>点击搜索</View>
     </View>
   )
 }
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={
           <>
-            <Image src={logo} style={{height: "100%"}} mode='heightFix'/>
-            <Text style={{fontWeight: 'bold'}} className='ml-2'>医学道</Text>
+            <Image src={logo} style={{height: "110%"}} mode='heightFix'/>
+            <Text className='ml-1 font-36'>医学道</Text>
           </>
         }
       >