From c1b21a6c0e00db52db83139e98a529919084afe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 11 Apr 2024 15:33:58 +0800
Subject: [PATCH] xg

---
 pagesC/notice/notice.vue               |  2 +-
 pagesC/noticedetails/noticedetails.vue | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pagesC/notice/notice.vue b/pagesC/notice/notice.vue
index f075359..4ac955b 100644
--- a/pagesC/notice/notice.vue
+++ b/pagesC/notice/notice.vue
@@ -79,7 +79,7 @@
 					}
 				} else {
 					uni.navigateTo({
-						url: `/pagesC/noticedetails/noticedetails?item=${JSON.stringify(item)}&title=${this.title}&messageNo=${item.messageNo}&actId=${item.actId}`
+						url: `/pagesC/noticedetails/noticedetails?item=${JSON.stringify(item)}&title=${this.title}&videoId=${item.videoId}&messageNo=${item.messageNo}&actId=${item.actId}`
 					})
 				}
 			},
diff --git a/pagesC/noticedetails/noticedetails.vue b/pagesC/noticedetails/noticedetails.vue
index 79d8c91..96ca669 100644
--- a/pagesC/noticedetails/noticedetails.vue
+++ b/pagesC/noticedetails/noticedetails.vue
@@ -11,7 +11,7 @@
 		</view>
 		<view class="" style="height: 2rpx;width: 100%;background-color: #f6f6f6;">
 		</view>
-		<video v-if="messageNo" id="myVideo" @timeupdate="videoFun" :src="messageNo" :initial-time="initial_time"
+		<video v-if="videoId" id="myVideo" @timeupdate="videoFun" :src="messageNo" :initial-time="initial_time"
 			@ended='ended' />
 		<view class="text">
 			<text>{{currentItem.content}}</text>
@@ -34,7 +34,8 @@
 				video_real_time: 0, //实时播放进度
 				nitial_time: '', //视频跳转进度 秒
 				actId: '',
-				cardNo: uni.getStorageSync('userinfo').cardNo
+				cardNo: uni.getStorageSync('userinfo').cardNo,
+				videoId: null,
 			};
 		},
 		onReady() { //更改导航栏文字
@@ -43,16 +44,24 @@
 			});
 		},
 		onLoad(options) {
-			this.actId = options.actId
 			this.initial_time = '0' //视频进度
 			this.title = options.title
 			this.currentItem = JSON.parse(options.item)
 			if (options.messageNo) {
 				this.messageNo = baseurl + `/applet/message/preview/${options.messageNo}`
 			}
+			if (options.actId) {
+				this.actId = options.actId
+				this.videoId = options.videoId
+				if (!this.videoId) {
+					setTimeout(() => {
+						this.ended();
+					}, 5000)
+				}
+			}
 		},
 		methods: {
-			ended(e) {
+			ended() {
 				videoadd(this.cardNo, this.actId).then(res => {
 					if (res.code == 200) {
 						this.$refs.uToast.show({