查看回放

pages.json

@@ -156,13 +156,6 @@
 				"navigationBarTitleText": "查看回放",
 				"enablePullDownRefresh": false
 				}
-		},
-		{
-			"path" : "pages/videoPage/videoPage",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
 		}
 		
 		// {

pages/activityDetailNew/activityDetailNew.vue

@@ -106,48 +106,41 @@
 				</view>
 			</view>
 			<view class="rightBtn">
-				<view class="btnt1" v-if="actItemList.openid==oid">本人创建，暂不支持加入</view>
-				<view class="btnt" v-else-if="!isSign" @click="applyAdd">立即报名</view>
-				<view class="btnt1" style="width:200rpx;" v-if="isSign && !isExpired" @click="cancelAdd">取消报名
+				<view class="btnt" v-if="!isSign" @click="applyAdd">立即报名</view>
+				<view class="btnt1" style="width:200rpx;font-size: 15px;height: 40px;" v-if="isSign && !isExpired"
+					@click="cancelAdd">取消报名
 				</view>
-				<view class="btnt" style="width:200rpx;margin-left:15px" v-if="isSign && !isExpired"
-					@click="Attend">参与活动</view>
+				<view class="btnt" style="width:200rpx;margin-left:15px;font-size: 15px;height: 40px;"
+					v-if="isSign && !isExpired" @click="Attend">
+					参与活动</view>
 				<view class="btnt" v-else-if="isSign && isExpired" @click="lookPlayback">查看回放</view>
-				<!-- <view class="btnt" style="background-color: #ccc;" v-else-if="!isSign && isExpired">报名时间结束</view> -->
-				<!-- <view class="btnt1" v-else-if="actItemList.bnum>=actItemList.pers">人数已满</view> -->
-
-				<!-- <view class="btnt1" v-else-if="isSign && actItemList.openid!=oid">已报名</view> -->
 			</view>
 		</view>
+		<!-- 查看回放弹框 -->
+		<u-modal :showConfirmButton="false" :show="PlaybackDig" closeOnClickOverlay @close="PlaybackDig=false">
+			<u--image showMenuByLongpress :src="actItemList.playback"></u--image>
+		</u-modal>
 
 		<!-- 报名成功展示跳转二维码 -->
 		<view class="ellone">
-			<u-modal style="height: 600px !important;flex-direction: column !important;" :showConfirmButton="false"
-				:show="DigenrollImg" closeOnClickOverlay @close="DigenrollImg=false">
-				<view style="font-size: 15px;font-weight: 600;margin-top: 20px;">
-					报名成功!
+			<u-modal style="flex-direction: column !important;" :showConfirmButton="false" :show="DigenrollImg"
+				closeOnClickOverlay @close="DigenrollImg=false">
+				<view class="ellTit">
+					<u-icon label="报名成功!" size="18"
+						name="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1720687091199.png"></u-icon>
 				</view>
-				<!-- <view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					{{ popupMessage }}
-				</view> -->
-
-				<u--image style="height: 400px !important;" :src="actItemList.qrlink"></u--image>
+				<u--image style="height: 400px !important;" mode="aspectFit" :src="actItemList.qrlink"></u--image>
 			</u-modal>
 		</view>
+		<!-- 参与活动展示 -->
 		<view class="ellone">
-			<u-modal style="height: 600px !important;flex-direction: column !important;" :showConfirmButton="false"
-				:show="GetInvolved" closeOnClickOverlay @close="GetInvolved=false">
-				<view style="font-size: 15px;font-weight: 600;margin-top: 20px;">
-					已报名!
-				</view>
-				<view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					请扫码进入腾讯会议
+			<u-modal style="flex-direction: column !important;" :showConfirmButton="false" :show="GetInvolved"
+				closeOnClickOverlay @close="GetInvolved=false">
+				<view class="ellTit">
+					<u-icon label="已报名!" size="18"
+						name="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1720687091199.png"></u-icon>
 				</view>
-				<view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					参与此次教研活动
-				</view>
-				<u--image style="height: 400px !important;" :src="actItemList.qrlink"></u--image>
-
+				<u--image mode="aspectFit" :src="actItemList.qrlink"></u--image>
 			</u-modal>
 		</view>
 
@@ -174,9 +167,8 @@
 				<view class="popup">
 					<view class="header" style="margin-top: 15px;">
 						<view class="imgShade">
-							<image src="../../static/mine/gou3.png" mode="aspectFill">
+							<image src="../../static/mine/gou3.png" mode="aspectFill"></image>
 						</view>
-						</image>
 						<text style="margin-bottom: 24px;">报名成功</text>
 					</view>
 
@@ -210,7 +202,6 @@
 				GetInvolved: false,
 				// 页面数据
 				actItemList: {},
-				
 
 				// 用户收藏列表
 				collArr: [],
@@ -223,8 +214,7 @@
 				// 用户订阅列表
 				// subArr: [],
 				uLoading: false,
-				//弹窗是否过期显示的内容
-				popupMessage:'',
+
 				// 收藏按钮节流
 				stopTimer: 0,
 
@@ -240,20 +230,6 @@
 				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png',
 
 				imgLoading: 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1712113517547.png'
-				// nodes: [{
-				// 	name: 'div',
-				// 	attrs: {
-				// 		class: 'div-class',
-				// 		style: 'line-height: 60px; color: red; text-align:center;'
-				// 	},
-				// 	children: [{
-				// 		type: 'text',
-				// 		text: 'Hello&nbsp;uni-app!'
-				// 	}]
-				// }],
-				// strings: '<div style="text-align:center;"><img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png"/></div>'
-				// pic_sub: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
-				// pic_sub2: 'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
 			};
 		},
 		// 分享
@@ -292,16 +268,12 @@
 			});
 
 		},
-		// onUnload() {
-		// 	this.$store.dispatch('asyncDelAll')
-		// },
 		computed: {
 			isExpired() {
 				let dTime = this.dTime.split(',')
-				let bint = new Date(dTime[0]).getTime()
+				let bint = new Date(dTime[1]).getTime()
 				let now = new Date().getTime()
-				// console.log("过期时间",bint);
-				// console.log("当前日期",now);
+				console.log(dTime,bint,now);
 				return bint < now
 			}
 		},
@@ -322,23 +294,17 @@
 			},
 			// 查看回放
 			lookPlayback() {
-				if (!(!!this.actItemList.playback)) {
+				if (!(!!this.actItemList.videolink)) {
 					uni.showToast({
 						title: "暂无回放",
 						icon: 'none'
 					});
 					return
 				}
-
-				// uni.navigateTo({
-				// 	// url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify('https://www.yuketang.cn/v2/web/forbidden'))
-				// 	url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify(this.actItemList
-				// 		.playback))
-				// });
-				// 跳转到另一个页面，传递回放链接作为参数
-				      uni.navigateTo({
-				        url: "/pages/playBack/playBack?acId=" + encodeURIComponent(this.acId)
-				      });
+				uni.navigateTo({
+					url: "/pages/playBack/playBack?acId=" + encodeURIComponent(this.acId)
+				});
+				// this.PlaybackDig = true
 			},
 
 			// 获取页面数据
@@ -351,9 +317,8 @@
 				this.$request('/selectActivityID', "POST", data).then(res => {
 					console.log('页面数据', res[0][0]);
 					this.dTime = res[0][0].begin_at;
-					
-					
-					
+					// console.log('this.dTime',this.dTime);
+
 					let srrt = this.datejudge(res[0][0].begin_at)
 					console.log('srrt', srrt);
 					res[0][0].begin_at = srrt
@@ -453,45 +418,28 @@
 					this.showPopupConfirm = true
 					this.btnEnroll()
 					this.getUsers()
-					
+					setTimeout(() => {
 						this.showPopupConfirm = false
 						if (this.actItemList.qrlink) {
 							this.DigenrollImg = true
 						}
-						if(this.isExpired){
+						if (this.isExpired) {
 							this.lookPlayback()
 						}
-						// // 根据活动是否过期来设置不同的弹窗内容
-						// if (this.isExpired) {
-						// 	// 活动过期时的弹窗内容
-						// 	this.popupMessage = "扫描后完成用户绑定，可查看活动回放";
-						// } else {
-						// 	// 活动未过期时的弹窗内容
-						// 	this.popupMessage = "参与此次教研活动";
-						// }
-						// this.getData()
-					
+					}, 1500)
 				})
 			},
 			// 参与活动操作
 			Attend() {
-
-				this.showPopup = false
-				
-					// 添加消息页面系统通知提示报名成功
-					this.addMessage()
-
-					this.btnEnroll()
-					this.getUsers()
-
-					this.showPopupConfirm = false
-					if (this.actItemList.qrlink) {
-						this.GetInvolved = true
-					}
-					// this.getData()
-				
+				if (this.actItemList.qrlink) {
+					this.GetInvolved = true
+				} else {
+					uni.showToast({
+						title: '此活动无链接',
+						icon: 'none'
+					})
+				}
 			},
-
 			// 添加消息页面系统通知提示报名成功
 			addMessage() {
 				let data = {
@@ -681,21 +629,27 @@
 
 		.ellone {
 
-			/deep/ .u-image {
-				height: 400px !important;
-			}
+			// /deep/ .u-image {
+			// 	max-height: 400px !important;
+			// }
 
-			/deep/ .u-image__image {
-				height: 600px !important;
-			}
+			// /deep/ .u-image__image {
+			// 	max-height: 600px !important;
+			// }
 
 			/deep/ .u-modal__content {
 				flex-direction: column !important;
 				align-items: center;
-				height: 450px;
+				// height: 450px;
 			}
 		}
 
+		.ellTit {
+			margin-bottom: 10px;
+			font-weight: bold;
+			color: 000;
+		}
+
 		.popup-container2 {
 			position: fixed;
 			top: 50%;

pages/playBack/playBack.vue

@@ -2,17 +2,13 @@
 	<!-- 教研室详情 -->
 	<view class="activityDetailNew">
 		<statusBar :item="navbar"></statusBar>
-		<!-- 消息提示 -->
-		<msgPop></msgPop>
 
 		<view class="top">
 			<template>
 				<view>
-
 					<!-- 只渲染当前视频 -->
-					<video :src="currentVideoUrl" controls @ended="playNextVideo"
-					autoplay="true"></video>
-
+					<video :src="currentVideoUrl" show-loading show-play-btn show-center-play-btn controls
+						@ended="playNextVideo"></video>
 				</view>
 			</template>
 		</view>
@@ -30,12 +26,6 @@
 					</view>：
 					<text class="inf">{{actItemList.begin_at}}</text>
 				</view>
-				<!-- <view class="acinfoAddress">
-					地点：<text class="inf">{{actItemList.address}}</text>
-				</view> -->
-				<!-- <view class="">
-					主办单位：<text class="inf">暂无字段</text>
-				</view> -->
 				<view class="acinfoAddress">
 					<view class="acinfoTit">
 						<text>活</text>
@@ -62,12 +52,6 @@
 				oid: '',
 				// 活动id
 				acId: '',
-				stuNum: 0,
-				// 报名跳转链接
-				// enrollImg: 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1719281192664.png',
-				DigenrollImg: false,
-				// 参与活动跳转链接
-				GetInvolved: false,
 				// 页面数据
 				actItemList: {},
 				//回放视频
@@ -78,65 +62,22 @@
 				collArr: [],
 				//报名成功弹窗
 				showPopupConfirm: false,
-				//过期日期
-				dTime: '',
+
 				// 查看回放弹框控制
 				PlaybackDig: false,
-				// 用户订阅列表
-				// subArr: [],
-				uLoading: false,
-				//弹窗是否过期显示的内容
-				popupMessage: '',
-				// 收藏按钮节流
-				stopTimer: 0,
-
-				//控制弹窗
-				showPopup: false,
-				// 是否已加入
-				isSign: 0,
-				// 判断显示报名弹窗还是取消报名弹窗
-				isAdd: 0,
-
-				// 报名列表
-				applyUserlist: [],
-				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png',
-
-				imgLoading: 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1712113517547.png'
-				// nodes: [{
-				// 	name: 'div',
-				// 	attrs: {
-				// 		class: 'div-class',
-				// 		style: 'line-height: 60px; color: red; text-align:center;'
-				// 	},
-				// 	children: [{
-				// 		type: 'text',
-				// 		text: 'Hello&nbsp;uni-app!'
-				// 	}]
-				// }],
-				// strings: '<div style="text-align:center;"><img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png"/></div>'
-				// pic_sub: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
-				// pic_sub2: 'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
+
 			};
 		},
 
 		mounted() {
 			// 开始播放第一个视频
-			this.playNextVideo();
+			// setTimeout(() => {
+				this.playNextVideo();
+				// wx.createVideoContext('myVideo').pause();
+			// }, 500)
 		},
 
-		// onUnload() {
-		// 	this.$store.dispatch('asyncDelAll')
-		// },
-		computed: {
-			isExpired() {
-				let dTime = this.dTime.split(',')
-				let bint = new Date(dTime[0]).getTime()
-				let now = new Date().getTime()
-				// console.log("过期时间",bint);
-				// console.log("当前日期",now);
-				return bint < now
-			}
-		},
+
 		methods: {
 			playNextVideo() {
 				// 播放下一个视频
@@ -157,23 +98,6 @@
 					url: "/pages/skipone/skipone?url=" + encodeURIComponent(link),
 				});
 			},
-			// 查看回放
-			lookPlayback() {
-				if (!(!!this.actItemList.playback)) {
-					uni.showToast({
-						title: "暂无回放",
-						icon: 'none'
-					});
-					return
-				}
-
-				this.PlaybackDig = true
-				// uni.navigateTo({
-				// 	// url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify('https://www.yuketang.cn/v2/web/forbidden'))
-				// 	url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify(this.actItemList
-				// 		.playback))
-				// });
-			},
 
 			// 获取页面数据
 			getdata() {
@@ -183,22 +107,16 @@
 					acId: this.acId,
 				}
 				this.$request('/selectActivityID', "POST", data).then(res => {
-					console.log('页面数据', res[0][0]);
-					this.dTime = res[0][0].begin_at;
-					// console.log('this.dTime',this.dTime);
 
 					let video = res[0][0].videolink;
 					this.videoList = video.split(',')
 					console.log("this.playbacks", this.videoList)
 
 					let srrt = this.datejudge(res[0][0].begin_at)
-					console.log('srrt', srrt);
 					res[0][0].begin_at = srrt
-					this.uLoading = false
+
 					this.actItemList = res[0][0]
-					this.actItemList.brief = this.actItemList.brief.replace(/<img/gi,
-						'<img style="max-width:100%;height:auto;margin:0 auto;display:block"'
-					)
+
 				})
 
 			},
@@ -236,7 +154,7 @@
 
 			// 获取页面数据
 			this.getdata()
-
+			
 		}
 
 	}
@@ -244,9 +162,12 @@
 
 <style lang="scss">
 	video {
-	  width: 100%; /* 设置视频宽度为父元素宽度的百分比 */
-	  max-width: 100%; /* 确保视频不超过其原始尺寸的最大宽度 */
+		width: 100%;
+		/* 设置视频宽度为父元素宽度的百分比 */
+		max-width: 100%;
+		/* 确保视频不超过其原始尺寸的最大宽度 */
 	}
+
 	.activityDetailNew {
 		background-color: #fff;