合并

src/views/exercise-after-class/index.tsx

@@ -1,4 +1,4 @@
-import { Icon, showConfirmDialog, Swipe, SwipeItem } from 'vant'
+import { Icon, showConfirmDialog, showToast, Swipe, SwipeItem } from 'vant'
 import { defineComponent, onMounted, reactive, onUnmounted, ref, Transition, watch } from 'vue'
 import styles from './index.module.less'
 import 'plyr/dist/plyr.css'
@@ -290,6 +290,11 @@ export default defineComponent({
           .then(() => {
             if (!isLastIndex) {
               const nextItem = data.trainings[itemIndex + 1]
+              data.videoData?.expired
+              if (nextItem.expired) {
+                showToast('该资源已过期')
+                return
+              }
               if (nextItem.knowledgePointName) {
                 popupData.tabName = nextItem.knowledgePointName
               }

src/views/exercise-after-class/video-class.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
         nextTick(() => {
           videoItem.value?.pause()
         })
-        console.log(props.item, item.value, '-----')
+        // console.log(props.item, item.value, '-----')
         videoItem.value.poster(props.item.coverImg) // 封面
         videoItem.value.src(props.item.content) // url 播放地址
         videoItem.value.loop(props.item.loop)
@@ -41,14 +41,14 @@ export default defineComponent({
 
         // 初步加载时
         videoItem.value.one('loadedmetadata', (e: any) => {
-          if (item.value.autoplay && videoItem.value) {
-            videoItem.value?.play()
-          } else {
-            item.value.muted = false
-            item.value.videoEle?.muted(false)
-            item.value.videoEle?.volume(1)
-            item.value.videoEle?.pause()
-          }
+          // if (item.value.autoplay && videoItem.value) {
+          //   videoItem.value?.play()
+          // } else {
+          //   item.value.muted = false
+          //   item.value.videoEle?.muted(false)
+          //   item.value.videoEle?.volume(1)
+          //   item.value.videoEle?.pause()
+          // }
 
           // 获取时长
           const videoEle = videoItem.value
@@ -59,15 +59,15 @@ export default defineComponent({
 
           if (item.value.autoplay && videoItem.value) {
             item.value.muted = false
-            item.value.videoEle?.muted(false)
-            item.value.videoEle?.volume(1)
-            // item.value.videoEle?.pause()
+            videoItem.value?.muted(false)
+            videoItem.value?.volume(1)
+            // videoItem.value?.pause()
             videoItem.value?.play()
           } else {
             item.value.muted = false
-            item.value.videoEle?.muted(false)
-            item.value.videoEle?.volume(1)
-            item.value.videoEle?.pause()
+            videoItem.value?.muted(false)
+            videoItem.value?.volume(1)
+            videoItem.value?.pause()
           }
         })
 
@@ -88,9 +88,9 @@ export default defineComponent({
           console.log('暂停')
           //暂停
           item.value.paused = true
-          item.value.videoEle?.pause()
+          videoItem.value?.pause()
           setTimeout(() => {
-            item.value.videoEle?.pause()
+            videoItem.value?.pause()
           }, 100)
         })
 
@@ -100,9 +100,9 @@ export default defineComponent({
           // console.log(JSON.parse(JSON.stringify(item.value)), 'play ------ ')
           if (item.value.muted) {
             item.value.muted = false
-            item.value.videoEle?.muted(false)
-            item.value.videoEle?.volume(1)
-            item.value.videoEle?.pause()
+            videoItem.value?.muted(false)
+            videoItem.value?.volume(1)
+            videoItem.value?.pause()
           }
         })
 
@@ -151,9 +151,9 @@ export default defineComponent({
             poster={iconVideobg}
             data-vid={item.value.id}
             src={item.value.content}
-            loop={item.value.loop}
-            autoplay={item.value.autoplay}
-            muted={item.value.muted}
+            // loop={item.value.loop}
+            // autoplay={item.value.autoplay}
+            // muted={item.value.muted}
           >
             <source src={item.value.content} type="video/mp4" />
           </video>

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.lexiaoya.cn/';
-const proxyUrl = 'https://dev.lexiaoya.cn/'
+const proxyUrl = 'https://test.lexiaoya.cn/'
 // const proxyUrl = 'http://47.98.131.38:8989/'
 // const proxyUrl = 'http://192.168.3.20:8989/' // 邹旋
 // const proxyUrl = 'http://192.168.3.143:8989/' // 尚科