Merge branch 'temp-register'

src/views/attend-class/component/video-play.tsx

@@ -37,7 +37,7 @@ export default defineComponent({
     });
     const videoRef = ref();
     const videoItem = ref();
-    const videoID = 'video' + Date.now() + Math.floor(Math.random() * 100);
+    const videoID = ref('video' + Date.now() + Math.floor(Math.random() * 100));
 
     // 对时间进行格式化
     const timeFormat = (num: number) => {
@@ -82,7 +82,7 @@ export default defineComponent({
     };
 
     onMounted(() => {
-      videoItem.value = TCPlayer(videoID, {
+      videoItem.value = TCPlayer(videoID.value, {
         appID: '',
         controls: false
       }); // player-container-id 为播放器容器 ID，必须与 html 中一致
@@ -148,7 +148,7 @@ export default defineComponent({
           style={{ width: '100%', height: '100%' }}
           src={isEmtry.value ? '' : item.value.content}
           ref={videoRef}
-          id={videoID}
+          id={videoID.value}
           preload="auto"
           playsinline
           webkit-playsinline></video>

src/views/attend-class/index.tsx

@@ -377,8 +377,13 @@ export default defineComponent({
       for (let i = 0; i < data.itemList.length; i++) {
         const activeItem = data.itemList[i];
         if (activeItem.type === 'VIDEO' && activeItem.videoEle) {
-          activeItem.videoEle.currentTime(0);
-          activeItem.videoEle.pause();
+          console.log(activeItem.videoEle, ' activeItem.videoEle');
+          try {
+            activeItem.videoEle?.currentTime(0);
+            activeItem.videoEle?.pause();
+          } catch (e: any) {
+            console.log(e, 'e');
+          }
         }
 
         if (activeItem.type === 'SONG' && activeItem.audioEle) {
@@ -821,7 +826,7 @@ export default defineComponent({
       const activeItem = data.itemList[popupData.activeIndex];
       // 暂停视频和曲谱的播放
       if (activeItem.type === 'VIDEO' && activeItem.videoEle) {
-        activeItem.videoEle.pause();
+        activeItem.videoEle?.pause();
       }
       if (activeItem.type === 'SONG' && activeItem.audioEle) {
         activeItem.audioEle?.stop();
@@ -1012,10 +1017,10 @@ export default defineComponent({
             clearTimeout(activeData.timer);
             activeData.model = !activeData.model;
             Object.values(data.videoRefs).map((n: any) =>
-              n.toggleHideControl(activeData.model)
+              n?.toggleHideControl(activeData.model)
             );
             Object.values(data.audioRefs).map((n: any) =>
-              n.toggleHideControl(activeData.model)
+              n?.toggleHideControl(activeData.model)
             );
           }}>
           <div
@@ -1028,12 +1033,12 @@ export default defineComponent({
             {!popupData.chapterLoading ? (
               <div class={styles.wraps}>
                 {data.itemList.map((m: any, mIndex: number) => {
-                  const isRender =
-                    m.isRender || Math.abs(popupData.activeIndex - mIndex) < 2;
+                  const isRender = Math.abs(popupData.activeIndex - mIndex) < 2;
                   const isEmtry = Math.abs(popupData.activeIndex - mIndex) > 4;
-                  if (isRender) {
-                    m.isRender = true;
-                  }
+                  // if (isRender) {
+                  //   m.isRender = true;
+                  // }
+                  // console.log(isRender, 'isRender', mIndex);
                   return isRender ? (
                     <div
                       key={'index' + mIndex}
@@ -1063,10 +1068,10 @@ export default defineComponent({
                         activeData.timer = setTimeout(() => {
                           activeData.model = !activeData.model;
                           Object.values(data.videoRefs).map((n: any) =>
-                            n.toggleHideControl(activeData.model)
+                            n?.toggleHideControl(activeData.model)
                           );
                           Object.values(data.audioRefs).map((n: any) =>
-                            n.toggleHideControl(activeData.model)
+                            n?.toggleHideControl(activeData.model)
                           );
                           if (activeData.model) {
                             setModelOpen();

src/views/home/index.module.less

@@ -151,6 +151,12 @@
   .applyItem {
     width: 211px;
     height: 296px;
+    transition: all 0.2s ease;
+
+    &:hover {
+      transform: scale(1.05);
+      transition: all 0.2s ease;
+    }
 
     p {
       text-align: justify;

src/views/prepare-lessons/model/subject-sync/index.module.less

@@ -52,8 +52,8 @@
 
   .iconSelect {
     position: absolute;
-    top: 11px;
-    right: 11px;
+    top: 8px;
+    right: 8px;
     border-radius: 0;
     width: 24px;
     height: 24px;