Ver código fonte

修改定时销毁

huangjianlei 1 ano atrás
pai
commit
d2d8ded9f2

+ 15 - 0
common/httpList/course.js

@@ -271,4 +271,19 @@ export default {
 			method: "get",
 		});
 	},
+	// 获取skipPort
+	courseSkipPort(data) {
+		return myRequest({
+			url: '/course/skipPort',
+			method: 'get',
+			data: data
+		})
+	},
+	// 获取判断课程类型
+	orderGetViewSign(data) {
+		return myRequest({
+			url: '/order/getViewSign/' + data,
+			method: 'get'
+		})
+	},
 };

+ 1 - 9
common/httpList/tcVideo.js

@@ -9,13 +9,5 @@ export default {
 			method: 'get',
 			// noToken: true
 		})
-	},
-	//获取skipPort
-	courseSkipPort(data) {
-		return myRequest({
-			url: '/course/skipPort',
-			method: 'get',
-			data: data
-		})
-	},
+	}
 }

+ 4 - 2
components/myPlayer2/tcPlayer.vue

@@ -87,10 +87,12 @@
 					playbackRate = JSON.parse(JSON.stringify(this.playbackRate));
 				}
 				const TCPlayer = window.TCPlayer;
+				console.log("腾讯视频是否自动播放", this.autoplay)
 				console.log("腾讯视频是否允许拖拽进度条", this.progressControl)
 				this.$api.tcVideoSign(this.fileId).then(async (res) => {
 					console.log('请求腾讯视频参数', res)
 					let option = {
+						preload: "auto",
 						fakeFullscreen: true,
 						// licenseUrl: 'https://license.vod2.myqcloud.com/license/v2/1323759362_1/v_cube.license',
 						plugins: {
@@ -116,7 +118,7 @@
 					};
 					if (tcPlayerContext) {
 						tcPlayerContext.loadVideoByID({
-							fileID: res.data.data.fileID,
+							fileID: this.fileId,
 							appID: res.data.data.appID,
 							psign: res.data.data.psign
 						});
@@ -129,7 +131,7 @@
 								// console.log(res.screenHeight); // 屏幕高度,包含导航栏
 								// console.log(res.windowHeight); // 能够使用的窗口高度,不包含导航栏
 								// console.log(res.screenWidth); // 屏幕宽度
-								// console.log(res.windowWidth); //  能够使用的窗口宽度
+								// console.log(res.windowWidth); // 能够使用的窗口宽度
 								// // 能够使用的窗口高度,将px转换rpx
 								// this.windowHeight = (res.windowHeight * (750 / res.windowWidth))
 								// console.log(this.windowHeight)

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "Applet",
-    "appid" : "__UNI__75DC42D",
+    "appid" : "__UNI__7BF80BC",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 12 - 4
pages/learn/index.vue

@@ -887,7 +887,12 @@
 
 				// 进入视频课
 				this.activeItem = item;
-				item.viewSign = 2;
+				this.$api
+					.orderGetViewSign(item.orderGoodsId)
+					.then((res) => {
+						console.log('请求的viewSign', res.data.data.viewSign)
+						item.viewSign = res.data.data.viewSign;
+					})
 				if (item.interfaceAccountId > 0) {
 					//学习账号已开通
 
@@ -903,6 +908,7 @@
 							this.$api
 								.courseSkipPort()
 								.then((res) => {
+									console.log("请求的域名", res.data.data.domain)
 									let obj = {
 										goodsId: item.goodsId,
 										orderGoodsId: item.orderGoodsId,
@@ -911,7 +917,7 @@
 										viewSign: item.viewSign,
 										skipPort: res.data.data.skipPort,
 									}
-									let webViewUrl = encodeURIComponent('http://192.168.1.213:8081' +
+									let webViewUrl = encodeURIComponent(res.data.data.domain +
 										'/pages3/polyv/detail?obj=' +
 										JSON.stringify(obj))
 									uni.navigateTo({
@@ -1059,6 +1065,7 @@
 									this.$api
 										.courseSkipPort()
 										.then((res) => {
+											console.log("请求的域名", res.data.data.domain)
 											let obj = {
 												id: '',
 												goodsId: item.goodsId,
@@ -1070,7 +1077,7 @@
 												skipPort: res.data.data.skipPort
 											}
 											let webViewUrl = encodeURIComponent(
-												'http://192.168.1.213:8081' +
+												res.data.data.domain +
 												'/pages3/polyv/detail?obj=' +
 												JSON.stringify(obj))
 											uni.navigateTo({
@@ -1106,6 +1113,7 @@
 									this.$api
 										.courseSkipPort()
 										.then((resForDetail) => {
+											console.log("请求的域名", resForDetail.data.data.domain)
 											let obj = {
 												id: res.data.rows[0].courseId,
 												goodsId: item.goodsId,
@@ -1117,7 +1125,7 @@
 												skipPort: resForDetail.data.data.skipPort
 											}
 											let webViewUrl = encodeURIComponent(
-												'http://192.168.1.213:8081' +
+												resForDetail.data.data.domain +
 												'/pages3/polyv/detail?obj=' +
 												JSON.stringify(obj))
 											uni.navigateTo({

+ 1 - 3
pages3/polyv/detail.vue

@@ -346,7 +346,7 @@
 				option = JSON.parse(decodeURIComponent(option.obj));
 			}
 			if(option.viewSign == '2') {
-				console.log('testViewSign', option.viewSign, this.playSource)
+				console.log("检测ViewSign", option.viewSign, this.playSource)
 				this.playSource = option.viewSign;
 			}
 			if (option.isOther) {
@@ -374,10 +374,8 @@
 				},
 			});
 			if (skipPort) {
-				console.log("Jos")
 				await this.$method.skipLogin(skipPort);
 			}
-			console.log('come in')
 			if (this.$method.isGoLogin()) {
 				return;
 			}