From bd4d2df3c20c2baea23567f57556a70a38e1960d Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 26 七月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 843a3da..fd91aa9 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -157,6 +157,7 @@
setTimeout(() => {
this.initSwiper();
this.initViewer();
+ this.closeVideo()
}, 200);
}
},
@@ -228,7 +229,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(1,10);
+ // this.gotoPage(11,282);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -242,7 +243,7 @@
// ids: ["2ACA9359"]
// });
// }, 2000);
- // }, 5000);
+ // }, 500);
// const pageDom = (this.container ? this.container : document)
// .querySelector("#app")
@@ -275,6 +276,8 @@
// },
// 婊氬姩鐩戝惉
scrollFun(event) {
+ // 瑙嗛灏忕獥鏂规硶
+ this.handleVideoPicture()
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
if (event.target.scrollTop > this.previousScrollTop) {
// 鍚戜笅
@@ -613,11 +616,12 @@
if (testData && testData[catalog]) {
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
- this.questionDataMap[page] = await getQuestionList(
+ const datas = await getQuestionList(
page,
testData[catalog][page],
this.config.activeBook
);
+ this.$set(this.questionDataMap,page,datas)
} else {
const obj = {};
for (let key in testData[catalog][page]) {
@@ -627,7 +631,8 @@
this.config.activeBook
);
}
- this.questionDataMap[page] = obj;
+ this.$set(this.questionDataMap,page,obj)
+ // this.questionDataMap[page] = obj;
}
}
}
@@ -699,10 +704,10 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
)
},
@@ -731,10 +736,10 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
)
},
@@ -896,6 +901,43 @@
this.highlightData = data;
// 璺宠浆
this.gotoPage(data.catalog, data.page, () => {});
+ },
+ // 鐐瑰嚮瑙嗛鍏抽棴鍏朵粬
+ closeVideo() {
+ let allVideo = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ for (let index = 0; index < allVideo.length; index++) {
+ const item = allVideo[index];
+ item.addEventListener('playing',(item) => {
+ const path = item.srcElement.src
+ const videoList = Array.from(allVideo);
+ for (let cindex = 0; cindex < videoList.length; cindex++) {
+ const citem = videoList[cindex];
+ if(citem.currentSrc != path && path) {
+ citem.pause()
+ }
+ }
+ })
+ }
+ },
+ // 瑙嗛灏忕獥
+ handleVideoPicture() {
+ let doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ doms = Array.from(doms)
+ if(!doms.length) return false
+ const playVudio = doms
+ .reverse()
+ .find((item) => item.paused == false);
+ if(playVudio) {
+ const bottomGap = playVudio.getBoundingClientRect().bottom;
+ const topGap = playVudio.getBoundingClientRect().top;
+ if (bottomGap < 0 || topGap > window.innerHeight) {
+ playVudio.requestPictureInPicture();
+ }
+ }
}
},
components: {
--
Gitblit v1.9.1