From a954bafb1bb4a70b2baf768230f2c50fd5c7163c Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 13 六月 2024 14:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 6949a2d..17da598 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 == 'mathBook'"></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/mathBook/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 {
@@ -56,6 +61,14 @@
}
});
} else {
+ // childHealth
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+ // artAndDrama
+ // mathBook
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
--
Gitblit v1.9.1