From a5d05367bd01899c78d6b9ab90934638cd7d5fa1 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 12 Jul 2024 11:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonComponents/video/index.vue          |  2 +
 pages/course/chapterDetail.vue                |  5 +-
 pages/course/courseDetail.vue                 | 46 +++++++++----------
 pages/peanut/home.vue                         |  2 +-
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue
index d0cc53a..c1f0322 100644
--- a/pages/component/commonComponents/video/index.vue
+++ b/pages/component/commonComponents/video/index.vue
@@ -300,6 +300,7 @@
 							this.videoUrl =
 								// "https://ehh-private-01.oss-cn-beijing.aliyuncs.com/video/taiHuClass/" +
 								res.video.videoUrl;
+								console.log('这是常规视频');
 							// this.$nextTick(async () => {
 							//   await this.getData();
 							// });
@@ -322,6 +323,7 @@
 					console.log('本条视频不记录播放记录，是未购买且试听章节',thisBlur);
 					return
 				}
+				console.log('本条视频需要记录播放时长',thisBlur);
 				console.log("是否走了存储视屏," + this.videoData.id, this.currentTime, );
 				var data = {
 					videoId: this.videoData.id,
diff --git a/pages/course/chapterDetail.vue b/pages/course/chapterDetail.vue
index e247a66..b65b1d3 100644
--- a/pages/course/chapterDetail.vue
+++ b/pages/course/chapterDetail.vue
@@ -11,6 +11,7 @@
           isFullScreen ? 'background:#000' : ''
         }`"
       >
+	  <!-- 加密视频 -->
         <view :style="`background:#000`">
           <common-video
             @changeScreen="changeScreen"
@@ -336,8 +337,9 @@ export default {
     };
   },
   onLoad(options) {
+	// #ifdef APP-PLUS
     plus.screen.lockOrientation("default");
-
+// #endif
     this.options = options;
 	this.noRecored = options.noRecored
 	console.log('this.noRecored=>',this.noRecored)
@@ -349,6 +351,7 @@ export default {
     // #ifdef APP-PLUS
     plus.screen.unlockOrientation(); //解除锁定屏幕方向
     plus.screen.lockOrientation("portrait-primary");
+	
     this.getCourseDescriptionData();
 
     // this.getUserInfo()
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 2c08fe3..2bb8998 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -81,32 +81,30 @@
 						v-for="(item, index) in librayList" :key="index" @click="clicklib(item,index)">
 						<view class=""><text>{{item.title}}</text></view>
 					</view>
+					
 				</view>
 				<!-- end -->
 				<template v-if="librayList[curIndex]">
 					<view :class="['endBox',userMsg.vip != 0 ? 'vipBgColor':'']"
 						v-if="librayList[curIndex].isBuy == 1 || userMsg.vip != 0">
 						<!-- 已经可以观看的情况 -->
-						<view class="">
-							<view class="flexbox" v-if="librayList[curIndex].startTime == null">
-								<text>当前目录还未开始学习</text>
+						<view class="box">
+							<view class="flexbox" v-if="userMsg.vip != 0">	
+									<!-- vip到期时间 -->
+								<text>VIP畅学权益有效期截止到：{{userMsg.userVip.endTime}} </text>
 								<!-- <uni-tag type="warning" text="去学习"></uni-tag> -->
 							</view>
 							<view class="flexbox" v-else>
-								<template v-if="userMsg.vip != 0">
-									<!-- vip到期时间 -->
-									<text>vip课程有效期截止到：{{userMsg.userVip.endTime}} </text>
+								<template  v-if="librayList[curIndex].startTime == null">									
+									<text>当前目录还未开始学习</text>									
 								</template>
 								<template v-else>
-
 									<!-- 实际购买课程到期时间 -->
 									<text style="line-height: 50rpx;">课程有效期截止到：{{librayList[curIndex].endTime}} </text>
 									<!-- 自己买的可以续费 -->
 									<text class="xufeiBtn"
 										@click="handleClickGetGoodsList(librayList[curIndex])">续费</text>
-
-								</template>
-								<!-- <uni-tag type="primary" text="继续学习" @click="onPageJump('')"></uni-tag> -->
+								</template>								
 							</view>
 						</view>
 					</view>
@@ -1379,13 +1377,14 @@
 		background-color: #fff; border-bottom: 1px solid #eee;
 }
 	.endBox {
-		// @include theme("vipbtnbg");
-		background-color: #258feb;
-		color: #fff;
+		// @include theme("vipbtnbg");		
+		color: #333;
 		font-size: 26rpx;
 		// margin: 20rpx 0;
 		padding: 10rpx 20rpx;
-
+		.box{
+			// background-color: #258feb;
+			}
 		.flexbox {
 			justify-content: space-between;
 		}
@@ -1482,9 +1481,9 @@
 	}
 
 	.xufeiBtn {
-		display: inline-block;
-		padding: 4rpx 10rpx;
-		border: 1px solid #fff;
+		display: block; line-height: 50rpx; height: 50rpx;
+		padding: 0 10rpx;
+		border: 1px solid #333;
 		border-radius: 10rpx;
 	}
 
@@ -1976,7 +1975,7 @@
 	.buyBox {}
 
 	.vipBgColor {
-		background-color: #8265f9 !important;
+		// background-color: #8265f9 !important;
 	}
 
 	.coursePart {
@@ -1985,16 +1984,16 @@
 		border-radius: 20rpx 20rpx 0 0;
 		@include pleft_right(10px);
 		align-items: flex-end;
-		@include mshadow(10px, 1);
+		// @include mshadow(10px, 1);
 		margin-top: 20rpx;
 		padding: 0 20rpx;
 		padding-top: 20rpx;
-		background-color: $themeColor;
+		// background-color: $themeColor;
 
 		.item {
 			justify-content: center;
 			align-items: center;
-			color: #fff;
+		    color: #fff;
 			width: 100%;
 			text-align: center;
 			padding: 16rpx 0;
@@ -2014,8 +2013,9 @@
 		}
 
 		.item.active {
-			background-color: #fbfbff;
-			color: $themeColor;
+			// background-color: #fbfbff;
+			background-color: $themeColor;
+			color: #fff;
 			padding: 20rpx 0 !important;
 
 			text {
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 689dc76..3479a06 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -60,7 +60,7 @@
 		<view class="learnBox" >
 			<view class="titleBox flexbox">
 				<image src="../../static/learing.png" mode="aspectFit"></image>
-				<text>正在学习</text>
+				<text>观看记录</text>
 			</view>
 			<view class="learn flexbox">
 				<view class="item" v-for="(item, index) in learnList" :key="index" @click="onPageJump('/pages/course/courseDetail',item.id)">