From 870e0b3c8361cfa8af3facf67b08f1f5be66252a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 10:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 38ffa3a..a5e51a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,16 +7,21 @@
<sportsAndHealth
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
+ <artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+ <mathBook v-if="activeBook.name == 'math'"></mathBook>
</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 mathBook from './books/math/view/index.vue'
+import artAndDrama from './books/artAndDrama/view/index.vue'
export default {
name: "App",
components: {
@@ -24,7 +29,10 @@
lifeCare,
embedded,
english,
- sportsAndHealth
+ sportsAndHealth,
+ artAndDance,
+ mathBook,
+ artAndDrama
},
data() {
return {
@@ -37,6 +45,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,7 +60,6 @@
if (tryPageCount) {
this.activeBook.tryPageCount = tryPageCount;
}
- console.log("鍥句功", this.activeBook);
if (
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
) {
@@ -65,11 +74,15 @@
// childHealth
// lifeCare
// sportsAndHealth
- this.config.resourceCtx + "childHealth"
+ // embedded
+ // english
+ // artAndDance
+ // artAndDrama
+ // math
+ this.config.resourceCtx + "artAndDrama"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
-
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
@@ -91,7 +104,7 @@
.highLight {
border: 1px dashed rgba(255, 255, 255, 0);
border-radius: 5px;
- padding: 3px;
+ padding: 3px 0;
cursor: pointer;
}
.highLight:hover {
@@ -100,7 +113,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;
@@ -167,4 +180,9 @@
left: 0;
margin: auto;
}
+
+
+.openImgBox img{
+ cursor: zoom-in;
+}
</style>
--
Gitblit v1.9.1