skyblued пре 2 година
родитељ
комит
01a0c78754
2 измењених фајлова са 4 додато и 13 уклоњено
  1. 1 1
      src/views/coursewarePlay/component/musicScore.tsx
  2. 3 12
      src/views/coursewarePlay/index.tsx

+ 1 - 1
src/views/coursewarePlay/component/musicScore.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
     const iframeRef = ref()
     const iframeRef = ref()
     const Authorization = sessionStorage.getItem('Authorization') || ''
     const Authorization = sessionStorage.getItem('Authorization') || ''
     const origin = /(localhost|192)/.test(location.host)
     const origin = /(localhost|192)/.test(location.host)
-      ? 'https://ponline.colexiu.com'//'http://192.168.3.114:3000'
+      ? 'https://ponline.colexiu.com' //'http://localhost:3000' ////
       : location.origin
       : location.origin
     const query = qs.stringify({
     const query = qs.stringify({
       id: props.music.content,
       id: props.music.content,

+ 3 - 12
src/views/coursewarePlay/index.tsx

@@ -164,8 +164,7 @@ export default defineComponent({
               playModel: false,
               playModel: false,
               isprepare: false,
               isprepare: false,
               isDrage: false,
               isDrage: false,
-              muted: i === 0 && j === 0 ? true : false,
-              isAutoNext: false // 是否自动播放到当前页面
+              muted: (i === 0 && j === 0) ? true : false,
             }
             }
           }
           }
           list.push({
           list.push({
@@ -279,14 +278,8 @@ export default defineComponent({
         popupData.itemActive = item.id
         popupData.itemActive = item.id
         popupData.itemName = item.name
         popupData.itemName = item.name
         popupData.tabName = item.tabName
         popupData.tabName = item.tabName
-        if (item.isAutoNext) {
-          item.isAutoNext = false
-          item.playModel = false
-        } else {
+        if (item.type == 'SONG'){
           activeData.model = true
           activeData.model = true
-          if (item.type === 'VIDEO') {
-            item.playModel = true
-          }
         }
         }
       }
       }
     }
     }
@@ -360,7 +353,6 @@ export default defineComponent({
         swipeRef.value?.next()
         swipeRef.value?.next()
         const nextItem = data.itemList[popupData.activeIndex]
         const nextItem = data.itemList[popupData.activeIndex]
         if (nextItem.type === 'VIDEO') {
         if (nextItem.type === 'VIDEO') {
-          nextItem.isAutoNext = true
           nextTick(() => {
           nextTick(() => {
             // 自动播放下一个视频
             // 自动播放下一个视频
             clearTimeout(m.timer)
             clearTimeout(m.timer)
@@ -426,7 +418,6 @@ export default defineComponent({
                       <>
                       <>
                         <video
                         <video
                           playsinline="false"
                           playsinline="false"
-                          webkit-playsinline
                           muted={m.muted}
                           muted={m.muted}
                           preload="auto"
                           preload="auto"
                           class="player"
                           class="player"
@@ -472,7 +463,7 @@ export default defineComponent({
                           <source src={m.content} type="video/mp4" />
                           <source src={m.content} type="video/mp4" />
                         </video>
                         </video>
                         <Transition name="bottom">
                         <Transition name="bottom">
-                          {m.playModel && (
+                          {activeData.model && (
                             <div class={[styles.bottomFixedContainer]}>
                             <div class={[styles.bottomFixedContainer]}>
                               <div class={styles.time}>
                               <div class={styles.time}>
                                 <span>{getSecondRPM(m.currentTime)}</span>
                                 <span>{getSecondRPM(m.currentTime)}</span>