From 4dc1aa46d4b9b2010fca512bb6ebf83cd59e9b70 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 29 五月 2024 21:58:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/embedded/view/components/index.vue | 10 ++--
src/books/lifeCare/index.vue | 10 ++--
src/App.vue | 44 ++++++++++++++++++----
src/books/childHealth/view/content/components/chapter001.vue | 1
src/books/childHealth/view/content/index.vue | 21 +++++++---
5 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 2ee7764..38ffa3a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,11 +24,11 @@
lifeCare,
embedded,
english,
- sportsAndHealth,
+ sportsAndHealth
},
data() {
return {
- activeBook: {},
+ activeBook: {}
};
},
async created() {
@@ -55,10 +55,10 @@
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
) {
this.$store.state.qiankun.getBookConfig({
- bookConfig: this.activeBook,
+ bookConfig: this.activeBook
});
}
- },
+ }
});
} else {
this.activeBook = await this.config.getBookConfig(
@@ -73,7 +73,7 @@
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
- },
+ }
};
</script>
@@ -118,16 +118,44 @@
}
/* swiper */
-.swiper-container{
+.swiper-container {
width: 100%;
height: 100%;
}
-.imgBox{
+.swiper-pagination-bullet-active {
+ background-color: #0093ff;
+}
+
+.swiper-button-prev,
+.swiper-button-next {
+ width: 27px;
+ height: 44px;
+ margin-top: -22px;
+ z-index: 10;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #0093ff;
+}
+
+.swiper-button-prev:after,
+.swiper-button-next:after {
+ font-family: swiper-icons;
+ font-size: 30px;
+ text-transform: none !important;
+ letter-spacing: 0;
+ text-transform: none;
+ font-variant: initial;
+ line-height: 1;
+}
+
+.imgBox {
position: relative;
}
-.imgBox img{
+.imgBox img {
max-width: 100%;
max-height: 100%;
width: auto;
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index c1f95a5..928bb8b 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -504,7 +504,6 @@
</div>
</div>
</div>
- <div class="swiper-pagination"></div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
</div>
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index b8a4106..40bc629 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -608,17 +608,23 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: ".swiper-button-next",
- prevEl: ".swiper-button-prev"
+ nextEl: (this.container ? this.container : document).querySelector(
+ ".swiper-button-next"
+ ),
+ prevEl: (this.container ? this.container : document).querySelector(
+ ".swiper-button-prev"
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
observeParents: true,
- // 濡傛灉闇�瑕佸垎椤靛櫒
- pagination: {
- el: ".swiper-pagination",
- clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
- }
+ // // 濡傛灉闇�瑕佸垎椤靛櫒
+ // pagination: {
+ // el: (this.container ? this.container : document).querySelector(
+ // ".swiper-pagination"
+ // ),
+ // clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
+ // }
});
}
},
@@ -629,6 +635,7 @@
for (let i = 0; i < doms.length; i++) {
const dom = doms[i];
new Viewer(dom, {
+ container: (this.container ? this.container.querySelector("#app") : "body"),
navbar: true, // 鏄剧ず瀵艰埅鏍�
toolbar: true, // 鏄剧ず宸ュ叿鏍�
title: true // 鏄剧ず鏍囬
diff --git a/src/books/embedded/view/components/index.vue b/src/books/embedded/view/components/index.vue
index 271379c..8625cf0 100644
--- a/src/books/embedded/view/components/index.vue
+++ b/src/books/embedded/view/components/index.vue
@@ -505,11 +505,11 @@
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
observeParents: true,
- // 濡傛灉闇�瑕佸垎椤靛櫒
- pagination: {
- el: ".swiper-pagination",
- clickable: true, // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
- },
+ // // 濡傛灉闇�瑕佸垎椤靛櫒
+ // pagination: {
+ // el: ".swiper-pagination",
+ // clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
+ // }
});
}
},
diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index ec8e4f1..4dd6659 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -635,11 +635,11 @@
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
observeParents: true,
- // 濡傛灉闇�瑕佸垎椤靛櫒
- pagination: {
- el: ".swiper-pagination",
- clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
- }
+ // // 濡傛灉闇�瑕佸垎椤靛櫒
+ // pagination: {
+ // el: ".swiper-pagination",
+ // clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
+ // }
});
}
},
--
Gitblit v1.9.1