From 1dee69cf56598b674fafc310be1ea06b8fa1d8a3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 29 五月 2024 16:53:21 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index e59085f..3c07077 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -5,7 +5,7 @@
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
transform: `scale(${pageZoom ? pageZoom : 1})`,
- transformOrigin: 'center top'
+ transformOrigin: 'center top',
}"
>
<pageHeader
@@ -114,7 +114,7 @@
observer: null,
loadPageObserver: null,
loadPageList: [],
- questionData: {}
+ questionData: {},
};
},
computed: {
@@ -123,7 +123,7 @@
},
pageZoom() {
return this.$store.state.qiankun.scale / 100;
- }
+ },
},
watch: {
showCatalogList: {
@@ -134,7 +134,7 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal
+ showCatalogList: newVal,
});
}
// 鍚姩椤电爜瑙傚療
@@ -146,6 +146,7 @@
},
loadPageList: {
handler(newVal, oldVal) {
+ console.log(newVal, "this.loadPageList");
setTimeout(() => {
this.initSwiper();
this.initViewer();
@@ -176,7 +177,7 @@
// 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
delSign: (data) => {
this.delSign(data);
- }
+ },
});
}
@@ -185,13 +186,13 @@
this.observer = new IntersectionObserver(this.pageChangeCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0.5 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0.5, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
this.loadPageObserver = new IntersectionObserver(this.loadPageCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -201,8 +202,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- setTimeout(() => {
- this.gotoPage(1, 11);
+ // setTimeout(() => {
+ // this.gotoPage(1, 15);
// setTimeout(() => {
// this.renderSign("Note", {
// id: "2ACA9359",
@@ -217,7 +218,7 @@
// });
// }, 2000);
// }, 1000);
- }, 1000);
+ // }, 1000);
},
methods: {
// 婊氬姩鐩戝惉
@@ -275,7 +276,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength
+ this.catalogLength,
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -374,7 +375,7 @@
return false;
}
}
- //observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
+ // observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
const isObserver = section.getAttribute("observer");
const isLoadObserver = section.getAttribute("loadObserver");
if (!isObserver) {
@@ -487,10 +488,8 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log(page, "page", catalog, "catalog");
let text = null;
if (target.querySelector("p")) {
- console.log(target.querySelector("p").textContent.substring(0, 20));
text = target.querySelector("p").textContent.substring(0, 20);
}
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
@@ -513,7 +512,6 @@
const target = entry.target;
const page = target.getAttribute("page");
if (this.loadPageList.indexOf(page) == -1) {
- //
const catalogDom = this.tool.getParentNodeByClassName(
target,
"chapter"
@@ -611,8 +609,8 @@
chapterTen,
chapterEleven,
chapterTwelve,
- chapterThirteen
- }
+ chapterThirteen,
+ },
};
</script>
--
Gitblit v1.9.1