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/App.vue | 2 +-
src/books/childHealth/view/content/components/chapter001.vue | 5 ++---
src/books/childHealth/view/content/index.vue | 36 +++++++++++++++++-------------------
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 9fbc156..bbda760 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -58,7 +58,7 @@
} else {
this.activeBook = await this.config.getBookConfig(
// childHealth
- this.config.resourceCtx + "embedded"
+ this.config.resourceCtx + "childHealth"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 1521c43..26c96bc 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -1029,7 +1029,7 @@
</div>
<div class="right" style="width: 60%">
<video
- :src="pathFive"
+ :src="getResourcePath('163c06871b763954952d1cd74373c618')"
poster="../../../assets/images/chapterOne/people-video-img.jpg"
webkit-playsinline="true"
x-webkit-airplay="true"
@@ -4854,6 +4854,7 @@
};
},
async mounted() {
+ this.getResourcePath = getResourcePath;
this.getVideoPath();
const localData = localStorage.getItem("chapterOneData");
if (localData) {
@@ -4924,9 +4925,7 @@
},
saveChapterOneData() {
// 璁板綍绗竴寮犺緭鍏ユ暟鎹�
- console.log("20miao");
this.saveTime = 20;
- console.log(this.chapterOneData);
localStorage.setItem(
"chapterOneData",
JSON.stringify(this.chapterOneData)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 703e04c..3c07077 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -146,6 +146,7 @@
},
loadPageList: {
handler(newVal, oldVal) {
+ console.log(newVal, "this.loadPageList");
setTimeout(() => {
this.initSwiper();
this.initViewer();
@@ -202,21 +203,21 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(1, 11);
- // // setTimeout(() => {
- // // this.renderSign("Note", {
- // // id: "2ACA9359",
- // // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
- // // page: "100",
- // // type: "Highlight",
- // // color: "#F5E12A"
- // // });
- // // setTimeout(() => {
- // // this.delSign({
- // // ids: ["2ACA9359"]
- // // });
- // // }, 2000);
- // // }, 1000);
+ // this.gotoPage(1, 15);
+ // setTimeout(() => {
+ // this.renderSign("Note", {
+ // id: "2ACA9359",
+ // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
+ // page: "100",
+ // type: "Highlight",
+ // color: "#F5E12A"
+ // });
+ // setTimeout(() => {
+ // this.delSign({
+ // ids: ["2ACA9359"]
+ // });
+ // }, 2000);
+ // }, 1000);
// }, 1000);
},
methods: {
@@ -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"
--
Gitblit v1.9.1