Bläddra i källkod

Merge branch 'iteration-20241030-crouseware' into dev

lex-xin 4 månader sedan
förälder
incheckning
4638378add

+ 4 - 1
src/views/coursewarePlay/component/courseware-type/index.module.less

@@ -148,7 +148,6 @@
     }
 
     &.active {
-      
       :global {
         .van-notice-bar__content {
           color: #FFFFFF;
@@ -163,6 +162,10 @@
           color: rgba(255,255,255,0.5);
           transition-duration: 0s !important;
           transform: none !important;
+          width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
       }
     }

+ 2 - 10
src/views/coursewarePlay/index.tsx

@@ -763,14 +763,6 @@ export default defineComponent({
         item.typeCode &&
         item.typeCode.toLocaleUpperCase() === 'VIDEO'
       ) {
-        if(whitePenShow.value || penShow.value || popupData.coursewareOpen || popupData.open || popupData.guideOpen || popupData.pointOpen) {
-          item.autoplay = false
-        } else {
-          // 是否自动播放
-          if (activeData.isAutoPlay) {
-            item.autoPlay = true;
-          }
-        }
         return item;
       }
       return {};
@@ -970,9 +962,9 @@ export default defineComponent({
                 onPlay={() => {
                   data.videoState = 'play';
                   data.animationState = 'end';
-                  if(activeVideoItem.value.autoplay === false) {
+                  if(whitePenShow.value || penShow.value || popupData.coursewareOpen || popupData.open || popupData.guideOpen || popupData.pointOpen) {
                     handleStop()
-                  }
+                  } 
                 }}
                 onLoadedmetadata={(videoItem: any) => {
                   data.videoState = 'play';