From 6aac0dd9c6d6bd3de148f3d6e123f9c91b1aab4b Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期二, 02 七月 2024 09:31:04 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/artAndDrama/view/components/index.vue | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/src/books/artAndDrama/view/components/index.vue b/src/books/artAndDrama/view/components/index.vue
index ea7ad88..76a4d16 100644
--- a/src/books/artAndDrama/view/components/index.vue
+++ b/src/books/artAndDrama/view/components/index.vue
@@ -9,10 +9,11 @@
transformOrigin: 'center top',
}">
<pageHeader v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList"></pageHeader>
- <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" @closeAudio="closeAudio" @closeVideo="closeVideo"></chapterOne>
- <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" @closeAudio="closeAudio" @closeVideo="closeVideo"></chapterTwo>
- <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList" @closeAudio="closeAudio" @closeVideo="closeVideo"></chapterThree>
- <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList" @closeAudio="closeAudio" @closeVideo="closeVideo"></chapterFour>
+ <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" ></chapterOne>
+ <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList"></chapterTwo>
+ <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList"></chapterThree>
+ <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList"></chapterFour>
+ <chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></chapterFive>
</div>
<!-- 闊抽灏忕獥鎾斁缁勪欢 -->
<miniAudio :path="audioPath" :currentTime="currentTime" @closeMiniAudio="closeMiniAudio" ref="audioPlayer">
@@ -26,6 +27,7 @@
import chapterTwo from "./chapter002.vue";
import chapterThree from "./chapter003.vue";
import chapterFour from "./chapter004.vue";
+import chapterFive from "./chapter005.vue";
import NoteIcon from "@/assets/images/biji.png";
import miniAudio from "@/components/miniAudio/index.vue";
import _ from "lodash";
@@ -36,7 +38,7 @@
export default {
data() {
return {
- catalogLength: 5, // 鎬荤珷鑺傛暟
+ catalogLength: 6, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -85,6 +87,8 @@
setTimeout(() => {
this.initSwiper();
this.initViewer();
+ this.closeAudio();
+ this.closeVideo();
}, 200);
},
},
@@ -156,7 +160,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(2,6);
+ // this.gotoPage(4,32);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -184,7 +188,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- // }, 500);
+ // }, 500);
},
methods: {
// setZoom1() {
@@ -712,6 +716,7 @@
chapterTwo,
chapterThree,
chapterFour,
+ chapterFive,
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -856,38 +861,46 @@
}
},
// 鐐瑰嚮闊抽鎾斁锛屽叧闂叾浠栭煶棰�
- closeAudio(path) {
- let allVideo = (
+ closeAudio() {
+ let allAudio = (
this.container ? this.container : document
).querySelectorAll(".audio");
- allVideo = Array.from(allVideo);
- if (allVideo.length) {
- for (let index = 0; index < allVideo.length; index++) {
- const item = allVideo[index];
- if (item.currentSrc != path) {
- item.pause()
+ for (let index = 0; index < allAudio.length; index++) {
+ const item = allAudio[index];
+ item.addEventListener('play',() => {
+ const audioList = Array.from(allAudio);
+ for (let cindex = 0; cindex < audioList.length; cindex++) {
+ const citem = audioList[cindex];
+ if(citem.currentSrc != item.src) {
+ citem.pause()
+
+ }
}
- }
+ this.closeMiniAudio()
+ })
}
- this.closeMiniAudio()
},
// 鍏抽棴mini video
closeMiniAudio() {
this.audioPath = "";
},
// 鐐瑰嚮瑙嗛鎾斁锛屽叧闂叾浠栬棰�
- closeVideo(path) {
+ closeVideo() {
let allVideo = (
this.container ? this.container : document
).querySelectorAll(".video");
- allVideo = Array.from(allVideo);
- if(allVideo.length) {
- for (let index = 0; index < allVideo.length; index++) {
- const item = allVideo[index];
- if(item.currentSrc != path) {
- item.pause()
+ 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()
+ }
}
- }
+ })
}
}
},
@@ -898,6 +911,7 @@
miniAudio,
chapterThree,
chapterFour,
+ chapterFive,
},
};
</script>
--
Gitblit v1.9.1