From 80bef54e47ae77db5bbbf74ce5f72cc71538e69f Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 12 Aug 2024 16:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonComponents/curriculumVideo.vue      |  7 +++--
 .../commonComponents/video/index.vue          |  6 ++---
 pages/course/chapterDetailAndorid.vue         | 26 ++++++++++---------
 pages/course/courseDetail.vue                 |  1 +
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pages/component/commonComponents/curriculumVideo.vue b/pages/component/commonComponents/curriculumVideo.vue
index 447bc94..8620877 100644
--- a/pages/component/commonComponents/curriculumVideo.vue
+++ b/pages/component/commonComponents/curriculumVideo.vue
@@ -6,8 +6,8 @@
       scroll-x="true"
       class="detail_title video_box"
       style="background-color: #fff"
-    >
-    
+    >	
+   
       <view
         v-for="(v, i) in dataList"
         :class="`video_item ${currentVideo&&currentVideo.id == v.id ? 'hot' : ''}`"
@@ -35,6 +35,9 @@ export default {
   },
   onLoad(options) {},
   onHide() {},
+  mounted() {
+  	console.log('currentVideo播放列表收到的--',this.currentVideo)
+  },
   computed: {
     ...mapState(["userInfo"]),
   },
diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue
index cea46a4..f17d6c8 100644
--- a/pages/component/commonComponents/video/index.vue
+++ b/pages/component/commonComponents/video/index.vue
@@ -127,12 +127,12 @@
 				this.isChange = false;
 			},
 			async changeVideo(data) {
-				console.log('changeVideo',);
+				console.log('changeVideo+++++++++',data);				
 				this.currentTime = "";
 				this.firstTime = 0;
 				this.isSetFirstTime = false;
 				this.isChange = false;
-				this.getLive(true, this.currentVideo)
+				this.getLive(true, data)
 				// await this.init(data, true);
 			},
 			screenChange(data) {
@@ -663,7 +663,7 @@
 							source: this.videoData.m3u8Url,							
 							// "playConfig": {"EncryptType": "HLSEncryption"}
 						}
-						console.log('这是标准加密的视频');
+						console.log('这是标准加密的视频',this.videoData.id,this.videoData.m3u8Url);
 					}
 
 				} else {
diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue
index 73476c2..ef7dbe3 100644
--- a/pages/course/chapterDetailAndorid.vue
+++ b/pages/course/chapterDetailAndorid.vue
@@ -7,7 +7,7 @@
 
       <view
         class="contentBox curriculum_box"
-        :style="`height:calc(100% - ${60 + statusBarHeight}px !important;${
+        :style="`height:calc(100% - ${60 + statusBarHeight}px !important; overflow-x: hidden; ${
           isFullScreen ? 'background:#000' : ''
         }`"
       >
@@ -25,8 +25,7 @@
           >
           </common-video>
           <view style="height: 200px" v-else></view>
-        </view>
-
+        </view>		
         <scroll-view
           :style="`height:calc(100% - 200px - 40rpx) ;`"
           scroll-y="true"
@@ -280,23 +279,25 @@ export default {
       });
     },
     changeVideo(data) {
-      console.log("data at line 370:", data);	 
+      console.log("点击了点击了切换视频-----:", data);
+		
       if (data.id != this.currentVideo.id) {
         // handleEnd
         // this.$refs.commonVideo.handleEnd();
-
         setTimeout(() => {
-          this.currentVideo = data;
-		  this.$refs.commonVideo.changeVideo();
+          
+		  this.$refs.commonVideo.changeVideo(data);
+		  this.currentVideo = data;
 		   // this.changeVideo()
           // this.initVideo();
           this.isOpenMp3 = false;
         }, 500);
-      } else {
-        this.currentVideo = data;
-        this.initVideo();
-        this.isOpenMp3 = false;
-      }
+      } 
+	  // else {
+   //      this.currentVideo = data;
+   //      this.initVideo();
+   //      this.isOpenMp3 = false;
+   //    }
 
       // console.log("data at line 380111111111111111111:", data.type);
     },
@@ -376,6 +377,7 @@ export default {
             isHaveHistorySeekVideo != -1 ? isHaveHistorySeekVideo : 0;
           if (that.videoArray.length > 0) {
             this.currentVideo = that.videoArray[that.currentCateIndex];
+			console.log('默认播放的index',that.currentCateIndex, this.currentVideo.id,that.videoArray);
             this.initVideo();
           }         
           var videoArray = [];
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 9901097..5a32938 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -1902,6 +1902,7 @@
 		}
 
 		.price {
+			
 			// text-align: center;
 			font-size: 26rpx;
 			font-weight: bold;