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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index f7e94b6..a5e51a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,11 +3,13 @@
<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>
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+ <mathBook v-if="activeBook.name == 'math'"></mathBook>
</div>
</template>
@@ -18,7 +20,8 @@
import english from "./books/English/view/index.vue";
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: {
@@ -27,7 +30,9 @@
embedded,
english,
sportsAndHealth,
- artAndDance
+ artAndDance,
+ mathBook,
+ artAndDrama
},
data() {
return {
@@ -72,7 +77,9 @@
// embedded
// english
// artAndDance
- this.config.resourceCtx + "childHealth"
+ // artAndDrama
+ // math
+ this.config.resourceCtx + "artAndDrama"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
--
Gitblit v1.9.1