From d552843cc56cdb86d43c550f8c3a45863e0c8818 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 10:01:15 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index cc29709..2edaae6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,12 +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>
- <math v-if="activeBook.name == 'math'"></math>
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+ <mathBook v-if="activeBook.name == 'math'"></mathBook>
</div>
</template>
@@ -19,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 math from './books/math/view/index.vue'
+import mathBook from './books/math/view/index.vue'
+import artAndDrama from './books/artAndDrama/view/index.vue'
export default {
name: "App",
components: {
@@ -29,7 +31,8 @@
english,
sportsAndHealth,
artAndDance,
- math
+ mathBook,
+ artAndDrama
},
data() {
return {
@@ -74,6 +77,7 @@
// embedded
// english
// artAndDance
+ // artAndDrama
// math
this.config.resourceCtx + "math"
);
--
Gitblit v1.9.1