From 62a6b29d24207428219882556c77ffb5941b7943 Mon Sep 17 00:00:00 2001
From: unknown <qq1940665526@163.com>
Date: 星期三, 12 六月 2024 11:07:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 97f0197..cc29709 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,20 +3,23 @@
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
- <english v-if="activeBook.name == 'english'"></english>
+ <english v-if="activeBook.name == 'english'"> </english>
<sportsAndHealth
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
+ <artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
+ <math v-if="activeBook.name == 'math'"></math>
</div>
</template>
<script>
import childHealth from "./books/childHealth/view/index.vue";
-import lifeCare from "./books/lifeCare/index.vue";
+import lifeCare from "./books/lifeCare/view/index.vue";
import embedded from "./books/embedded/view/index.vue";
import english from "./books/English/view/index.vue";
-import sportsAndHealth from "./books/sportsAndHealth";
-
+import sportsAndHealth from "./books/sportsAndHealth/view/index";
+import artAndDance from './books/artAndDance/view/index.vue'
+import math from './books/math/view/index.vue'
export default {
name: "App",
components: {
@@ -25,10 +28,12 @@
embedded,
english,
sportsAndHealth,
+ artAndDance,
+ math
},
data() {
return {
- activeBook: {},
+ activeBook: {}
};
},
async created() {
@@ -37,6 +42,8 @@
initTestBook: async (bookId, tryPageCount) => {
// this.activeBook = await this.config.getBookConfig(this.config.resourceCtx + bookId);
if (
+ // "http://182.92.203.7:3007/books/resource/"
+ // "https://jsek.bnuic.com/books/resource/"
this.config.resourceCtx ==
"http://182.92.203.7:3007/books/resource/"
) {
@@ -50,28 +57,32 @@
if (tryPageCount) {
this.activeBook.tryPageCount = tryPageCount;
}
- console.log("鍥句功", this.activeBook);
if (
(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(
// childHealth
- this.config.resourceCtx + "childHealth"
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+ // math
+ this.config.resourceCtx + "math"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
-
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
- },
+ }
};
</script>
@@ -89,7 +100,7 @@
.highLight {
border: 1px dashed rgba(255, 255, 255, 0);
border-radius: 5px;
- padding: 3px;
+ padding: 3px 0;
cursor: pointer;
}
.highLight:hover {
@@ -98,7 +109,7 @@
.underline {
border: 1px dashed rgba(255, 255, 255, 0);
- padding: 5px;
+ padding: 5px 0;
border-radius: 5px;
text-decoration: underline;
text-decoration-style: wavy;
@@ -116,16 +127,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;
@@ -137,4 +176,9 @@
left: 0;
margin: auto;
}
+
+
+.openImgBox img{
+ cursor: zoom-in;
+}
</style>
--
Gitblit v1.9.1