From 59b7c7975f7ee38fc5a048a6b63cdaf9312908ee Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:51:26 +0800
Subject: [PATCH] diam
---
src/App.vue | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ae6f4ce..bc56caf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,16 +7,28 @@
<sportsAndHealth
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
+ <artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
+
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+
+ <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'
+<<<<<<< HEAD
+import artAndDrama from './books/artAndDrama/view/index.vue'
+=======
+import math from './books/math/view/index.vue'
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
export default {
name: "App",
components: {
@@ -24,7 +36,13 @@
lifeCare,
embedded,
english,
- sportsAndHealth
+ sportsAndHealth,
+ artAndDance,
+<<<<<<< HEAD
+ artAndDrama
+=======
+ math
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
},
data() {
return {
@@ -37,6 +55,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 +70,6 @@
if (tryPageCount) {
this.activeBook.tryPageCount = tryPageCount;
}
- console.log("鍥句功", this.activeBook);
if (
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
) {
@@ -63,11 +82,21 @@
} else {
this.activeBook = await this.config.getBookConfig(
// childHealth
- this.config.resourceCtx + "childHealth"
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+<<<<<<< HEAD
+ // artAndDrama
+ this.config.resourceCtx + "artAndDrama"
+=======
+ // math
+ this.config.resourceCtx + "math"
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
-
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
@@ -89,7 +118,7 @@
.highLight {
border: 1px dashed rgba(255, 255, 255, 0);
border-radius: 5px;
- padding: 3px;
+ padding: 3px 0;
cursor: pointer;
}
.highLight:hover {
@@ -98,7 +127,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;
@@ -165,4 +194,9 @@
left: 0;
margin: auto;
}
+
+
+.openImgBox img{
+ cursor: zoom-in;
+}
</style>
--
Gitblit v1.9.1