From 609989d5dd46d2611b42f7d508f67ec89b355562 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期一, 17 六月 2024 15:17:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/components/chapter003.vue | 21 +
src/books/artAndDance/assets/images/image26-3.png | 0
.env.product | 4
src/books/artAndDance/assets/images/image28-2.png | 0
src/books/artAndDance/view/components/chapter003.vue | 6
src/books/childHealth/view/content/components/chapter008.vue | 33 ++-
src/books/artAndDance/assets/images/image27-1.png | 0
src/books/childHealth/view/content/components/chapter002.vue | 12
src/books/childHealth/view/content/index.vue | 32 ++
src/books/artAndDance/assets/main.less | 6
src/books/artAndDance/assets/images/image28-1.png | 0
src/books/mathBook/view/components/chapter001.vue | 121 ++++++++++-
src/books/artAndDance/assets/images/image26-2.png | 0
src/books/childHealth/view/content/components/chapter010.vue | 9
src/books/childHealth/view/content/components/chapter009.vue | 24 +
src/books/artAndDance/view/components/chapter004.vue | 6
src/books/artAndDance/view/components/index.vue | 8
src/books/childHealth/view/content/components/chapter005.vue | 15 +
src/components/examinations/index.vue | 23 +-
src/books/artAndDance/assets/images/image29-3.png | 0
src/books/childHealth/view/content/components/chapter001.vue | 33 ++-
src/books/artAndDance/assets/images/image27-4.png | 0
src/books/artAndDance/assets/images/image30-1.png | 0
src/books/artAndDance/assets/images/image30-3.png | 0
src/books/artAndDance/view/components/chapter006.vue | 48 ++--
src/books/childHealth/view/content/components/chapter0004.vue | 21 +
src/books/artAndDance/view/components/chapter001.vue | 6
src/books/childHealth/view/content/components/chapter006.vue | 15 +
src/books/artAndDance/view/components/chapter005.vue | 58 ++---
src/books/artAndDance/assets/images/image26-1.png | 0
src/books/artAndDance/assets/images/image27-3.png | 0
src/books/artAndDance/assets/images/image30-2.png | 0
src/books/artAndDance/assets/images/image29-2.png | 0
/dev/null | 0
src/books/artAndDance/assets/images/image30-4.png | 0
src/books/artAndDance/assets/images/image26-4.png | 0
src/books/childHealth/view/content/components/chapter007.vue | 42 ++-
src/books/artAndDance/assets/images/image28-4.png | 0
src/books/artAndDance/view/components/chapter002.vue | 23 +
src/books/artAndDance/assets/images/image28-3.png | 0
src/books/artAndDance/assets/images/image27-2.png | 0
src/books/artAndDance/assets/images/image29-1.png | 0
src/components/miniAudio/index.vue | 2
43 files changed, 387 insertions(+), 181 deletions(-)
diff --git a/.env.product b/.env.product
index 76a6d12..eb40f51 100644
--- a/.env.product
+++ b/.env.product
@@ -1,6 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/childHealth'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
-VUE_APP_BOOK_ID = 'mathBook'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'childHealth'
\ No newline at end of file
diff --git a/src/books/artAndDance/assets/images/image26-1.jpg b/src/books/artAndDance/assets/images/image26-1.jpg
deleted file mode 100644
index 7b2ccca..0000000
--- a/src/books/artAndDance/assets/images/image26-1.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-1.png b/src/books/artAndDance/assets/images/image26-1.png
new file mode 100644
index 0000000..cd2b2ba
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image26-1.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-2.jpg b/src/books/artAndDance/assets/images/image26-2.jpg
deleted file mode 100644
index 0e602b1..0000000
--- a/src/books/artAndDance/assets/images/image26-2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-2.png b/src/books/artAndDance/assets/images/image26-2.png
new file mode 100644
index 0000000..a88040a
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image26-2.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-3.jpg b/src/books/artAndDance/assets/images/image26-3.jpg
deleted file mode 100644
index db761e8..0000000
--- a/src/books/artAndDance/assets/images/image26-3.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-3.png b/src/books/artAndDance/assets/images/image26-3.png
new file mode 100644
index 0000000..fb42b39
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image26-3.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-4.jpg b/src/books/artAndDance/assets/images/image26-4.jpg
deleted file mode 100644
index b624f0f..0000000
--- a/src/books/artAndDance/assets/images/image26-4.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image26-4.png b/src/books/artAndDance/assets/images/image26-4.png
new file mode 100644
index 0000000..74ecdc6
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image26-4.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-1.jpg b/src/books/artAndDance/assets/images/image27-1.jpg
deleted file mode 100644
index 252f193..0000000
--- a/src/books/artAndDance/assets/images/image27-1.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-1.png b/src/books/artAndDance/assets/images/image27-1.png
new file mode 100644
index 0000000..c6c263b
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image27-1.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-2.jpg b/src/books/artAndDance/assets/images/image27-2.jpg
deleted file mode 100644
index 66b0489..0000000
--- a/src/books/artAndDance/assets/images/image27-2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-2.png b/src/books/artAndDance/assets/images/image27-2.png
new file mode 100644
index 0000000..f8b0b8c
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image27-2.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-3.jpg b/src/books/artAndDance/assets/images/image27-3.jpg
deleted file mode 100644
index d584d64..0000000
--- a/src/books/artAndDance/assets/images/image27-3.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-3.png b/src/books/artAndDance/assets/images/image27-3.png
new file mode 100644
index 0000000..5477a90
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image27-3.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-4.jpg b/src/books/artAndDance/assets/images/image27-4.jpg
deleted file mode 100644
index 000d0db..0000000
--- a/src/books/artAndDance/assets/images/image27-4.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image27-4.png b/src/books/artAndDance/assets/images/image27-4.png
new file mode 100644
index 0000000..f3a3f18
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image27-4.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-1.jpg b/src/books/artAndDance/assets/images/image28-1.jpg
deleted file mode 100644
index 1e983cc..0000000
--- a/src/books/artAndDance/assets/images/image28-1.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-1.png b/src/books/artAndDance/assets/images/image28-1.png
new file mode 100644
index 0000000..c51201b
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image28-1.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-2.jpg b/src/books/artAndDance/assets/images/image28-2.jpg
deleted file mode 100644
index 9ed2a18..0000000
--- a/src/books/artAndDance/assets/images/image28-2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-2.png b/src/books/artAndDance/assets/images/image28-2.png
new file mode 100644
index 0000000..619fda9
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image28-2.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-3.jpg b/src/books/artAndDance/assets/images/image28-3.jpg
deleted file mode 100644
index 2dc30b8..0000000
--- a/src/books/artAndDance/assets/images/image28-3.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-3.png b/src/books/artAndDance/assets/images/image28-3.png
new file mode 100644
index 0000000..52cf198
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image28-3.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-4.jpg b/src/books/artAndDance/assets/images/image28-4.jpg
deleted file mode 100644
index cd3e38d..0000000
--- a/src/books/artAndDance/assets/images/image28-4.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image28-4.png b/src/books/artAndDance/assets/images/image28-4.png
new file mode 100644
index 0000000..68f45a7
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image28-4.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-1.jpg b/src/books/artAndDance/assets/images/image29-1.jpg
deleted file mode 100644
index b1e92eb..0000000
--- a/src/books/artAndDance/assets/images/image29-1.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-1.png b/src/books/artAndDance/assets/images/image29-1.png
new file mode 100644
index 0000000..aec5a1e
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image29-1.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-2.jpg b/src/books/artAndDance/assets/images/image29-2.jpg
deleted file mode 100644
index 87ef8c6..0000000
--- a/src/books/artAndDance/assets/images/image29-2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-2.png b/src/books/artAndDance/assets/images/image29-2.png
new file mode 100644
index 0000000..c6bae5d
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image29-2.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-3.jpg b/src/books/artAndDance/assets/images/image29-3.jpg
deleted file mode 100644
index 7be96b2..0000000
--- a/src/books/artAndDance/assets/images/image29-3.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image29-3.png b/src/books/artAndDance/assets/images/image29-3.png
new file mode 100644
index 0000000..2d7ab66
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image29-3.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-1.jpg b/src/books/artAndDance/assets/images/image30-1.jpg
deleted file mode 100644
index c22dbaa..0000000
--- a/src/books/artAndDance/assets/images/image30-1.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-1.png b/src/books/artAndDance/assets/images/image30-1.png
new file mode 100644
index 0000000..9d7796c
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image30-1.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-2.jpg b/src/books/artAndDance/assets/images/image30-2.jpg
deleted file mode 100644
index e8bee76..0000000
--- a/src/books/artAndDance/assets/images/image30-2.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-2.png b/src/books/artAndDance/assets/images/image30-2.png
new file mode 100644
index 0000000..2d7f83f
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image30-2.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-3.jpg b/src/books/artAndDance/assets/images/image30-3.jpg
deleted file mode 100644
index ff3703d..0000000
--- a/src/books/artAndDance/assets/images/image30-3.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-3.png b/src/books/artAndDance/assets/images/image30-3.png
new file mode 100644
index 0000000..585244d
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image30-3.png
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-4.jpg b/src/books/artAndDance/assets/images/image30-4.jpg
deleted file mode 100644
index 0685c41..0000000
--- a/src/books/artAndDance/assets/images/image30-4.jpg
+++ /dev/null
Binary files differ
diff --git a/src/books/artAndDance/assets/images/image30-4.png b/src/books/artAndDance/assets/images/image30-4.png
new file mode 100644
index 0000000..31559cc
--- /dev/null
+++ b/src/books/artAndDance/assets/images/image30-4.png
Binary files differ
diff --git a/src/books/artAndDance/assets/main.less b/src/books/artAndDance/assets/main.less
index 04ec6c4..b437c3d 100644
--- a/src/books/artAndDance/assets/main.less
+++ b/src/books/artAndDance/assets/main.less
@@ -449,6 +449,9 @@
.pg-mh {
min-height: 815px;
}
+ .share-img-box {
+ min-height: 460px;
+ }
}
}
@media (min-width: 660px) {
@@ -462,6 +465,9 @@
.video-box {
max-width: 370px;
}
+ .share-img-box {
+ min-height: 650px;
+ }
.audio-box {
margin-top: 20px;
flex-wrap: nowrap;
diff --git a/src/books/artAndDance/view/components/chapter001.vue b/src/books/artAndDance/view/components/chapter001.vue
index 1306868..7b8b7f6 100644
--- a/src/books/artAndDance/view/components/chapter001.vue
+++ b/src/books/artAndDance/view/components/chapter001.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="2">
- <div class="page-box" page="4" style="min-height: auto">
+ <div class="page-box" page="4">
<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">
@@ -54,13 +54,13 @@
<ul class="fl fl-cl al-cn audio-box">
<li class="fl al-cn">
<span class="wh-nr auido-text mr-8 ">鐢风闊�</span>
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay" ></audio>
</li>
<li class="fl al-cn mt-20 " >
<span class="wh-nr auido-text mr-8 ">
濂崇闊�
</span>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
</ul>
<h3 id="c003">榛勯工妤奸�佸瓱娴╃劧涔嬪箍闄�</h3>
diff --git a/src/books/artAndDance/view/components/chapter002.vue b/src/books/artAndDance/view/components/chapter002.vue
index 9c77c40..e3c4ee7 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" style="min-height: auto;">
+ <div class="page-box" page="8">
<div v-if="showPageList.indexOf(8) > -1">
<img class="img-0" alt="" src="../../assets/images/dy2.jpg" />
<img src="../../assets/images/03-2.gif" alt="" style="width: 55%;" class="cover-gif">
@@ -17,14 +17,18 @@
<p class="center">
<img class="img-b" alt="" src="../../assets/images/04-2.gif" />
</p>
- <ul class="fl al-cn ju-bt img-state " style="margin-top: 100px;">
+ <!-- <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}">
+ <img src="../../assets/images/05.gif" alt="" class="w100" :style="{opacity:num / 10}">
</li>
<li style="width: 35%;">
- <img src="../../assets/images/girl.png" alt="" class="w100" :style="{opacity: num / 10}">
+ <img src="../../assets/images/girl.png" alt="" class="w100" :style="{opacity: (-num) / 10}">
</li>
- </ul>
+ </ul> -->
+ <p class="center">
+ <img :src="num >= 0 ? shape : girl" alt="" :style="{opacity:num >= 0 ? num / 10 : (-num) / 10 , width:num >= 0 ? '80%' : '34%'}">
+ </p>
+
<p class="img">鈥滅緤瑙掑紡鈥濊垶濮�</p>
</div>
<ul class="pb-box">
@@ -65,13 +69,13 @@
<ul class="fl fl-cl al-cn audio-box">
<li class="fl al-cn">
<span class="wh-nr auido-text mr-8">鐢风闊�</span>
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
<li class="fl al-cn mt-20">
<span class="wh-nr auido-text mr-8">
濂崇闊�
</span>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
</ul>
<h3 id="c006">浜＄緤琛ョ墷</h3>
@@ -191,7 +195,8 @@
cutTimer:null,
auidoPathOne:"",
auidoPathTwo:"",
-
+ shape:require("../../assets/images/05.gif"),
+ girl:require("../../assets/images/girl.png")
};
},
methods: {
@@ -212,7 +217,7 @@
},
cutNum() {
this.cutTimer = setInterval(() => {
- if(this.num > 0) {
+ if(this.num > -10) {
this.num --
} else {
clearInterval(this.cutTimer)
diff --git a/src/books/artAndDance/view/components/chapter003.vue b/src/books/artAndDance/view/components/chapter003.vue
index 0f81d92..875a4de 100644
--- a/src/books/artAndDance/view/components/chapter003.vue
+++ b/src/books/artAndDance/view/components/chapter003.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="4">
- <div class="page-box" page="12" style="min-height: auto">
+ <div class="page-box" page="12">
<div v-if="showPageList.indexOf(12) > -1">
<img class="img-0" alt="" src="../../assets/images/dy3.jpg" />
<img src="../../assets/images/07.gif" alt="" style="width: 56%;" class="cover-gif">
@@ -54,13 +54,13 @@
<ul class="fl fl-cl al-cn audio-box">
<li class="fl al-cn">
<span class="wh-nr auido-text mr-8">鐢风闊�</span>
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
<li class="fl al-cn mt-20">
<span class="wh-nr auido-text mr-8">
濂崇闊�
</span>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
</ul>
<h3 id="c009">灏忓効鍨傞挀</h3>
diff --git a/src/books/artAndDance/view/components/chapter004.vue b/src/books/artAndDance/view/components/chapter004.vue
index 2ba2656..97ce204 100644
--- a/src/books/artAndDance/view/components/chapter004.vue
+++ b/src/books/artAndDance/view/components/chapter004.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="5">
- <div class="page-box" page="16" style="min-height: auto;">
+ <div class="page-box" page="16">
<div v-if="showPageList.indexOf(16) > -1">
<img class="img-0" alt="" src="../../assets/images/dy4.jpg" />
<img src="../../assets/images/08.gif" alt="" style="width: 55%;" class="cover-gif">
@@ -60,13 +60,13 @@
<ul class="fl fl-cl al-cn audio-box">
<li class="fl al-cn">
<span class="wh-nr auido-text mr-8">鐢风闊�</span>
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
<li class="fl al-cn mt-20">
<span class="wh-nr auido-text mr-8">
濂崇闊�
</span>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
</ul>
<h3 id="c012">瀵婚殣鑰呬笉閬�</h3>
diff --git a/src/books/artAndDance/view/components/chapter005.vue b/src/books/artAndDance/view/components/chapter005.vue
index 0ba88b0..e0fcfca 100644
--- a/src/books/artAndDance/view/components/chapter005.vue
+++ b/src/books/artAndDance/view/components/chapter005.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="6">
- <div class="page-box" page="20" style="min-height: auto">
+ <div class="page-box" page="20">
<div v-if="showPageList.indexOf(20) > -1">
<img class="img-0" alt="" src="../../assets/images/dy5.jpg" />
<img
@@ -18,26 +18,12 @@
alt=""
class="w100 mb-40"
/>
- <div class="padding-96">
- <ul class="fl fl-cl al-cn img-state" style="margin-top: 100px">
- <li style="width: 45%">
- <img
- src="../../assets/images/crane.png"
- alt=""
- class="w100"
- :style="{ opacity: (10 - num) / 10 }"
- />
- </li>
- <li style="width: 35%">
- <img
- src="../../assets/images/rise.png"
- alt=""
- class="w100"
- :style="{ opacity: num / 10 }"
- />
- </li>
- </ul>
- <p class="img">鈥滆タ濉炲北鍓嶇櫧楣鈥濆姩浣�</p>
+ <div class="padding-96 fl ju-cn al-cn fl-cl">
+ <p class="center share-img-box">
+ <img :src="num >= 0 ? crane : rise" alt="" :style="{opacity:num >= 0 ? num / 10 : (-num) / 10 , width:num >= 0 ? '80%' : '70%'}">
+
+ </p>
+ <p class="img">鈥滆タ濉炲北鍓嶇櫧楣鈥濆姩浣�</p>
</div>
<ul class="pb-box">
<li class="ml-40">
@@ -80,11 +66,11 @@
<ul class="fl fl-cl al-cn audio-box">
<li class="fl al-cn">
<span class="wh-nr auido-text mr-8">鐢风闊�</span>
- <audio :src="auidoPathOne" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
<li class="fl al-cn mt-20">
<span class="wh-nr auido-text mr-8"> 濂崇闊� </span>
- <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
+ <audio :src="auidoPathTwo" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</li>
</ul>
<h3 id="c015">娓旀瓕瀛�</h3>
@@ -189,6 +175,8 @@
auidoPathOne: "",
auidoPathTwo: "",
num: 0,
+ crane:require("../../assets/images/crane.png"),
+ rise:require("../../assets/images/rise.png")
};
},
unmounted() {
@@ -212,24 +200,24 @@
);
},
addNum() {
- this.addTimer = setInterval(() => {
- if (this.num < 10) {
- this.num++;
+ this.addTimer = setInterval(() => {
+ if(this.num < 10) {
+ this.num ++
} else {
- clearInterval(this.addTimer);
- this.cutNum();
+ clearInterval(this.addTimer)
+ this.cutNum()
}
- }, 200);
+ },200)
},
cutNum() {
- this.cutTimer = setInterval(() => {
- if (this.num > 0) {
- this.num--;
+ this.cutTimer = setInterval(() => {
+ if(this.num > -10) {
+ this.num --
} else {
- clearInterval(this.cutTimer);
- this.addNum();
+ clearInterval(this.cutTimer)
+ this.addNum()
}
- }, 200);
+ },200)
},
audioPlay(e) {
this.$emit('closeAudio',e.srcElement.currentSrc)
diff --git a/src/books/artAndDance/view/components/chapter006.vue b/src/books/artAndDance/view/components/chapter006.vue
index ba07dae..765ae71 100644
--- a/src/books/artAndDance/view/components/chapter006.vue
+++ b/src/books/artAndDance/view/components/chapter006.vue
@@ -1,6 +1,6 @@
<template>
<div class="chapter" num="7">
- <div class="page-box" page="24" style="min-height: auto">
+ <div class="page-box" page="24">
<div v-if="showPageList.indexOf(24) > -1">
<img class="img-0" alt="" src="../../assets/images/dzk.jpg" />
</div>
@@ -20,7 +20,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image26-1.jpg"
+ src="../../assets/images/image26-1.png"
alt="1 鈥滄晠浜鸿タ杈為粍楣ゆゼ鈥濆姩浣�"
/>
</div>
@@ -28,7 +28,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image26-2.jpg"
+ src="../../assets/images/image26-2.png"
alt="2 鈥滅儫鑺变笁鏈堜笅鎵窞鈥濆姩浣�"
/>
</div>
@@ -36,7 +36,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image26-3.jpg"
+ src="../../assets/images/image26-3.png"
alt="3 鈥滃甯嗚繙褰辩ⅶ绌哄敖鈥濆姩浣�"
/>
</div>
@@ -44,7 +44,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image26-4.jpg"
+ src="../../assets/images/image26-4.png"
alt="4 鈥滃敮瑙侀暱姹熷ぉ闄呮祦鈥濆姩浣�"
/>
</div>
@@ -82,7 +82,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image27-1.jpg"
+ src="../../assets/images/image27-1.png"
alt="1 鈥滅緤瑙掑紡鈥濊垶濮�"
/>
</div>
@@ -90,7 +90,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image27-2.jpg"
+ src="../../assets/images/image27-2.png"
alt="2 妯′豢鈥滅獰绐库�濊垶濮�"
/>
</div>
@@ -98,7 +98,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image27-3.jpg"
+ src="../../assets/images/image27-3.png"
alt="3 鈥滄崅鍢寸姸鈥濊垶濮�"
/>
</div>
@@ -106,7 +106,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image27-4.jpg"
+ src="../../assets/images/image27-4.png"
alt="4 鈥滃弻浜洪厤鍚堚�濊垶濮�"
/>
</div>
@@ -146,7 +146,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image28-1.jpg"
+ src="../../assets/images/image28-1.png"
alt="1 鍚歌烦姝�"
/>
</div>
@@ -154,7 +154,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image28-2.jpg"
+ src="../../assets/images/image28-2.png"
alt="2 鈥滀晶鍧愯帗鑻旇崏鏄犺韩鈥濆姩浣�"
/>
</div>
@@ -162,7 +162,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image28-3.jpg"
+ src="../../assets/images/image28-3.png"
alt="3 鈥滆矾浜哄�熼棶閬ユ嫑鎵嬧�濆姩浣�"
/>
</div>
@@ -170,7 +170,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image28-4.jpg"
+ src="../../assets/images/image28-4.png"
alt="4 妯′豢鈥滈挀楸尖�濊垶濮�"
/>
</div>
@@ -208,7 +208,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image29-1.jpg"
+ src="../../assets/images/image29-1.png"
alt="1 鈥滄澗涓嬮棶绔ュ瓙鈥濆姩浣�"
/>
</div>
@@ -216,7 +216,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image29-2.jpg"
+ src="../../assets/images/image29-2.png"
alt="2 鈥滆█甯堥噰鑽幓鈥濆姩浣�"
/>
</div>
@@ -224,7 +224,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image29-3.jpg"
+ src="../../assets/images/image29-3.png"
alt="3 鈥滀簯娣变笉鐭ュ鈥濆姩浣�"
/>
</div>
@@ -264,32 +264,32 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image30-1.jpg"
- alt="1 鍚歌烦姝�"
+ src="../../assets/images/image30-1.png"
+ alt="1 鈥滆タ濉炲北鍓嶇櫧楣鈥濆姩浣�"
/>
</div>
</div>
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image30-2.jpg"
- alt="2 鈥滀晶鍧愯帗鑻旇崏鏄犺韩鈥濆姩浣�"
+ src="../../assets/images/image30-2.png"
+ alt="2 鈥滄鑺辨祦姘撮硿楸艰偉鈥濆姩浣�"
/>
</div>
</div>
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image30-3.jpg"
- alt="3 鈥滆矾浜哄�熼棶閬ユ嫑鎵嬧�濆姩浣�"
+ src="../../assets/images/image30-3.png"
+ alt="3 鈥滈潚绠瑺锛岀豢钃戣。鈥濆姩浣�"
/>
</div>
</div>
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img
- src="../../assets/images/image30-4.jpg"
- alt="4 妯′豢鈥滈挀楸尖�濊垶濮�"
+ src="../../assets/images/image30-4.png"
+ alt="4 鈥滄枩椋庣粏闆ㄤ笉椤诲綊鈥濆姩浣�"
/>
</div>
</div>
diff --git a/src/books/artAndDance/view/components/index.vue b/src/books/artAndDance/view/components/index.vue
index 02232f5..6678a4d 100644
--- a/src/books/artAndDance/view/components/index.vue
+++ b/src/books/artAndDance/view/components/index.vue
@@ -194,7 +194,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(1, 10);
+ // this.gotoPage(6, 26);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -222,7 +222,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- // }, 5000);
+ // }, 500);
},
methods: {
// setZoom1() {
@@ -670,8 +670,8 @@
)
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
- observer: true,
- observeParents: true
+ // observer: true,
+ // observeParents: true
// // 濡傛灉闇�瑕佸垎椤靛櫒
// pagination: {
// el: (this.container ? this.container : document).querySelector(
diff --git a/src/books/childHealth/view/content/components/chapter0004.vue b/src/books/childHealth/view/content/components/chapter0004.vue
index 4c8e692..818446d 100644
--- a/src/books/childHealth/view/content/components/chapter0004.vue
+++ b/src/books/childHealth/view/content/components/chapter0004.vue
@@ -329,7 +329,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヤ綋閲嶇殑娴嬮噺</p>
</div>
@@ -382,7 +383,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヨ韩楂樼殑娴嬮噺</p>
</div>
@@ -421,7 +423,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュご鍥寸殑娴嬮噺</p>
</div>
@@ -469,7 +472,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヨ兏鍥寸殑娴嬮噺</p>
</div>
@@ -752,7 +756,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ殑鍋ュ悍妫�鏌�</p>
</div>
@@ -1250,7 +1255,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬効绔ョ粯浜烘祴璇�</p>
</div>
@@ -1595,6 +1601,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 0545773..5496adf 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -322,7 +322,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
</span>
<span class="span-border"></span>
@@ -415,7 +416,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-box video-border"
+ class="video-box video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶楠�</p>
<h5 id="e001">1.楠ㄧ敓闀胯繀閫�</h5>
@@ -1025,7 +1027,8 @@
controls
controlslist="nodownload"
style="margin-top: 20px"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ懠鍚搁亾鐨勯槻寰＄壒鐐逛笌淇濆仴</p>
</div>
@@ -1485,7 +1488,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ績銆佽绠＄殑鐗圭偣鍙婁繚鍋�</p>
</div>
@@ -1965,7 +1969,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ墮榻跨殑鐢熺悊鐗圭偣鍙婁繚鍋�</p>
</div>
@@ -3040,7 +3045,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ唴鍒嗘硨绯荤粺鐨勭敓鐞嗙壒鐐逛笌淇濆仴</p>
</div>
@@ -3440,7 +3446,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
</p>
<p class="img">瑙嗛锛氬鍓嶅効绔ュぇ鑴戠殑鐢熺悊鐗圭偣鍙婁繚鍋�</p>
@@ -3962,7 +3969,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ溂鐨勭敓鐞嗙壒鐐逛笌淇濆仴</p>
</div>
@@ -4066,7 +4074,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヨ�崇殑鐗圭偣鍙婁繚鍋�</p>
</div>
@@ -4272,7 +4281,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ョ毊鑲ょ殑鐗圭偣涓庝繚鍋�</p>
</div>
@@ -4973,6 +4983,9 @@
JSON.stringify(this.chapterOneData)
);
},
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
+ }
},
};
</script>
diff --git a/src/books/childHealth/view/content/components/chapter002.vue b/src/books/childHealth/view/content/components/chapter002.vue
index 74cce9c..7e0ff2d 100644
--- a/src/books/childHealth/view/content/components/chapter002.vue
+++ b/src/books/childHealth/view/content/components/chapter002.vue
@@ -302,7 +302,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬効绔ュ悇闃舵鐨勭壒鐐瑰拰淇濆仴瑕佺偣</p>
</div>
@@ -636,7 +637,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氱敓闀垮彂鑲茬殑鈥滈搧鈥濊寰�</p>
</div>
@@ -1029,7 +1031,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
</div>
</div>
@@ -1505,6 +1508,9 @@
JSON.stringify(this.chapterTwoData)
);
},
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
+ }
},
};
</script>
diff --git a/src/books/childHealth/view/content/components/chapter003.vue b/src/books/childHealth/view/content/components/chapter003.vue
index 44ec39e..bbff559 100644
--- a/src/books/childHealth/view/content/components/chapter003.vue
+++ b/src/books/childHealth/view/content/components/chapter003.vue
@@ -546,7 +546,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬奖鍝嶅鍓嶅効绔ュ績鐞嗗彂灞曠殑鍥犵礌</p>
</div>
@@ -1074,7 +1075,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氳繃搴︿緷璧�</p>
</div>
@@ -1194,7 +1196,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="video-border w100"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
</p>
<p class="img">瑙嗛锛氳嚜鎱�</p>
@@ -1559,7 +1562,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氳█璇強璇█鍙戣偛闅滅</p>
</div>
@@ -1605,7 +1609,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭�庢牱鍙戠幇瀛╁瓙鍙戣偛杩熺紦</p>
</div>
@@ -1718,7 +1723,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬効绔ュ鍔ㄧ棁</p>
</div>
@@ -2161,6 +2167,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/components/chapter005.vue b/src/books/childHealth/view/content/components/chapter005.vue
index c32a56a..7f390d6 100644
--- a/src/books/childHealth/view/content/components/chapter005.vue
+++ b/src/books/childHealth/view/content/components/chapter005.vue
@@ -443,7 +443,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氳惀鍏荤礌</p>
</div>
@@ -1598,7 +1599,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫钩鍎胯緟鍔╅鍝佺殑娣诲姞</p>
</div>
@@ -1905,7 +1907,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- style="width: 100%"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ヨ喅椋熺殑閰嶅埗鍘熷垯</p>
</div>
@@ -2102,7 +2105,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- style="width: 100%"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬効绔ラギ椋熶範鎯殑鍩瑰吇</p>
</div>
@@ -2928,6 +2932,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/components/chapter006.vue b/src/books/childHealth/view/content/components/chapter006.vue
index 93a017e..98e262f 100644
--- a/src/books/childHealth/view/content/components/chapter006.vue
+++ b/src/books/childHealth/view/content/components/chapter006.vue
@@ -839,7 +839,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭柊鐢熷効鐗圭偣涓庝繚鍋�</p>
</div>
@@ -1145,7 +1146,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶噸瑙嗘柊鐢熷効鐤剧梾绛涙煡</p>
</div>
@@ -1226,7 +1228,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭棭浜у効鐨勭壒鐐逛笌淇濆仴</p>
</div>
@@ -2309,7 +2312,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬辜鍎挎湡鐨勭壒鐐逛笌淇濆仴</p>
</div>
@@ -2960,6 +2964,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/components/chapter007.vue b/src/books/childHealth/view/content/components/chapter007.vue
index 9e96de1..61d378d 100644
--- a/src/books/childHealth/view/content/components/chapter007.vue
+++ b/src/books/childHealth/view/content/components/chapter007.vue
@@ -238,7 +238,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氱柧鐥呭熀纭�</p>
</div>
@@ -638,7 +639,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶仐浼犵梾銆佸嚭鐢熺己闄蜂笌浼樼敓</p>
</div>
@@ -1388,7 +1390,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�旇偉鑳栫棁</p>
</div>
@@ -1512,7 +1515,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛涓冿細瀛﹀墠鍎跨甯歌鐤剧梾鈥斺�旂淮鐢熺礌D缂轰箯鎬т綕鍋荤梾</p>
</div>
@@ -1618,7 +1622,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�旂己閾佹�ц传琛�</p>
</div>
@@ -1685,7 +1690,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�斾笂鍛煎惛閬撴劅鏌�</p>
</div>
@@ -1833,7 +1839,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�旈緥榻�</p>
</div>
@@ -1913,7 +1920,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�斾腑鑰崇値</p>
</div>
@@ -1959,7 +1967,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佺柧鐥呪�斺�斿急瑙�</p>
</div>
@@ -2307,7 +2316,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫紶鏌撶梾鍩虹鐭ヨ瘑鈥斺�旂壒鎬т笌涓変釜鐜妭</p>
</div>
@@ -2526,7 +2536,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫紶鏌撶梾鍙婂叾棰勯槻鈥斺�旂柅鑻�</p>
</div>
@@ -3160,7 +3171,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫紶鏌撶梾鍙婂叾棰勯槻鈥斺�旂媯鐘梾</p>
</div>
@@ -3283,7 +3295,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬鍓嶅効绔ュ父瑙佸瘎鐢熻櫕鐥呪�斺�旇洸铏梾</p>
</div>
@@ -3838,6 +3851,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/components/chapter008.vue b/src/books/childHealth/view/content/components/chapter008.vue
index 7f88cb9..3d3676b 100644
--- a/src/books/childHealth/view/content/components/chapter008.vue
+++ b/src/books/childHealth/view/content/components/chapter008.vue
@@ -333,7 +333,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫綋娓╂祴閲�</p>
</div>
@@ -386,7 +387,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氱墿鐞嗛檷娓�</p>
</div>
@@ -472,7 +474,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">
瑙嗛锛氬鍓嶅効绔ュ父鐢ㄧ殑鎶ょ悊涓庢�ユ晳鎶�鏈�斺�斿効绔ョ瀛︾敤鑽寚鍗�
@@ -592,7 +595,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭榧昏</p>
</div>
@@ -1010,7 +1014,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- style="width: 100%"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬紓鐗╃殑澶勭悊</p>
</div>
@@ -1051,7 +1056,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶奔鍒哄崱鍠夌殑澶勭悊</p>
</div>
@@ -1214,7 +1220,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭儕鍘ャ�佹檿鍘ャ�佷紤鍏嬬殑澶勭悊</p>
</div>
@@ -1380,7 +1387,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶鎶樹笌鑴变綅</p>
</div>
@@ -1466,7 +1474,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬績鑲哄鑻�</p>
</div>
@@ -1926,7 +1935,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬辜鍎垮洯瀹夊叏鏁欒偛</p>
</div>
@@ -2586,6 +2596,9 @@
this.$data.pathNine = await getResourcePath("bf45a94562ab237da0ef65ba33631022");
this.$data.pathTen = await getResourcePath("f7b5594f23b2ded96e15b99c296be54d");
},
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
+ }
},
};
</script>
diff --git a/src/books/childHealth/view/content/components/chapter009.vue b/src/books/childHealth/view/content/components/chapter009.vue
index eaccf4e..75d0e96 100644
--- a/src/books/childHealth/view/content/components/chapter009.vue
+++ b/src/books/childHealth/view/content/components/chapter009.vue
@@ -305,7 +305,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬姩鍔涘畾鍨嬪強鍏跺舰鎴�</p>
</div>
@@ -593,7 +594,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- style="width: 100%"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫竷姝ユ礂鎵嬫硶</p>
</div>
@@ -993,7 +995,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氭櫒闂存鏌�</p>
</div>
@@ -1054,7 +1057,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氶闃叉帴绉�</p>
</div>
@@ -1267,7 +1271,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- style="width: 100%"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫紶鏌撶梾鍩虹鐭ヨ瘑鈥斺�旈殧绂�</p>
</div>
@@ -1322,7 +1327,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氫紶鏌撶梾鍩虹鐭ヨ瘑鈥斺�旀秷姣�</p>
</div>
@@ -1456,7 +1462,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氱幆澧冨崼鐢熷埗搴︿笌鍗敓淇濆仴鐧昏銆佺粺璁″埗搴�</p>
</div>
@@ -1893,6 +1900,9 @@
"960e9aa17b48e900b08cde6e44b774f3"
);
},
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
+ }
},
};
</script>
diff --git a/src/books/childHealth/view/content/components/chapter010.vue b/src/books/childHealth/view/content/components/chapter010.vue
index 15a32b6..1331d97 100644
--- a/src/books/childHealth/view/content/components/chapter010.vue
+++ b/src/books/childHealth/view/content/components/chapter010.vue
@@ -423,7 +423,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬辜鍎垮洯鍚勫閰嶇疆鐨勫崼鐢熻姹�</p>
</div>
@@ -1090,7 +1091,8 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100 video-border"
+ class="w100 video-border video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬辜鍎垮洯鏂囧叿鍜屾暀鐜╁叿鍗敓</p>
</div>
@@ -1490,6 +1492,9 @@
},
gotoLabel(id) {
(this.container ? this.container : document).getElementById(id).scrollIntoView()
+ },
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
}
},
};
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 80a8ec5..cc40f13 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -21,51 +21,61 @@
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterOne>
<chapterTwo
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterTwo>
<chapterThree
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterThree>
<chapterFour
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterFour>
<chapterFive
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterFive>
<chapterSix
v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterSix>
<chapterSeven
v-if="showCatalogList.indexOf(8) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterSeven>
<chapterEight
v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterEight>
<chapterNine
v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterNine>
<chapterTen
v-if="showCatalogList.indexOf(11) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
+ @closeVideo="closeVideo"
></chapterTen>
<chapterEleven
v-if="showCatalogList.indexOf(12) > -1"
@@ -227,8 +237,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- setTimeout(() => {
- this.gotoPage(1,10);
+ // setTimeout(() => {
+ // this.gotoPage(1,10);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -242,7 +252,7 @@
// ids: ["2ACA9359"]
// });
// }, 2000);
- // }, 5000);
+ // }, 500);
// const pageDom = (this.container ? this.container : document)
// .querySelector("#app")
@@ -256,7 +266,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- }, 500);
+ // }, 500);
},
methods: {
// setZoom1() {
@@ -896,6 +906,20 @@
this.highlightData = data;
// 璺宠浆
this.gotoPage(data.catalog, data.page, () => {});
+ },
+ closeVideo(path) {
+ let allVideo = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ allVideo = Array.from(allVideo);
+ if(allVideo.length) {
+ for (let index = 0; index < allVideo.length; index++) {
+ const item = allVideo[index];
+ if(item.currentSrc != path) {
+ item.pause()
+ }
+ }
+ }
}
},
components: {
diff --git a/src/books/mathBook/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
index 0c0e400..f0c2321 100644
--- a/src/books/mathBook/view/components/chapter001.vue
+++ b/src/books/mathBook/view/components/chapter001.vue
@@ -536,7 +536,7 @@
/>
</p>
</div>
- <p class="block">
+ <p class="block tl">
濡傛灉<i>f</i>锛�<i>x</i>锛夛紝<i>g</i>锛�<i>x</i>锛夐兘鏄畾涔夊煙涓�<i>D</i>鐨勫伓鍑芥暟锛岄偅涔�<i>f</i>锛�<i>x</i>锛�+<i>g</i>锛�<i>x</i>锛夊拰<i>f</i>锛�<i>x</i>锛�<i>g</i>锛�<i>x</i>锛変粛鏄伓鍑芥暟鍚楋紵
<textarea
cols="30"
@@ -565,6 +565,7 @@
<div class="bj">
<examinations
:cardList="questionData"
+ inputBc="#d3edfa"
v-if="questionData"
:isReal="false"
></examinations>
@@ -588,16 +589,46 @@
</el-dialog>
<!-- 瑙ｉ鎬濊矾寮圭獥 -->
<el-dialog
- title="瑙ｉ鎬濊矾"
:visible.sync="thinkingDialog"
width="40%"
:append-to-body="true"
+ :show-close="false"
>
+ <div slot="title" style="padding: 0; text-align: center; color: #333;display:flex;justify-content: center;">
+ <span style=""> 瑙ｉ鎬濊矾 </span>
+ <svg
+ style="position: absolute; right:10px;cursor: pointer;"
+ @click="thinkingDialog = false"
+ t="1718596022986"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="4252"
+ width="20"
+ height="20"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ >
+ <path
+ d="M176.661601 817.172881C168.472798 825.644055 168.701706 839.149636 177.172881 847.338438 185.644056 855.527241 199.149636 855.298332 207.338438 846.827157L826.005105 206.827157C834.193907 198.355983 833.964998 184.850403 825.493824 176.661601 817.02265 168.472798 803.517069 168.701706 795.328267 177.172881L176.661601 817.172881Z"
+ fill="#979797"
+ p-id="4253"
+ ></path>
+ <path
+ d="M795.328267 846.827157C803.517069 855.298332 817.02265 855.527241 825.493824 847.338438 833.964998 839.149636 834.193907 825.644055 826.005105 817.172881L207.338438 177.172881C199.149636 168.701706 185.644056 168.472798 177.172881 176.661601 168.701706 184.850403 168.472798 198.355983 176.661601 206.827157L795.328267 846.827157Z"
+ fill="#979797"
+ p-id="4254"
+ ></path>
+ </svg>
+ </div>
<ul>
<li v-for="(item, index) in thinkOne" :key="index">
<div v-if="item.isShow" style="display: flex">
- <span class="step-num">
- <span class="step-num-box">{{ index + 1 }}</span>
+ <span style="position: relative">
+ <span
+ style="position: absolute; top: 16px; left: 13px; color: #fff"
+ >{{ index + 1 }}</span
+ >
<img
src="../../assets/images/icon/blue-group.png"
alt=""
@@ -615,8 +646,20 @@
</div>
</li>
</ul>
- <div class="bottom-btn" @click="showNext(thinkIndex)">
- <img src="../../assets/images/icon/mouse.png" alt="" v-if="thinkIndex != 3" />
+ <div
+ @click="showNext(thinkIndex)"
+ style="
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ "
+ >
+ <img
+ src="../../assets/images/icon/mouse.png"
+ alt=""
+ v-if="thinkIndex != 3"
+ />
<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -643,16 +686,50 @@
</el-dialog>
<!-- 瑙ｉ姝ラ寮圭獥 -->
<el-dialog
+ class="stepDialog"
title="瑙ｉ姝ラ"
:visible.sync="stepDialog"
width="40%"
:append-to-body="true"
+ :show-close="false"
>
+ <div slot="title" style="padding: 0; text-align: center; color: #333;display:flex;justify-content: center;">
+ <span>
+ 瑙ｉ姝ラ
+ </span>
+ <svg
+ style="position: absolute; right:10px;cursor: pointer;"
+ @click="stepDialog = false"
+ t="1718596022986"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="4252"
+ width="20"
+ height="20"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ >
+ <path
+ d="M176.661601 817.172881C168.472798 825.644055 168.701706 839.149636 177.172881 847.338438 185.644056 855.527241 199.149636 855.298332 207.338438 846.827157L826.005105 206.827157C834.193907 198.355983 833.964998 184.850403 825.493824 176.661601 817.02265 168.472798 803.517069 168.701706 795.328267 177.172881L176.661601 817.172881Z"
+ fill="#979797"
+ p-id="4253"
+ ></path>
+ <path
+ d="M795.328267 846.827157C803.517069 855.298332 817.02265 855.527241 825.493824 847.338438 833.964998 839.149636 834.193907 825.644055 826.005105 817.172881L207.338438 177.172881C199.149636 168.701706 185.644056 168.472798 177.172881 176.661601 168.701706 184.850403 168.472798 198.355983 176.661601 206.827157L795.328267 846.827157Z"
+ fill="#979797"
+ p-id="4254"
+ ></path>
+ </svg>
+ </div>
<ul>
<li v-for="(item, index) in stepOne" :key="index">
<div v-if="item.isShow" style="display: flex">
- <span class="step-num">
- <span class="step-num-box">{{ index + 1 }}</span>
+ <span style="position: relative">
+ <span
+ style="position: absolute; top: 16px; left: 13px; color: #fff"
+ >{{ index + 1 }}</span
+ >
<img
src="../../assets/images/icon/blue-group.png"
alt=""
@@ -670,8 +747,20 @@
</div>
</li>
</ul>
- <div class="bottom-btn" @click="showNextChange(stepIndex)">
- <img src="../../assets/images/icon/mouse.png" alt="" v-if="stepIndex != 2" />
+ <div
+ @click="showNextChange(stepIndex)"
+ style="
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ "
+ >
+ <img
+ src="../../assets/images/icon/mouse.png"
+ alt=""
+ v-if="stepIndex != 2"
+ />
<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -735,7 +824,7 @@
videoPath: "",
questionData: [],
stepIndex: 1,
- thinkIndex:1,
+ thinkIndex: 1,
chapterData: {
isCollectImg: false,
isCollectVideo: false,
@@ -832,15 +921,15 @@
const number = this.thinkOne.findIndex((item, index) => index == num);
console.log(number);
this.thinkOne[number].isShow = true;
- if(this.thinkIndex <= 2) {
- this.thinkIndex ++
+ if (this.thinkIndex <= 2) {
+ this.thinkIndex++;
}
},
showNextChange(num) {
const number = this.stepOne.findIndex((item, index) => index == num);
this.stepOne[number].isShow = true;
- if(this.stepIndex < 2) {
- this.stepIndex ++
+ if (this.stepIndex < 2) {
+ this.stepIndex++;
}
},
},
@@ -880,4 +969,6 @@
color: #fff;
}
}
+.stepDialog {
+}
</style>
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 5986ef3..f2bdffd 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -73,12 +73,13 @@
v-html="itemText"
></span>
<!-- -->
- <el-input
+ <input
v-else
type="text"
class="input"
v-model.trim="value.userAnswer[itemText.num]"
:disabled="value.isComplete"
+ :style="{backgroundColor:inputBc}"
/>
<!-- -->
</span>
@@ -495,6 +496,10 @@
type: Boolean,
default: true,
},
+ inputBc: {
+ type: String,
+ default: "#fff",
+ },
},
data() {
return {
@@ -824,23 +829,15 @@
font-weight: 400;
margin-top: 6px;
}
- .el-input {
+ input {
width: 140px;
height: 24px;
- border-top: 0;
+ border: 0;
+ outline: none;
+ border-bottom: 1px solid #15c0f2;
}
/deep/ .el-textarea.is-disabled .el-textarea__inner {
background-color: #fff;
- }
- /deep/.el-input__wrapper {
- border-top: 0 !important;
- }
- /deep/ .el-input__inner {
- border-top: 0 !important;
- border-left: 0 !important ;
- border-right: 0 !important ;
- border-bottom: 1px solid #15c0f2 !important;
- border-radius: 0 !important;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #fff;
diff --git a/src/components/miniAudio/index.vue b/src/components/miniAudio/index.vue
index ac4a2a7..f7e1908 100644
--- a/src/components/miniAudio/index.vue
+++ b/src/components/miniAudio/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="mini-audio" v-if="path">
- <audio controls :src="path" class="aduioPlayer"></audio>
+ <audio controls controlslist="noplaybackrate nodownload" :src="path" class="aduioPlayer"></audio>
<svg
@click="closeMiniAudio"
t="1717642737563"
--
Gitblit v1.9.1