From d742560fb265c69ea3e23b0f24010de0d75f337f Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Wed, 30 Aug 2023 16:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/image/image.tsx                |   2 +-
 .../business/history/history.module.scss      |   5 ---
 src/pages/business/history/history.tsx        |  35 +++++++++---------
 .../videoInfo/components/catalogue.tsx        |   6 +--
 src/pages/home/home.config.ts                 |   2 +-
 src/pages/home/home.module.scss               |   9 +++++
 src/pages/home/home.tsx                       |   8 +++-
 src/static/img/logo.png                       | Bin 0 -> 4932 bytes
 8 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 src/static/img/logo.png

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<Props> = ({src, mode = 'aspectFill', width, height, fallback = sha
   return (
     <View
       style={{width: `${width}rpx`, height: `${height}rpx`, backgroundColor: '#F8F8F8'}}
-      className={`${props.className} ${styles.imgBox}`}>
+      className={`${props?.className} ${styles.imgBox}`}>
       {!isError &&
         <View animation={animationData}>
           <Image
diff --git a/src/pages/business/history/history.module.scss b/src/pages/business/history/history.module.scss
index cb18426..8997b10 100644
--- a/src/pages/business/history/history.module.scss
+++ b/src/pages/business/history/history.module.scss
@@ -6,11 +6,6 @@
   background: #fff;
 }
 
-.image {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
 
 .thumb {
   background: #ddd;
diff --git a/src/pages/business/history/history.tsx b/src/pages/business/history/history.tsx
index 76245e4..efb372b 100644
--- a/src/pages/business/history/history.tsx
+++ b/src/pages/business/history/history.tsx
@@ -1,10 +1,11 @@
-import {Image, Text, View} from "@tarojs/components";
+import {Text, View} from "@tarojs/components";
 import styles from './history.module.scss'
 import Taro from "@tarojs/taro";
 import {useEffect, useState} from "react";
 import {formatMinute} from "@/utils/time";
 import Empty from "@/components/empty/empty";
 import {userApi} from "@/api";
+import Img from "@/components/image/image";
 
 const History = () => {
   const [data, setData] = useState<HourHistory[]>([])
@@ -25,24 +26,22 @@ const History = () => {
   }, [])
 
   return (
-    <View>
-      <View className='mt-3'>
-        {data.length ? data.map((d, index) =>
-          <View key={index} className={styles.category} onClick={() => jump(d.userCourseRecord.course_id)}>
-            <View className={styles.thumb}>
-              <Image src={d.thumb} className={styles.image}/>
-              <View
-                className={styles.count}>共{d.userCourseRecord.hour_count}节/已学{d.userCourseRecord.finished_count}节</View>
+    <View className='mt-3'>
+      {data.length ? data.map((d, index) =>
+        <View key={index} className={styles.category} onClick={() => jump(d.userCourseRecord.course_id)}>
+          <View className={styles.thumb}>
+            <Img src={d.thumb} className={styles.image} width={300} height={188}/>
+            <View
+              className={styles.count}>共{d.userCourseRecord.hour_count}节/已学{d.userCourseRecord.finished_count}节</View>
+          </View>
+          <View className={styles.text}>
+            <View>{d.title}</View>
+            <View className={styles.describe}>
+              <Text className='mr-4'>观看{formatMinute(durations[d.id])}</Text>
+              <Text>学习进度：{(d.userCourseRecord.finished_count / d.userCourseRecord.hour_count * 100).toFixed(0)}%</Text>
             </View>
-            <View className={styles.text}>
-              <View>{d.title}</View>
-              <View className={styles.describe}>
-                <Text className='mr-4'>观看{formatMinute(durations[d.id])}</Text>
-                <Text>学习进度：{(d.userCourseRecord.finished_count / d.userCourseRecord.hour_count * 100).toFixed(0)}%</Text>
-              </View>
-            </View>
-          </View>) : <Empty name='无观看记录'/>}
-      </View>
+          </View>
+        </View>) : <Empty name='无观看记录'/>}
     </View>
   )
 }
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<Props> = ({data, setHors, id, playId}) => {
         <View className='px-3' onClick={() => setShow(true)}>...</View>
       </View>
 
-      <PageContainerInner
+      <CustomPageContainer
         show={show}
         position='bottom'
         onClickOverlay={() => setShow(false)}>
@@ -199,7 +199,7 @@ const Catalogue: FC<Props> = ({data, setHors, id, playId}) => {
           </View>
           <MyButton onClick={() => setShow(false)} type='default' fillet>取消</MyButton>
         </View>
-      </PageContainerInner>
+      </CustomPageContainer>
     </>
   );
 }
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 | HomeData>(null)
+  console.log(globalData)
 
   function unLogin() {
     Taro.removeStorageSync('profile')
@@ -28,6 +31,9 @@ const Home: FC = () => {
 
   return (
     <View className={styles.content}>
+      <View className={styles.header} style={{padding: `${globalData.statusBarHeight}px 0 10px 0`}}>
+        <Image src={logo} className={styles.logo} mode='aspectFit'/>
+      </View>
       <Adware data={data?.adverts || []} only_flag='routine_home_top_banner' width={710}/>
       <Feature/>
       <FeatureRecommended
diff --git a/src/static/img/logo.png b/src/static/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f9c2a9819ae60ea4597b91bd4f1a39e973ac029
GIT binary patch
literal 4932
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
Cq@F?m

literal 0
HcmV?d00001