Merge branch 'master' of https://git.yaojiankang.top/xing/video

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: true
@@ -12444,7 +12444,7 @@ packages:
     dependencies:
       object-assign: 4.1.1
       react: 18.0.0
-      react-is: 16.13.1
+      react-is: 18.2.0
     dev: false
 
   /react@18.0.0:

src/api/home.ts

@@ -33,8 +33,12 @@ export interface HomeData {
   adverts: AdwareType[]
   skill: Kill[]
   health: Health[]
-  brand: Brand[]
+  brand: {
-  illness: Illness[]
+    list: Brand[]
+  }
+  illness: {
+    list: Illness[]
+  }
 }
 
 export const HomeApi = {

src/components/video/video.tsx

@@ -45,12 +45,10 @@ const HVideo: FC<HVideoOptions> = (opt: HVideoOptions) => {
     opt.breakpoint.forEach(d => {
       if (time < d + deviation && time > d - deviation) {
         video?.pause()
-        video?.seek(d - deviation)
         if (process.env.TARO_ENV === 'h5') {
           try {
             document?.exitFullscreen().then()
-          } catch (e) {
+          } catch (e) {}
-          }
         }
         video?.exitFullScreen()
         opt.onBreakpoint(d)

src/pages/business/videoInfo/components/catalogue.tsx

@@ -175,10 +175,9 @@ const Catalogue: FC<Props> = ({data, setHors, id, playId}) => {
 
       <View className='Videobutton'>
         {
-          playing ? <MyButton style={{flex: '1'}} onClick={onPause}>{JSON.stringify(playing)}暂停</MyButton>
+          playing ? <MyButton style={{flex: '1'}} onClick={onPause}>暂停</MyButton>
-            : <MyButton style={{flex: '1'}} onClick={learning}>{JSON.stringify(playing)}立即学习</MyButton>
+            : <MyButton style={{flex: '1'}} onClick={learning}>立即学习</MyButton>
         }
-
         <View className='px-3' onClick={() => setShow(true)}>...</View>
       </View>
 

src/pages/business/videoInfo/components/course.tsx

@@ -129,15 +129,13 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}) => {
         setTime={videoSeek}
       />
 
-      <CustomPageContainer
+      <CustomPageContainer show={show} position='bottom'>
-        show={show}
-        position='bottom'
-      >
         <View>
           <View className='text-center mt-2 text-muted'>
             <Text className='mr-2'>{formatMinute(time)}考题</Text>
           </View>
-          {examAll?.[time]?.slice(0, 1)?.map((d) =>
+          {
+            examAll?.[time]?.slice(0, 1)?.map((d) =>
               <ScrollView style='height:60vh' scrollY key={d.id}>
                 {d.question_type === 2 &&
                   <Judge
@@ -145,8 +143,8 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}) => {
                     validate={validate}
                     onAnswer={(isAnswer) => setRecord([isAnswer])}
                   />}
-            </ScrollView>
+              </ScrollView>)
-          )}
+          }
           <View>
 
             <View className='statistics'>

src/pages/home/components/feature_recommended.tsx

@@ -76,9 +76,7 @@ const FeatureRecommended: FC<Props> = (props) => {
         description: d.graphic_introduction,
         path: `?id=${d.id}`,
       }))
-    } catch (e) {
+    } catch (e) {}
-      console.log(e)
-    }
     return []
   }
 

src/pages/home/home.tsx

@@ -1,7 +1,6 @@
 import {FC, useEffect, useState} from "react";
 import {View} from "@tarojs/components";
 import styles from "./home.module.scss";
-// import {Search} from "@/pages/home/components/search";
 import Adware from "@/pages/home/components/adware";
 import Feature from "@/pages/home/components/feature";
 import FeatureRecommended from "@/pages/home/components/feature_recommended";
@@ -29,13 +28,12 @@ const Home: FC = () => {
 
   return (
     <View className={styles.content}>
-      {/*<Search/>*/}
       <Adware data={data?.adverts || []} only_flag='routine_home_top_banner' width={710}/>
       <Feature/>
       <FeatureRecommended
-        illness={(data?.illness as any)?.list || []}
+        illness={data?.illness.list || []}
         health={data?.health || []}
-        brand={((data?.brand as any)?.list) || []}
+        brand={data?.brand.list || []}
         skill={data?.skill || []}
       />
       <Adware data={data?.adverts || []} only_flag='routine_home_recommend_banner' width={710}/>

src/pages/manage/courseAdmin/components/search.tsx

@@ -88,7 +88,7 @@ export const Search: FC<Props> = ({param, setParam}) => {
           {deps.length ?
             <>
               {
-                deps.map(dep => <View
+                deps?.map(dep => <View
                   key={dep.id}
                   className={styles.radioBox}
                   onClick={() => changeDepId(dep.id)}>

src/pages/manage/courseAdmin/courseAdmin.tsx

@@ -26,7 +26,7 @@ const CourseAdmin: FC = () => {
     courseApi.getCourseAll({...param, page_size: param.page_size * (replace ? param.page : 1)}).then(res => {
       setTotal(res.total)
       if (param.page === 1 || replace) {
-        setData(res.data)
+        setData(res.data || [])
       } else {
         setData([
           ...data,
@@ -53,7 +53,7 @@ const CourseAdmin: FC = () => {
     if (curs.length === data.length) {
       setCurs([])
     } else {
-      setCurs(data.map(d => d.id))
+      setCurs(data?.map(d => d.id))
     }
   }
 
@@ -72,7 +72,7 @@ const CourseAdmin: FC = () => {
     Taro.showModal({
       title: '删除警告',
       content: "删除后所有部门不可查看",
-      confirmText:'删除',
+      confirmText: '删除',
       async success({confirm}) {
         if (confirm) {
           try {
@@ -108,7 +108,7 @@ const CourseAdmin: FC = () => {
    * @param required 批量添加为[]
    */
   function batchChangDep(ids: number[], depList = [], required = []) {
-    if (!ids.length) {
+    if (!ids?.length) {
       Taro.showToast({title: '请选择课程', icon: 'none'})
       return
     }
@@ -153,7 +153,7 @@ const CourseAdmin: FC = () => {
 
       <View className={styles.curList}>
         {
-          data.map((d, index) => <View key={d.id} className={styles.curBox}>
+          data?.map((d, index) => <View key={d.id} className={styles.curBox}>
             <View className={styles.curTitle} onClick={() => addCurs(d.id)}>
               {batch && <Radio
                 checked={curs.includes(d.id)}