1

pages/catalog/detail.uvue

@@ -89,18 +89,9 @@ async function handleEnded() {
           progress: progress2.value,
         }
       });
-      progress2.value += 2
-      break
-    case 4:
-      router.push({
-        path: "/pages/catalog/web-view",
-        query: {
-          src: data.value.webviewSrc,
-          progress: progress2.value,
-        }
-      });
       progress2.value++
       break
+    case 4:
     case 5:
     case 6:
       progress2.value++
@@ -127,32 +118,43 @@ watchEffect(() => {
   if (progress.value === 1) {
     switch (progress2.value) {
       case 1:
-        showVideo.value = true
-        data.value.videoSrc = course.value?.detailItem?.observeVideoPath || ''
-        data.value.webviewSrc = course.value?.detailItem?.observeAnimationPath || ''
+        data.value.videoSrc = course.value?.detailItem?.observeVideoPath || data.value.videoSrc
+        data.value.webviewSrc = course.value?.detailItem?.observeAnimationPath || data.value.webviewSrc
         break
       case 2:
-        showVideo.value = true
-        data.value.videoSrc = course.value?.detailItem?.questionVideoPath || ''
+        data.value.videoSrc = course.value?.detailItem?.questionVideoPath || data.value.videoSrc
         break
       case 3:
-        showVideo.value = false
-        data.value.webviewSrc = course.value?.detailItem?.assumeAnimationPath || ''
+        data.value.webviewSrc = course.value?.detailItem?.assumeAnimationPath || data.value.webviewSrc
+        router.push({
+          path: "/pages/catalog/web-view",
+          query: {
+            src: data.value.webviewSrc,
+            progress: progress2.value,
+          }
+        });
+        progress2.value++
         break
       case 4:
-        showVideo.value = true
-        data.value.videoSrc = course.value?.detailItem?.testVideoPath || ''
-        data.value.webviewSrc = course.value?.detailItem?.testAnimationPath || ''
+        // data.value.videoSrc = course.value?.detailItem?.testVideoPath || data.value.videoSrc
+        data.value.webviewSrc = course.value?.detailItem?.testAnimationPath || data.value.webviewSrc
+        router.push({
+          path: "/pages/catalog/web-view",
+          query: {
+            src: data.value.webviewSrc,
+            progress: progress2.value,
+          }
+        });
+        progress2.value++
         break
       case 5:
-        data.value.videoSrc = course.value?.detailItem?.summaryVideoPath || ''
+        data.value.videoSrc = course.value?.detailItem?.summaryVideoPath || data.value.videoSrc
         break
       case 6:
-        data.value.videoSrc = course.value?.detailItem?.expandVideoPath || ''
+        data.value.videoSrc = course.value?.detailItem?.expandVideoPath || data.value.videoSrc
         break
     }
   }
-  console.log(data.value.videoSrc)
 })
 function handleMessage(e) {
   console.log(123, e)