ss

common/config.js

@@ -1,8 +1,8 @@
 // test 测试环境
 const test = {
-	// BASE_URL: "https://testapi.xyyxt.net",
+	BASE_URL: "https://testapi.xyyxt.net",
 	// BASE_URL: "http://120.79.166.78:19012",
-	BASE_URL: "http://192.168.1.123:5055",
+	// BASE_URL: "http://192.168.1.123:5055",
 	BASE_IMG_URL: "https://file-dev.xyyxt.net/",
 	domain: "h.xyyxt.net",
 	tenantId: "867735392558919680", //详粤云学堂

common/request.js

@@ -116,7 +116,7 @@ export const myRequest = (options) => {
 			fail: (err) => {
 				uni.hideLoading();
 				uni.showToast({
-					title: "系统升级中",
+					title: "网络波动异常，请检查网络。",
 					icon: "none",
 				});
 				console.log("请求失败err---: ", options.url);

components/myPlayer2/tcPlayer.vue

@@ -155,7 +155,7 @@
 					},
 					// 视频播放或由暂停恢复播放时触发
 					playing() {
-						console.log("腾讯视频恢复播放");
+						console.log("腾讯视频恢复播放"+this.needSeek+'|'+!this.Elevideo);
 						if (!this.PlayStart) {
 							this.onPlayStart();
 						}

components/popup/camera.vue

@@ -3,7 +3,7 @@
 		<u-popup v-model="isShow" mode="bottom" border-radius="40" :mask-close-able="false">
 			<view class="photoBox" v-if="isShow">
 				<view class="photoTop">
-					<view class="centersq">请正视手机屏幕</view>
+					<view class="centersq">请正视手机屏幕<button @click="showenter" type="primary" style="margin-left: 20px;">{{showCenter?"收起":"隐藏"}}</button></view>
 				</view>
 				<view class="photoCenter">
 					<view class="center_camera" v-if="isTaking">
@@ -110,9 +110,13 @@
 				popupPhotoShow: false,
 				faceUrl: "",
 				stream:null,
+				showCenter:true
 			};
 		},
 		methods: {
+			showcenter(){
+				this.showCenter=!this.showCenter;
+			},
 			error(err){
 				console.log(err)
 			},
@@ -123,7 +127,7 @@
 				this.uploadLock = true;
 				let imgUrl = await this.imageInfos()
 				let compareFaceData = await this.faceRecognition(imgUrl);
-				if (compareFaceData.code === 200) {
+				if (compareFaceData.code == 200) {
 					this.$emit("submitPhoto",imgUrl, compareFaceData.data);
 				} else {
 					uni.showToast({
@@ -219,6 +223,7 @@
 			showCamera() {
 				this.isTaking = true;
 				this.isShow = true;
+				this.showCenter=true;
 			},
 			//确认拍照
 			takePhoto() {
@@ -249,6 +254,7 @@
 			reTake() {
 				this.uploadLock = false;
 				this.isTaking = true;
+				this.showCenter=true;
 				// #ifdef MP-WEIXIN
 				// 屏幕亮度
 				uni.setKeepScreenOn({

components/popup/media.vue

@@ -3,9 +3,9 @@
 		<u-popup v-model="isShow" mode="bottom" border-radius="40" :mask-close-able="false">
 			<view class="photoBox" v-if="isShow">
 				<view class="photoTop">
-					<view class="centersq">请正视手机屏幕</view>
+					<view class="centersq">请正视手机屏幕 <button @click="showenter" type="primary" style="margin-left: 20px;">{{showCenter?"收起":"隐藏"}}</button></view>
 				</view>
-				<view class="photoCenter">
+				<view class="photoCenter" v-show="showCenter">
 					<view class="center_camera" v-if="isTaking">
 						<!-- #ifdef MP-WEIXIN -->
 						<camera device-position="front" flash="off" @error="error"
@@ -133,9 +133,13 @@
 				videoblob: null,
 				url: null,
 				faceUrl: null,
+				showCenter:true
 			};
 		},
 		methods: {
+			showcenter(){
+				this.showCenter=!this.showCenter;
+			},
 			error(err) {
 				console.log(err)
 			},
@@ -243,6 +247,7 @@
 			showCamera() {
 				this.isTaking = true;
 				this.isShow = true;
+				this.showCenter=true;
 			},
 			//确认拍照
 			takePhoto() {
@@ -395,6 +400,7 @@
 			again() {
 				this.url = null;
 				this.status = 1;
+				this.showCenter=true;
 			},
 			luzhi() {
 				if (this.status === 3) {

pages/course/index.vue

@@ -164,6 +164,16 @@
 			if (activeTypeData.hasOwnProperty(option.businessKey)) {
 				this.activeData = activeTypeData[option.businessKey];
 			}
+			else if(option.educationId||option.projectId||option.businessId)
+			{
+				this.activeData = {
+					educationId: option.educationId??"",
+					projectId: option.projectId??"",
+					businessId:option.businessId?? "",
+					subjectId: "",
+					sortType: 1
+				};
+			}
 
 			if (option.current) {
 				this.$store.state.current = Number(option.current)

pages3/polyv/detail.vue

@@ -10,7 +10,7 @@
 					<icon type="cancel" style="float: right;color:#ff3535;" @click="closepopup" size="26" />
 				</view>
 			</uni-popup>
-			<view class="video_box" v-if="!playVid">
+			<view class="video_box" v-if="!playVid||hideplayer">
 				<image :src="$method.splitImgHost(goodsData.coverUrl)" mode="widthFix"
 					style="width: 100%; height: 421rpx">
 				</image>
@@ -302,6 +302,7 @@
 				CountTo2: 0,
 				CountTo2Times: null,
 				reerrorcode:0,
+				hideplayer:false,
 			};
 		},
 		computed: {
@@ -1714,7 +1715,7 @@
 				}).then((res) => {});
 			},
 			timeupdate(time) {
-				// console.log("🚀 ~ file: detail.vue:1498 ~ timeupdate ~ time:");
+				 console.log("🚀 ~ file: detail.vue:1498 ~ timeupdate ~ time:"+time);
 				if (this.noticeShow) {
 					this.refPlv.playPause();
 					return;
@@ -1828,11 +1829,13 @@
 						});
 						return;
 					}
+					this.hideplayer=true;//先隐藏播放器
 					uni.showModal({
 						title: "温馨提示",
 						content: "当前节视频已学完，继续学习下一节？",
 						success: async (res) => {
 							if (res.confirm) {
+								this.hideplayer=false;
 								this.videoCurrentTime=0;
 								this.moduleId = data.moduleId;
 								this.chapterId = data.chapterId;
@@ -1852,6 +1855,9 @@
 								}
 								this.updateChapterOpen(true);
 							}
+							else if(res.cancel){
+								this.hideplayer=false;
+							}
 						},
 					});
 				}