skyblued 2 years ago
parent
commit
6be4a63229
2 changed files with 25 additions and 19 deletions
  1. 1 8
      src/teacher/screen-projection/index.tsx
  2. 24 11
      src/views/coursewarePlay/index.tsx

+ 1 - 8
src/teacher/screen-projection/index.tsx

@@ -60,14 +60,7 @@ export default defineComponent({
     }
     return () => (
       <div class={styles.screenProjection}>
-        <OHeader
-          desotry={false}
-          rightText="投屏帮助"
-          onClickRight={() => {
-            console.log('打开投屏')
-            data.guideOpen = true
-          }}
-        />
+        
         <div class={styles.container}>
           {data.name && (
             <div class={styles.tips}>

+ 24 - 11
src/views/coursewarePlay/index.tsx

@@ -2,6 +2,7 @@ import {
   Button,
   closeToast,
   Icon,
+  Loading,
   Popup,
   showToast,
   Slider,
@@ -252,7 +253,7 @@ export default defineComponent({
     const handleStopVideo = () => {
       data.itemList.forEach((m: any) => {
         const item = data.itemList[popupData.activeIndex]
-        if (item?.id != m.id){
+        if (item?.id != m.id) {
           m.autoPlay = false
           m.videoEle?.pause()
         }
@@ -415,10 +416,9 @@ export default defineComponent({
                           muted={m.muted}
                           preload="auto"
                           class="player"
-                          // poster={iconVideobg}
-
+                          poster={iconVideobg}
                           data-vid={m.id}
-                          src={m.content + '#t=0'}
+                          src={m.content}
                           loop={m.loop}
                           autoplay={m.autoPlay}
                           onLoadedmetadata={(e: Event) => {
@@ -461,6 +461,9 @@ export default defineComponent({
                               </div>
                               <div class={styles.slider}>
                                 <Slider
+                                  onClick={() => {
+                                    setModelOpen()
+                                  }}
                                   style={{ display: m.isprepare ? 'block' : 'none' }}
                                   buttonSize={16}
                                   step={0.1}
@@ -492,14 +495,24 @@ export default defineComponent({
 
                               <div class={styles.actions}>
                                 <div class={styles.actionBtn}>
-                                  {m.paused ? (
-                                    <img src={iconplay} onClick={(e: Event) => handlePlay(e, m)} />
+                                  {m.isprepare ? (
+                                    <>
+                                      {m.paused ? (
+                                        <img
+                                          src={iconplay}
+                                          onClick={(e: Event) => handlePlay(e, m)}
+                                        />
+                                      ) : (
+                                        <img
+                                          src={iconpause}
+                                          onClick={(e: Event) => handlePaused(e, m)}
+                                        />
+                                      )}
+                                    </>
                                   ) : (
-                                    <img
-                                      src={iconpause}
-                                      onClick={(e: Event) => handlePaused(e, m)}
-                                    />
+                                    <Loading color="#fff" />
                                   )}
+
                                   {m.loop ? (
                                     <img
                                       src={iconLoopActive}
@@ -616,7 +629,7 @@ export default defineComponent({
           v-model:show={popupData.open}
           onClose={() => {
             const item = data.itemList[popupData.activeIndex]
-            if (item?.type == "VIDEO"){
+            if (item?.type == 'VIDEO') {
               setModelOpen()
             }
           }}