From 8d1b3ab8d78cdcdd745f931ae6a8cf68173cfe69 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 27 十二月 2024 11:41:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aviationBasicSkills/view/components/index.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/books/aviationBasicSkills/view/components/index.vue b/src/books/aviationBasicSkills/view/components/index.vue
index 5504214..6cdde73 100644
--- a/src/books/aviationBasicSkills/view/components/index.vue
+++ b/src/books/aviationBasicSkills/view/components/index.vue
@@ -15,6 +15,8 @@
<chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList"></chapterFour>
<chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></chapterFive>
<chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList"></chapterSix>
+ <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList"></chapterSeven>
+ <chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList"></chapterEight>
</div>
</div>
</template>
@@ -27,6 +29,8 @@
import chapterFour from "./chapter004.vue";
import chapterFive from "./chapter005.vue";
import chapterSix from "./chapter006.vue";
+ import chapterSeven from "./chapter007.vue";
+ import chapterEight from "./chapter008.vue";
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
import Swiper from "swiper/bundle";
@@ -37,7 +41,7 @@
name: "pageContent",
data() {
return {
- catalogLength: 7, // 鎬荤珷鑺傛暟
+ catalogLength: 9, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -106,7 +110,6 @@
// 榛樿鍔犺浇绔犺妭
this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
- debugger
this.throttledScrollHandler = _.throttle(
this.scrollFun,
this.throttleThreshold,
@@ -162,7 +165,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(7,141);
+ this.gotoPage(1,1);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -222,7 +225,6 @@
) {
console.log(1);
- debugger
// 鍒拌揪闃堝��
if (
this.showCatalogList[this.showCatalogList.length - 1] <
@@ -720,7 +722,9 @@
chapterThree,
chapterFour,
chapterFive,
- chapterSix
+ chapterSix,
+ chapterSeven,
+ chapterEight
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -947,7 +951,9 @@
chapterThree,
chapterFour,
chapterFive,
- chapterSix
+ chapterSix,
+ chapterSeven,
+ chapterEight
},
};
</script>
--
Gitblit v1.9.1