From 38e66dbf57bf649228c7600b99586d44b018fc59 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 31 五月 2024 18:39:00 +0800
Subject: [PATCH] 合并
---
src/books/artAndDance/view/components/chapter002.vue | 144 ++++++++++++++++++++++++++++++++++++
src/books/artAndDance/view/components/chapter001.vue | 6
src/books/artAndDance/view/components/index.vue | 75 ++++++++++--------
src/books/artAndDance/assets/images/01.gif | 0
src/books/artAndDance/assets/main.less | 4
5 files changed, 190 insertions(+), 39 deletions(-)
diff --git a/src/books/artAndDance/assets/images/01.gif b/src/books/artAndDance/assets/images/01.gif
new file mode 100644
index 0000000..8c50189
--- /dev/null
+++ b/src/books/artAndDance/assets/images/01.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/main.less b/src/books/artAndDance/assets/main.less
index 149ab71..4cc013d 100644
--- a/src/books/artAndDance/assets/main.less
+++ b/src/books/artAndDance/assets/main.less
@@ -64,8 +64,8 @@
.img {
text-align: center;
- font-size: 0.8em;
- color: #5d78bb;
+ font-size:18px;
+ color: #000;
margin-left: 0%;
margin-right: 0%;
text-indent: 0em;
diff --git a/src/books/artAndDance/view/components/chapter001.vue b/src/books/artAndDance/view/components/chapter001.vue
index 0780917..7e89263 100644
--- a/src/books/artAndDance/view/components/chapter001.vue
+++ b/src/books/artAndDance/view/components/chapter001.vue
@@ -1,5 +1,5 @@
<template>
- <div class="chapter" num="1">
+ <div class="chapter" num="2">
<div class="page-box" page="4">
<div v-if="showPageList.indexOf(4) > -1">
<img class="img-0" alt="" src="../../assets/images/dy1.jpg" />
@@ -88,7 +88,7 @@
</div>
</div>
<div class="page-box" page="7">
- <div v-if="showPageList.indexOf(5) > -1" class="pg-mh">
+ <div v-if="showPageList.indexOf(7) > -1" class="pg-mh">
<img
src="../../assets/images/pageContentHeader.jpg"
alt=""
@@ -124,7 +124,7 @@
<ul class="pb-box">
<li class="ml-40">
<img src="../../assets/images/icon/tree.jpg" />
- <span class="dl-ib"> 2 </span>
+ <span class="dl-ib"> 4 </span>
</li>
<li>
<img class="img-0" alt="" src="../../assets/images/ym.jpg" />
diff --git a/src/books/artAndDance/view/components/chapter002.vue b/src/books/artAndDance/view/components/chapter002.vue
new file mode 100644
index 0000000..c58b149
--- /dev/null
+++ b/src/books/artAndDance/view/components/chapter002.vue
@@ -0,0 +1,144 @@
+<template>
+ <div class="chapter" num="3">
+ <div class="page-box" page="8">
+ <div v-if="showPageList.indexOf(8) > -1">
+ <img class="img-0" alt="" src="../../assets/images/dy2.jpg" />
+ </div>
+ </div>
+ <div class="page-box" page="9">
+ <div v-if="showPageList.indexOf(9) > -1" class="pg-mh">
+ <img
+ src="../../assets/images/pageContentHeader.jpg"
+ alt=""
+ class="w100 mb-40"
+ />
+ <div class="padding-96">
+ <p class="center">
+ <img class="img-b" alt="" src="../../assets/images/image10-1.jpg" />
+ </p>
+ <p class="center">
+ <img class="img-a" alt="" src="../../assets/images/image10-2.jpg" />
+ </p>
+ <p class="img">鈥滅緤瑙掑紡鈥濊垶濮�</p>
+ </div>
+ <ul class="pb-box">
+ <li class="ml-40">
+ <img src="../../assets/images/icon/tree.jpg" />
+ <span class="dl-ib"> 6 </span>
+ </li>
+ <li>
+ <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="page-box" page="10">
+ <div v-if="showPageList.indexOf(10) > -1" class="pg-mh">
+ <div>
+ <img src="../../assets/images/chapter-one-header.png" class="w100" />
+ </div>
+ <div class="padding-96">
+ <h2 class="lefth2" id="b005">
+ <img class="img-gn" alt="" src="../../assets/images/rhybx.jpg" />
+ </h2>
+ <h3 id="c004">鍏冪礌</h3>
+ <p class="block2">鍗曟寚绔嬩簬澶撮《妯′豢缇婅</p>
+ <p class="block1"><span class="ls">鈥斺�旂緤瑙掑紡</span></p>
+ <p class="block2">鍙岃啙璺簬鍦伴潰</p>
+ <p class="block1"><span class="ls">鈥斺�斿弻璺潗</span></p>
+ <p class="block2">宸﹀彸鑴氫氦鏇胯笍鍦�</p>
+ <p class="block1"><span class="ls">鈥斺�斿師鍦板皬纰庢銆佺Щ鍔ㄥ皬纰庢</span></p>
+ <p class="block2">鑵伴儴鎷ц浆</p>
+ <p class="block1"><span class="ls">鈥斺�旀梺鑵般�佹嫥鑵�</span></p>
+ <h3 id="c005">绌洪棿涓庢柟鍚�</h3>
+ <p class="block2">楂樸�佷腑銆佷綆绌洪棿</p>
+ <p class="block2">1-8鐐规柟鍚�</p>
+ <h2 class="lefth2" id="b006">
+ <img class="img-gn" alt="" src="../../assets/images/xsyty.jpg" />
+ </h2>
+ <h3 id="c006">浜＄緤琛ョ墷</h3>
+ <p class="block2">甯竴鍏�</p>
+ <p class="block2">缇婂晩缇婂晩鍜╁挬鍙紝鏈夊彧灏忕緤涓嶈浜嗐��</p>
+ <p class="block2">澧欏晩澧欏晩鍨掗珮楂橈紝澧欎笂鏈変釜澶х獰绐裤��</p>
+ </div>
+ <ul>
+ <li class="fl ju-end mr-40">
+ <div>
+ <span class="dl-ib"> 7 </span>
+ <img src="../../assets/images/icon/tree.jpg" />
+ </div>
+ </li>
+ <li>
+ <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="page-box" page="11">
+ <div v-if="showPageList.indexOf(10) > -1" class="pg-mh">
+ <img
+ src="../../assets/images/pageContentHeader.jpg"
+ alt=""
+ class="w100 mb-40"
+ />
+ <div class="padding-96">
+ <p class="block2">缇婂晩缇婂晩鍜╁挬鍙紝缇婂効鍏ㄩ兘鍚撳潖浜嗐��</p>
+ <p class="block2">绐熺绐熺榛戞礊娲烇紝蹇揩琛ヤ笂鎵嶅畨蹇冦��</p>
+ <p class="center">
+ <!-- <img class="img-g" alt="" src="../../assets/images/i0012-1.jpg" /> -->
+ </p>
+ <h2 class="lefth2" id="b007">
+ <img class="img-gn" alt="" src="../../assets/images/czysj.jpg" />
+ </h2>
+ <div class="bj1">
+ <p class="block">
+ <img
+ class="inline"
+ alt=""
+ src="../../assets/images/dn.png"
+ />杩愮敤鎵�瀛﹁垶韫堝厓绱狅紝璁剧珛涓や釜琛ョ獰绐跨殑鍦烘櫙銆�
+ </p>
+ <p class="block">
+ <img
+ class="inline"
+ alt=""
+ src="../../assets/images/dn.png"
+ />瀛︾敓鑷効鍒嗙粍锛屾瘡缁勮嚜琛岃缃笌璇ユ垚璇瘬鎰忕浉鍏崇殑涓婚锛屽湪鏁欏笀鐨勫紩瀵间笅杩涜鍒涚紪锛屽苟瀵屾湁鎯呮劅鍦板睍绀哄嚭鏉ャ��
+ </p>
+ <div class="bj2">
+ <p class="block">
+ 鏍规嵁鏈崟鍏冩墍瀛︾殑鑸炶箞鍏冪礌浠ュ強鎴愯瀵撴剰锛屽彂鎸ユ兂璞★紝鍒涚紪鍑烘柊鐨勫崟涓�鑸炶箞鍔ㄤ綔鎴栭�犲瀷鍚с��
+ </p>
+ </div>
+ </div>
+ <h2 class="lefth2" id="b008">
+ <img class="img-gn1" alt="" src="../../assets/images/tz.jpg" />
+ </h2>
+ <p class="center"><img class="img-0" alt="" src="../../assets/images/ym.jpg" /></p>
+ </div>
+ <ul class="pb-box">
+ <li class="ml-40">
+ <img src="../../assets/images/icon/tree.jpg" />
+ <span class="dl-ib"> 8 </span>
+ </li>
+ <li>
+ <img class="img-0" alt="" src="../../assets/images/ym.jpg" />
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "chapterTwo",
+ props: {
+ showPageList: {
+ type: Array,
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/books/artAndDance/view/components/index.vue b/src/books/artAndDance/view/components/index.vue
index a8700d0..6a63a4f 100644
--- a/src/books/artAndDance/view/components/index.vue
+++ b/src/books/artAndDance/view/components/index.vue
@@ -17,6 +17,11 @@
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
></chapterOne>
+ <chapterTwo
+ v-if="showCatalogList.indexOf(3) > -1"
+ :showPageList="loadPageList"
+ >
+ </chapterTwo>
</div>
</div>
</template>
@@ -24,6 +29,7 @@
<script>
import pageHeader from "./header.vue";
import chapterOne from "./chapter001.vue";
+import chapterTwo from "./chapter002.vue";
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
import Swiper from "swiper/bundle";
@@ -33,7 +39,7 @@
export default {
data() {
return {
- catalogLength: 2, // 鎬荤珷鑺傛暟
+ catalogLength: 3, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -565,40 +571,40 @@
for (let i = 0; i < pptDoms.length; i++) {
const dom = pptDoms[i];
new Swiper(dom, {
- loop: false, // 鏃犵紳
- autoplay: false,
- paginationClickable: true,
- slidesPerView: 1, // 涓�缁勪笁涓�
- spaceBetween: 30, // 闂撮殧
- // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
- navigation: {
- 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,
- on: {
- init:(value) => {
- let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
- let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
- var paginationInfoEl = dom.querySelector('.pageBox');
- if(paginationInfoEl)
- paginationInfoEl.textContent = currentPage + '/' + totalPages;
+ loop: false, // 鏃犵紳
+ autoplay: false,
+ paginationClickable: true,
+ slidesPerView: 1, // 涓�缁勪笁涓�
+ spaceBetween: 30, // 闂撮殧
+ // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
+ navigation: {
+ nextEl: (this.container ? this.container : document).querySelector(
+ ".swiper-button-next"
+ ),
+ prevEl: (this.container ? this.container : document).querySelector(
+ ".swiper-button-prev"
+ ),
},
- slideChange:(value) => {
- let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
- let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
- var paginationInfoEl = dom.querySelector('.pageBox');
- if(paginationInfoEl)
- paginationInfoEl.textContent = currentPage + '/' + totalPages;
+ // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
+ observer: true,
+ observeParents: true,
+ on: {
+ init: (value) => {
+ let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
+ let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
+ var paginationInfoEl = dom.querySelector(".pageBox");
+ if (paginationInfoEl)
+ paginationInfoEl.textContent = currentPage + "/" + totalPages;
+ },
+ slideChange: (value) => {
+ let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
+ let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
+ var paginationInfoEl = dom.querySelector(".pageBox");
+ if (paginationInfoEl)
+ paginationInfoEl.textContent = currentPage + "/" + totalPages;
+ },
},
- },
- });
+ });
}
},
initViewer() {
@@ -622,7 +628,7 @@
console.log("鐢熷兓瀛�", event, word);
if (this.$store.state.qiankun && this.$store.state.qiankun.chooseWords) {
this.$store.state.qiankun.chooseWords({
- type:"word",
+ type: "word",
word,
x: event.pageX,
y: event.pageY,
@@ -634,6 +640,7 @@
components: {
pageHeader,
chapterOne,
+ chapterTwo,
},
};
</script>
--
Gitblit v1.9.1