From 0ac4e192d2d2c28eb95e118eb381c04330b07953 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 20 十一月 2024 11:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilAviationServices/view/components/index.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/books/civilAviationServices/view/components/index.vue b/src/books/civilAviationServices/view/components/index.vue
index 48ac4c4..3f21b3b 100644
--- a/src/books/civilAviationServices/view/components/index.vue
+++ b/src/books/civilAviationServices/view/components/index.vue
@@ -9,14 +9,20 @@
transformOrigin: 'center top',
}">
<pageHeader v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList"></pageHeader>
- <!-- <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList"></chapterOne> -->
+ <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>
</div>
</div>
</template>
<script>
import pageHeader from "./header.vue";
-// import chapterOne from "./chapter001.vue";
+ import chapterOne from "./chapter001.vue";
+ import chapterTwo from "./chpater002.vue";
+ import chapterThree from "./chapter003.vue";
+ import chapterFour from "./chapter004.vue";
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
import Swiper from "swiper/bundle";
@@ -27,7 +33,7 @@
name: "pageContent",
data() {
return {
- catalogLength: 1, // 鎬荤珷鑺傛暟
+ catalogLength: 5, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -152,7 +158,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(6, 30);
+ // this.gotoPage(3, 92);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -705,7 +711,10 @@
// 鎵�鏈夌珷鑺傜粍浠讹紙姣忔湰涔﹀埗浣滄椂鍗曠嫭閰嶇疆锛�
const pageData = {
pageHeader,
- // chapterOne,
+ chapterOne,
+ chapterTwo,
+ chapterThree,
+ chapterFour,
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -908,13 +917,12 @@
const bottomGap = playVudio.getBoundingClientRect().bottom;
const topGap = playVudio.getBoundingClientRect().top;
if (bottomGap < 0 || topGap > window.innerHeight) {
- playVudio.requestPictureInPicture();
+ if(playVudio.readyState) playVudio.requestPictureInPicture();
}
}
},
//鍏朵粬绫诲悕涓嬪瓧浣撳ぇ灏忓彉鍖�
transformDom(fs) {
- console.log('瀛椾綋澶у皬',fs);
if(!fs) return
let doms = (
this.container ? this.container : document
@@ -928,7 +936,10 @@
},
components: {
pageHeader,
- // chapterOne,
+ chapterOne,
+ chapterTwo,
+ chapterThree,
+ chapterFour,
},
};
</script>
--
Gitblit v1.9.1