From 0ac4e192d2d2c28eb95e118eb381c04330b07953 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 20 十一月 2024 11:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 980e04b..2306550 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,8 @@
<mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
<botany v-if="activeBook.name == 'botany'"></botany>
<civilAviation v-if="activeBook.name == 'civilAviation'"></civilAviation>
+ <civilAviationServices v-if="activeBook.name == 'civilAviationServices'"></civilAviationServices>
+ <meetingPlanners v-if="activeBook.name == 'meetingPlanners'"></meetingPlanners>
</div>
</template>
@@ -26,7 +28,9 @@
mathBook: () => import("./books/mathBook/view/index.vue"),
artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
botany: () => import("./books/botany/view/index.vue"),
- civilAviation: () => import("./books/civilAviation/view/index.vue")
+ civilAviation: () => import("./books/civilAviation/view/index.vue"),
+ civilAviationServices: () =>import("./books/civilAviationServices/view/index.vue"),
+ meetingPlanners: () =>import("./books/meetingPlanners/view/index.vue")
},
data() {
return {
@@ -64,6 +68,8 @@
// artAndDrama
// mathBook
// civilAviation
+ // civilAviationServices
+ // meetingPlanners
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
@@ -97,7 +103,7 @@
body {
width: 100%;
height: 100%;
- margin: 0;
+ margin: 0 !important;
}
#app {
--
Gitblit v1.9.1