From e230a82c645769d297e05ac54618d7bc23fd8376 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 03 六月 2024 11:24:16 +0800
Subject: [PATCH] 合并
---
src/books/artAndDance/assets/images/05.gif | 0
src/books/artAndDance/view/components/header.vue | 6 +-
src/books/artAndDance/assets/images/girl.png | 0
src/books/artAndDance/assets/images/04-2.gif | 0
src/books/artAndDance/view/components/chapter002.vue | 52 ++++++++++++++++++++++---
src/books/artAndDance/view/components/chapter001.vue | 10 ++++-
src/books/artAndDance/assets/images/01-2.gif | 0
src/books/artAndDance/assets/images/share.png | 0
src/books/artAndDance/assets/main.less | 2
9 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/src/books/artAndDance/assets/images/01-2.gif b/src/books/artAndDance/assets/images/01-2.gif
new file mode 100644
index 0000000..ba833ea
--- /dev/null
+++ b/src/books/artAndDance/assets/images/01-2.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/04-2.gif b/src/books/artAndDance/assets/images/04-2.gif
new file mode 100644
index 0000000..b75aa95
--- /dev/null
+++ b/src/books/artAndDance/assets/images/04-2.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/05.gif b/src/books/artAndDance/assets/images/05.gif
new file mode 100644
index 0000000..b6f18b2
--- /dev/null
+++ b/src/books/artAndDance/assets/images/05.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/girl.png b/src/books/artAndDance/assets/images/girl.png
new file mode 100644
index 0000000..f3b01da
--- /dev/null
+++ b/src/books/artAndDance/assets/images/girl.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/share.png b/src/books/artAndDance/assets/images/share.png
new file mode 100644
index 0000000..e007e34
--- /dev/null
+++ b/src/books/artAndDance/assets/images/share.png
Binary files differ
diff --git a/src/books/artAndDance/assets/main.less b/src/books/artAndDance/assets/main.less
index 9433073..ba003e5 100644
--- a/src/books/artAndDance/assets/main.less
+++ b/src/books/artAndDance/assets/main.less
@@ -332,7 +332,7 @@
.page-box {
position: relative;
box-sizing: border-box;
- min-height: 1150px !important;
+ min-height: 1150px;
margin-bottom: 20px;
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
diff --git a/src/books/artAndDance/view/components/chapter001.vue b/src/books/artAndDance/view/components/chapter001.vue
index 7e89263..2c63268 100644
--- a/src/books/artAndDance/view/components/chapter001.vue
+++ b/src/books/artAndDance/view/components/chapter001.vue
@@ -1,8 +1,9 @@
<template>
<div class="chapter" num="2">
- <div class="page-box" page="4">
+ <div class="page-box" page="4" style="min-height: auto;">
<div v-if="showPageList.indexOf(4) > -1">
<img class="img-0" alt="" src="../../assets/images/dy1.jpg" />
+ <img src="../../assets/images/01.gif" alt="" style="width: 53%;" class="cover-img">
</div>
</div>
<div class="page-box" page="5">
@@ -14,7 +15,7 @@
/>
<div class="padding-96">
<p class="center">
- <img class="img-a" alt="" src="../../assets/images/image6-1.jpg" />
+ <img class="img-a" alt="" src="../../assets/images/01-2.gif" />
</p>
<h2 class="lefth2" id="b001">
<img class="img-gn" alt="" src="../../assets/images/rhybx.jpg" />
@@ -170,4 +171,9 @@
.fz-26 {
font-size: 26px !important;
}
+.cover-img {
+ position: absolute;
+ top: 33%;
+ left: 23%;
+}
</style>
diff --git a/src/books/artAndDance/view/components/chapter002.vue b/src/books/artAndDance/view/components/chapter002.vue
index b1bad73..6efca5f 100644
--- a/src/books/artAndDance/view/components/chapter002.vue
+++ b/src/books/artAndDance/view/components/chapter002.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="3">
- <div class="page-box" page="8">
+ <div class="page-box" page="8" style="min-height: auto;">
<div v-if="showPageList.indexOf(8) > -1">
<img class="img-0" alt="" src="../../assets/images/dy2.jpg" />
</div>
@@ -14,11 +14,16 @@
/>
<div class="padding-96">
<p class="center">
- <img class="img-b" alt="" src="../../assets/images/image10-1.jpg" />
+ <img class="img-b" alt="" src="../../assets/images/04-2.gif" />
</p>
- <p class="center">
- <img class="img-a" alt="" src="../../assets/images/image10-2.jpg" />
- </p>
+ <ul class="fl al-cn ju-bt img-state " style="margin-top: 100px;">
+ <li style="width: 45%;">
+ <img src="../../assets/images/05.gif" alt="" class="w100" :style="{opacity:(10 - num) / 10}">
+ </li>
+ <li style="width: 35%;">
+ <img src="../../assets/images/girl.png" alt="" class="w100" :style="{opacity: num / 10}">
+ </li>
+ </ul>
<p class="img">鈥滅緤瑙掑紡鈥濊垶濮�</p>
</div>
<ul class="pb-box">
@@ -75,7 +80,7 @@
</div>
</div>
<div class="page-box" page="11">
- <div v-if="showPageList.indexOf(10) > -1" class="pg-mh">
+ <div v-if="showPageList.indexOf(11) > -1" class="pg-mh">
<img
src="../../assets/images/pageContentHeader.jpg"
alt=""
@@ -153,18 +158,51 @@
},
mounted() {
this.getVidoePath();
+ this.addNum()
+ },
+ unmounted() {
+ if(this.addTimer) {
+ clearInterval(this.addTimer)
+ }
+ if(this.cutTimer) {
+ clearInterval(this.cutTimer)
+ }
},
data() {
return {
videoPathOne: "",
+ num:0,
+ addTimer:null,
+ cutTimer:null
};
},
methods: {
getVidoePath() {
this.videoPathOne = getResourcePath("f6aaaed901868114d948031615250bed");
},
+ addNum() {
+ this.addTimer = setInterval(() => {
+ if(this.num < 10) {
+ this.num ++
+ } else {
+ clearInterval(this.addTimer)
+ this.cutNum()
+ }
+ },200)
+ },
+ cutNum() {
+ this.cutTimer = setInterval(() => {
+ if(this.num > 0) {
+ this.num --
+ } else {
+ clearInterval(this.cutTimer)
+ this.addNum()
+ }
+ },200)
+ }
},
};
</script>
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+</style>
diff --git a/src/books/artAndDance/view/components/header.vue b/src/books/artAndDance/view/components/header.vue
index 34bbcab..9e03cea 100644
--- a/src/books/artAndDance/view/components/header.vue
+++ b/src/books/artAndDance/view/components/header.vue
@@ -1,16 +1,16 @@
<template>
<div class="chapter" num="1">
- <div class="page-box" page="1">
+ <div class="page-box" page="1" style="min-height: auto;">
<div v-if="showPageList.indexOf(1) > -1"></div>
<img class="img-0" alt="" src="../../assets/images/Cover.jpg" />
</div>
- <div class="page-box" page="2">
+ <div class="page-box" page="2" style="min-height: auto;">
<div v-if="showPageList.indexOf(2) > -1">
<img class="img-0" alt="" src="../../assets/images/SMY.jpg" />
</div>
</div>
<div class="page-box" page="3">
- <div v-if="showPageList.indexOf(2) > -1">
+ <div v-if="showPageList.indexOf(3) > -1">
<ul class="fl fl-cl ju-bt" style="min-height: 1150px">
<li>
<img src="../../assets/images/pageHeader.png" alt="" class="w100" />
--
Gitblit v1.9.1