Merge branch 'dev'

This commit is contained in:
2025-12-31 17:07:35 +08:00
2 changed files with 9 additions and 9 deletions

View File

@@ -1082,7 +1082,7 @@
const allVideos = document.querySelectorAll('.fs-video');
const fsBox = document.querySelector('.fs-box');
let isVideoPlaying = false;
let videoTip = null;
// let videoTip = null;
// 初始化视频提示
// const initVideoTip = () =>
@@ -1103,7 +1103,7 @@
video.pause(); // 仅暂停删除display修改
});
isVideoPlaying = false;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}
// 播放指定视频(仅播放,无显隐)
@@ -1117,17 +1117,17 @@
video.play().then(() =>
{
isVideoPlaying = true;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}).catch((err) =>
{
console.log('视频自动播放失败:', err);
if (videoTip) videoTip.style.display = 'block';
// if (videoTip) videoTip.style.display = 'block';
// 点击视频手动播放(仅执行一次)
video.addEventListener('click', () =>
{
video.play();
isVideoPlaying = true;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}, { once: true });
});
};

View File

@@ -1037,7 +1037,7 @@
const allVideos = document.querySelectorAll('.fs-video');
const fsBox = document.querySelector('.fs-box');
let isVideoPlaying = false;
let videoTip = null;
// let videoTip = null;
// 初始化视频提示
// const initVideoTip = () => {
@@ -1060,7 +1060,7 @@
if (img) img.style.display = 'block';
});
isVideoPlaying = false;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}
// 播放指定视频
@@ -1075,7 +1075,7 @@
video.muted = true;
video.play().then(() => {
isVideoPlaying = true;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}).catch((err) => {
console.log('视频自动播放失败:', err);
video.style.display = 'block';
@@ -1085,7 +1085,7 @@
video.addEventListener('click', () => {
video.play();
isVideoPlaying = true;
if (videoTip) videoTip.style.display = 'none';
// if (videoTip) videoTip.style.display = 'none';
}, { once: true });
});
};