课程介绍页面调整

pages/component/commonComponents/video/index.vue

@@ -56,9 +56,10 @@
 
 	// importScripts('@/static/aliplayer/aliplayer-min.js')
 	export default {
-		props: ["currentVideo", "currentVideoList"],
+		props: ["currentVideo", "currentVideoList",'noRecored'],
 		data() {
 			return {
+				// noRecored 为true时候不记录播放时长
 				//当前是否是全屏模式
 				isFullScreen: false,
 				isfresh: false,
@@ -75,6 +76,7 @@
 				isSetFirstTime: false,
 				screenType: null,
 				videoUrl: null,
+				num:0,
 			};
 		},
 		computed: {
@@ -98,7 +100,9 @@
 			// plus.screen.lockOrientation("portrait-primary");
 			// #endif
 			this.timer = null;
-			await this.setVideoTime();
+			
+				await this.setVideoTime();
+					
 			this.player.dispose();
 		},
 
@@ -130,8 +134,8 @@
 			this.timer = setInterval(() => {
 				var that = this;
 				if (this.currentTime) {
-					that.setVideoTime();
+					
-					console.log('我是onload定义的定时');
+						that.setVideoTime();					
 				}
 			}, 60000);
 			
@@ -189,12 +193,12 @@
 					var that = this;
 					if (this.currentTime) {
 						console.log('我是init定义的定时');
-						await that.setVideoTime();
+							await that.setVideoTime();						
 					}
 				}, 60000);
 				await this.getLive();
 			},
-			async getData(data) {
+			async getData(data) {				
 				if (!this.isSetFirstTime) {
 					var netWork = this.videoData.userCourseVideoPositionEntity ?
 						this.videoData.userCourseVideoPositionEntity.position :
@@ -218,8 +222,8 @@
 						}
 					}
 					this.currentTime = this.firstTime;
-					console.log(this.firstTime, "这是第一次播放时长222");
+					console.log(this.firstTime, "这是第一次播放时长222",this.noRecored);	
-					await this.setVideoTime();
+						await this.setVideoTime();					
 					uni.setStorageSync("videoOssList", JSON.stringify(list));
 
 					if (this.currentVideo.type == 0 || this.currentVideo.type == 2) {
@@ -309,10 +313,15 @@
 				var data = list.find((e) => e.id == this.videoData.id);
 				this.currentTime = data.time;
 				console.log('this.currentTime at line 这是结束的时候掉的存储视频:', this.currentTime)
-				await this.setVideoTime();
+				await this.setVideoTime();				
 				this.timer = null;
 			},
 			setVideoTime(time) {
+				let thisBlur = JSON.parse(this.noRecored)
+				if(thisBlur){
+					console.log('本条视频不记录播放记录，是未购买且试听章节',thisBlur);
+					return
+				}
 				console.log("是否走了存储视屏," + this.videoData.id, this.currentTime, );
 				var data = {
 					videoId: this.videoData.id,
@@ -767,8 +776,10 @@
 			async receiveIsfresh(newValue) {
 				if (newValue) {
 					if (this.player) {
-						this.timer = null;
+						this.timer = null;					
-						await this.setVideoTime();
+						
+							await this.setVideoTime();
+						
 						this.player.dispose();
 						// this.player.seek(newValue);
 					}

pages/course/index.vue

@@ -360,6 +360,7 @@
 			}
 
 			.jianjie {
+				line-height: 30rpx; height: 60rpx; overflow: hidden; 
 				overflow: hidden!important;
 				margin-top: 10rpx;
 				font-size: 24rpx;

pages/course/myCourse.vue

@@ -36,14 +36,14 @@
 						VIP畅学
 					</view>
 					<!-- <view class="imgcontainer" :style="{backgroundImage:surl(item.image)}"> -->
-					<view class="imgcontainer" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+					<view class="imgcontainer" @click="onPageJump('/pages/course/courseDetail',item.id)">
 						<image v-if="item.image && item.image != ''" :src="item.image" mode="aspectFit"></image>
 						<!-- <image  :src="item.image" mode="" @click="goDetail(item.productId)"></image> -->
 						<!-- <image v-else src="/static/nobg.jpg" mode="widthFix"></image> -->
 					</view>
 					<view class="buyItems">
 						<view class="txt555">
-							<view class="" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+							<view class="" @click="onPageJump('/pages/course/courseDetail',item.id)">
 								{{item.title}}
 							</view>							
 						</view>						
@@ -54,7 +54,7 @@
 							<!-- 收藏状态{{item.isStudying}} -->
 							<text class="add citem" v-if="item.isStudying == 0" @click="addCollection(item,index)">加入在学习</text>
 							<text class="del citem" v-else @click="delCollection(item,index)">取消在学习</text>
-							<text class="citem btn_box"  @click="onPageJump('/pages/course/myCourseLearn',item.id)">去学习</text>
+							<text class="citem btn_box"  @click="onPageJump('/pages/course/courseDetail',item.id)">去学习</text>
 						</view>						
 					</view>
 
@@ -76,11 +76,11 @@
 					</view>
 					<!-- {{userMsg}} -->
 					<!-- <view class="imgcontainer" :style="{backgroundImage:surl(item.image)}"> -->
-					<view class="imgcontainer" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+					<view class="imgcontainer" @click="onPageJump('/pages/course/courseDetail',item.id)">
 						<image :src="item.image" mode="aspectFit"></image>
 					</view>
 					<view class="buyItems">
-						<view class="txt555" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+						<view class="txt555" @click="onPageJump('/pages/course/courseDetail',item.id)">
 							{{item.title}}
 						</view>						
 						<view class="jianjie" v-html="item.content">			
@@ -88,7 +88,7 @@
 						<view class="collection">
 							<!-- <text class="add citem" v-if="item.isStudying == 0" @click="addCollection(item,index)">加入在学习</text> -->
 							<text class="del citem"  @click="delCollection(item,index)">取消在学习</text>
-							<text class="citem btn_box"  @click="onPageJump('/pages/course/myCourseLearn',item.id)">去学习</text>
+							<text class="citem btn_box"  @click="onPageJump('/pages/course/courseDetail',item.id)">去学习</text>
 						</view>	
 					</view>
 			
@@ -854,6 +854,7 @@
 			}
 
 			.jianjie {
+				line-height: 30rpx; height: 60rpx; overflow: hidden; 
 				margin-top: 10rpx;
 				font-size: 24rpx;
 				@include bov();

pages/mine/wallet/recharge/index.vue

@@ -139,7 +139,7 @@
 					},
 				],
 				iosPaylist: [{
-					title: "apple pay支付",
+					title: "IAP支付",
 					id: 3,
 					imgUrl: require("@/static/icon/pay_2.png"),
 				}, ],

pages/peanut/home.vue

@@ -63,7 +63,7 @@
 				<text>正在学习</text>
 			</view>
 			<view class="learn flexbox">
-				<view class="item" v-for="(item, index) in learnList" :key="index" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+				<view class="item" v-for="(item, index) in learnList" :key="index" @click="onPageJump('/pages/course/courseDetail',item.id)">
 					<view class="img" style="overflow: hidden;">
 						<image v-if="item.image && item.image != ''" :src="item.image" mode="aspectFit"></image>
 						<image v-else src="/static/nobg.jpg" mode="widthFix"></image>

utils/myIapCheck.js

@@ -109,7 +109,8 @@ var iap = {
 				}
 			})
 			.catch((e) => {
-				console.log('后台验证失败=>',e);				
+				console.log('后台验证失败=>',e);	
+			// that.finishTransaction(result);
 			});
 	},
 }