From 1e306ec496dec8d938e71e28d218606dc6ec87e4 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 20:28:17 +0800
Subject: [PATCH] 数学优化
---
src/books/mathBook/view/components/header.vue | 4
/dev/null | 0
src/books/mathBook/assets/images/icon/mouse.png | 0
src/books/mathBook/view/components/chapter001.vue | 228 +++++++++++++++++++++++++++------------------
.env.product | 4
src/assets/images/heart-check.png | 0
src/books/mathBook/assets/images/icon/blue.png | 0
src/books/mathBook/assets/main.less | 3
src/components/examinations/index.vue | 11 -
src/books/mathBook/assets/images/icon/blue-group.png | 0
src/App.vue | 2
src/assets/images/heart.png | 0
12 files changed, 147 insertions(+), 105 deletions(-)
diff --git a/.env.product b/.env.product
index 307f663..76a6d12 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/artAndDrama'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
-VUE_APP_BOOK_ID = 'artAndDrama'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'mathBook'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 77be6ac..58ee2a9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "artAndDrama")
+ : "mathBook")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/assets/images/collect.png b/src/assets/images/collect.png
deleted file mode 100644
index 958cf16..0000000
--- a/src/assets/images/collect.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/heart-check.png b/src/assets/images/heart-check.png
new file mode 100644
index 0000000..74d469c
--- /dev/null
+++ b/src/assets/images/heart-check.png
Binary files differ
diff --git a/src/assets/images/heart.png b/src/assets/images/heart.png
new file mode 100644
index 0000000..7817ec4
--- /dev/null
+++ b/src/assets/images/heart.png
Binary files differ
diff --git a/src/assets/images/isCollect.png b/src/assets/images/isCollect.png
deleted file mode 100644
index 0cb1cf7..0000000
--- a/src/assets/images/isCollect.png
+++ /dev/null
Binary files differ
diff --git a/src/books/mathBook/assets/images/icon/blue-group.png b/src/books/mathBook/assets/images/icon/blue-group.png
new file mode 100644
index 0000000..8b4a021
--- /dev/null
+++ b/src/books/mathBook/assets/images/icon/blue-group.png
Binary files differ
diff --git a/src/books/mathBook/assets/images/icon/blue.png b/src/books/mathBook/assets/images/icon/blue.png
new file mode 100644
index 0000000..2549f61
--- /dev/null
+++ b/src/books/mathBook/assets/images/icon/blue.png
Binary files differ
diff --git a/src/books/mathBook/assets/images/icon/mouse.png b/src/books/mathBook/assets/images/icon/mouse.png
new file mode 100644
index 0000000..2aa50ca
--- /dev/null
+++ b/src/books/mathBook/assets/images/icon/mouse.png
Binary files differ
diff --git a/src/books/mathBook/assets/main.less b/src/books/mathBook/assets/main.less
index cd19bdb..6fcd983 100644
--- a/src/books/mathBook/assets/main.less
+++ b/src/books/mathBook/assets/main.less
@@ -809,6 +809,9 @@
margin-top: 10px;
}
}
+ .page-box{
+ min-height: 500px;
+ }
}
}
@media (min-width: 660px) {
diff --git a/src/books/mathBook/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
index 74934e8..1bdc734 100644
--- a/src/books/mathBook/view/components/chapter001.vue
+++ b/src/books/mathBook/view/components/chapter001.vue
@@ -149,13 +149,18 @@
</p>
<p class="img fl fl-cn ju-cn">
<span>鍥�3-15</span>
- <el-tooltip class="item" effect="dark" :content="chapterData.isCollectImg ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="chapterData.isCollectImg ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
+ placement="top-start"
+ >
<img
- :src="chapterData.isCollectImg ? collectCheck : collectImg"
- alt=""
- class="collect-btn"
- @click="handleCollect('img')"
- />
+ :src="chapterData.isCollectImg ? collectCheck : collectImg"
+ alt=""
+ class="collect-btn"
+ @click="handleCollect('img')"
+ />
</el-tooltip>
</p>
<video
@@ -172,19 +177,24 @@
></video>
<p class="img fl fl-cn ju-cn">
<span>瑙嗛锛氬垽鏁板嚱鏁板鍋舵�х殑鏂规硶鍜屾楠� </span>
- <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
+ placement="top-start"
+ >
<img
- :src="chapterData.isCollectVideo ? collectCheck : collectImg"
- alt=""
- class="collect-btn"
- @click="handleCollect('video')"
- />
+ :src="chapterData.isCollectVideo ? collectCheck : collectImg"
+ alt=""
+ class="collect-btn"
+ @click="handleCollect('video')"
+ />
</el-tooltip>
</p>
- <p class="fl">
+ <p class="fl">
<span>
<span class="zt-ls"><b>渚�1</b></span
- >銆�鏍规嵁鍥�3-16涓嚱鏁扮殑鍥惧儚锛屽垽鏂摢浜涘嚱鏁版槸鍋跺嚱鏁�.
+ >銆�鏍规嵁鍥�3-16涓嚱鏁扮殑鍥惧儚锛屽垽鏂摢浜涘嚱鏁版槸鍋跺嚱鏁�.
</span>
<span class="btn-box" @click="isShowExampleOne = !isShowExampleOne">
<svg
@@ -230,9 +240,9 @@
<p class="fl">
<span>
<span class="zt-ls"><b>渚�2</b></span
- >銆�宸茬煡<i>f</i>锛�<i>x</i>锛�=|<i>x</i>|+1鍥惧儚鍦�<i>y</i>杞村彸杈圭殑閮ㄥ垎濡傚浘3-17鎵�绀�.璇曠敾鍑鸿繖涓嚱鏁板浘鍍忓湪<i>y</i>杞村乏杈圭殑閮ㄥ垎.
+ >銆�宸茬煡<i>f</i>锛�<i>x</i>锛�=|<i>x</i>|+1鍥惧儚鍦�<i>y</i>杞村彸杈圭殑閮ㄥ垎濡傚浘3-17鎵�绀�.璇曠敾鍑鸿繖涓嚱鏁板浘鍍忓湪<i>y</i>杞村乏杈圭殑閮ㄥ垎.
</span>
-
+
<span class="btn-box" @click="isShowExampleTwo = !isShowExampleTwo">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -385,7 +395,7 @@
class="btn-box"
@click="isShowExampleFour = !isShowExampleFour"
>
- <svg
+ <svg
xmlns="http://www.w3.org/2000/svg"
width="16.501"
height="16.501"
@@ -432,7 +442,7 @@
class="btn-box"
@click="isShowExampleFive = !isShowExampleFive"
>
- <svg
+ <svg
xmlns="http://www.w3.org/2000/svg"
width="16.501"
height="16.501"
@@ -574,14 +584,8 @@
<iframe
src="https://www.geogebra.org/calculator"
frameborder="0"
- style=" width: 100%;min-height: 800px;"
+ style="width: 100%; min-height: 800px"
></iframe>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisible = false"
- >纭� 瀹�</el-button
- >
- </span>
</el-dialog>
<!-- 瑙ｉ鎬濊矾寮圭獥 -->
<el-dialog
@@ -592,44 +596,51 @@
>
<ul>
<li v-for="(item, index) in thinkOne" :key="index">
- <div v-if="item.isShow">
+ <div v-if="item.isShow" style="display: flex">
+ <span class="step-num">
+ <span class="step-num-box">{{ index + 1 }}</span>
+ <img
+ src="../../assets/images/icon/blue-group.png"
+ alt=""
+ style="margin-right: 10px"
+ v-if="index < thinkOne.length - 1"
+ />
+ <img
+ src="../../assets/images/icon/blue.png"
+ alt=""
+ v-if="index == thinkOne.length - 1"
+ style="margin-right: 10px"
+ />
+ </span>
<p class="txt-p">{{ item.txt }}</p>
- <div style="text-align: center">
- <svg
- @click="showNext(index + 1)"
- v-if="index != thinkOne.length - 1"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- t="1710234570135"
- class="icon"
- viewBox="0 0 1024 1024"
- version="1.1"
- p-id="5067"
- width="15"
- height="15"
- >
- <path
- d="M2.257993 493.371555 415.470783 906.584344 512 1003.113561 608.529217 906.584344 1021.742007 493.371555 925.212789 396.842337 512 810.055127 98.787211 396.842337Z"
- fill="#1296db"
- p-id="5068"
- />
- <path
- d="M2.257993 117.980154 415.470783 531.192944 512 627.722161 608.529217 531.192944 1021.742007 117.980154 925.212789 21.450937 512 434.663727 98.787211 21.450937Z"
- fill="#1296db"
- p-id="5069"
- />
- </svg>
- </div>
</div>
</li>
</ul>
-
- <span slot="footer" class="dialog-footer">
- <el-button @click="thinkingDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="thinkingDialog = false"
- >纭� 瀹�</el-button
+ <div class="bottom-btn" @click="showNext(thinkIndex)">
+ <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"
+ t="1710234570135"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ p-id="5067"
+ width="15"
+ height="15"
>
- </span>
+ <path
+ d="M2.257993 493.371555 415.470783 906.584344 512 1003.113561 608.529217 906.584344 1021.742007 493.371555 925.212789 396.842337 512 810.055127 98.787211 396.842337Z"
+ fill="#1296db"
+ p-id="5068"
+ />
+ <path
+ d="M2.257993 117.980154 415.470783 531.192944 512 627.722161 608.529217 531.192944 1021.742007 117.980154 925.212789 21.450937 512 434.663727 98.787211 21.450937Z"
+ fill="#1296db"
+ p-id="5069"
+ />
+ </svg>
+ </div>
</el-dialog>
<!-- 瑙ｉ姝ラ寮圭獥 -->
<el-dialog
@@ -640,42 +651,51 @@
>
<ul>
<li v-for="(item, index) in stepOne" :key="index">
- <div v-if="item.isShow">
+ <div v-if="item.isShow" style="display: flex">
+ <span class="step-num">
+ <span class="step-num-box">{{ index + 1 }}</span>
+ <img
+ src="../../assets/images/icon/blue-group.png"
+ alt=""
+ style="margin-right: 10px"
+ v-if="index < stepOne.length - 1"
+ />
+ <img
+ src="../../assets/images/icon/blue.png"
+ alt=""
+ v-if="index == stepOne.length - 1"
+ style="margin-right: 10px"
+ />
+ </span>
<p class="txt-p">{{ item.txt }}</p>
- <div style="text-align: center">
- <svg
- @click="showNextChange(index + 1)"
- v-if="index != thinkOne.length - 1"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- t="1710234570135"
- class="icon"
- viewBox="0 0 1024 1024"
- version="1.1"
- p-id="5067"
- width="15"
- height="15"
- >
- <path
- d="M2.257993 493.371555 415.470783 906.584344 512 1003.113561 608.529217 906.584344 1021.742007 493.371555 925.212789 396.842337 512 810.055127 98.787211 396.842337Z"
- fill="#1296db"
- p-id="5068"
- />
- <path
- d="M2.257993 117.980154 415.470783 531.192944 512 627.722161 608.529217 531.192944 1021.742007 117.980154 925.212789 21.450937 512 434.663727 98.787211 21.450937Z"
- fill="#1296db"
- p-id="5069"
- />
- </svg>
- </div>
</div>
</li>
</ul>
-
- <span slot="footer" class="dialog-footer">
- <el-button @click="stepDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="stepDialog = false">纭� 瀹�</el-button>
- </span>
+ <div class="bottom-btn" @click="showNextChange(stepIndex)">
+ <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"
+ t="1710234570135"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ p-id="5067"
+ width="15"
+ height="15"
+ >
+ <path
+ d="M2.257993 493.371555 415.470783 906.584344 512 1003.113561 608.529217 906.584344 1021.742007 493.371555 925.212789 396.842337 512 810.055127 98.787211 396.842337Z"
+ fill="#1296db"
+ p-id="5068"
+ />
+ <path
+ d="M2.257993 117.980154 415.470783 531.192944 512 627.722161 608.529217 531.192944 1021.742007 117.980154 925.212789 21.450937 512 434.663727 98.787211 21.450937Z"
+ fill="#1296db"
+ p-id="5069"
+ />
+ </svg>
+ </div>
</el-dialog>
</div>
</template>
@@ -715,11 +735,13 @@
stepDialog: false,
videoPath: "",
questionData: [],
+ stepIndex: 1,
+ thinkIndex:1,
chapterData: {
isCollectImg: false,
isCollectVideo: false,
txtOne: "",
- txtTwo:"",
+ txtTwo: "",
},
thinkOne: [
{
@@ -811,10 +833,16 @@
const number = this.thinkOne.findIndex((item, index) => index == num);
console.log(number);
this.thinkOne[number].isShow = true;
+ 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 ++
+ }
},
},
};
@@ -829,14 +857,28 @@
width: 100%;
min-height: 800px;
border: 1px solid #00a1e9;
- border-radius:10px
+ border-radius: 10px;
}
li {
list-style: none;
}
.txt-p {
margin-top: 0;
- border-bottom: 1px dashed #000;
padding: 10px 0;
}
+.bottom-btn {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+.step-num {
+ position: relative;
+ .step-num-box {
+ position: absolute;
+ top: 16px;
+ left: 13px;
+ color: #fff;
+ }
+}
</style>
diff --git a/src/books/mathBook/view/components/header.vue b/src/books/mathBook/view/components/header.vue
index 91d39fb..258b3be 100644
--- a/src/books/mathBook/view/components/header.vue
+++ b/src/books/mathBook/view/components/header.vue
@@ -1,12 +1,12 @@
<template>
<div class="chapter" num="1">
<!-- 灏侀潰 -->
- <div class="page-box cover mt-20" page="1" style="min-height: auto">
+ <div class="page-box cover mt-20" page="1" >
<div v-if="showPageList.indexOf(1) > -1">
<img src="../../assets/images/Cover.jpg" alt="" class="w100" />
</div>
</div>
- <div class="page-box" page="2" style="min-height: auto">
+ <div class="page-box" page="2">
<div v-if="showPageList.indexOf(2) > -1">
<img src="../../assets/images/Covers.png" alt="" class="w100" />
</div>
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 4ec8d90..ff6a449 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -91,7 +91,7 @@
v-cloak
></p>
</div>
- <img :src="value.isCollect ? isCollect : collect" alt="" class="collect-png" @click="handleCollect(nindex,index)" >
+ <img :src="value.isCollect ? isHeart : heart" alt="" class="collect-png" @click="handleCollect(nindex,index)" >
<!-- 鏀惰棌 -->
</div>
<div class="questionContent">
@@ -501,14 +501,13 @@
loading: false,
cardData: [],
loading: true,
- collect:require("@/assets/images/collect.png"),
- isCollect:require("@/assets/images/isCollect.png")
+ heart:require("@/assets/images/heart.png"),
+ isHeart:require("@/assets/images/heart-check.png"),
};
},
watch: {
cardList: {
handler(newVal) {
- console.log("11", newVal);
this.cardData = this.cardList;
if (newVal && newVal.length) {
this.loading = false;
@@ -695,8 +694,6 @@
<style lang="less" scoped>
.catalogName {
- // color: #00aeef;
- // color: #ff6c00;
text-indent: 1em !important;
font-size: 16px;
}
@@ -1213,7 +1210,7 @@
}
.collect-png {
cursor: pointer;
- width: 25px;
+ width: 18px;
object-fit: contain;
}
</style>
--
Gitblit v1.9.1