From 28ae9e323d8ce3eff8a02860d0527fb89e5ea530 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 19 十一月 2024 17:15:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index a7c17d7..90366c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,7 @@
<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>
</div>
</template>
@@ -26,7 +27,8 @@
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"),
},
data() {
return {
@@ -64,12 +66,14 @@
// artAndDrama
// mathBook
// civilAviation
+ // civilAviationServices
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
: "mathBook")
);
+
// this.activeBook = await this.config.getBookConfig(
// 'http://182.92.203.7:3007/books/resource/'+
// (process.env.VUE_APP_ENV == "product"
@@ -83,11 +87,9 @@
}
},
methods: {
-
but() {
console.log(this.activeBook, 'this.activeBook789');
}
-
}
};
@@ -98,7 +100,7 @@
body {
width: 100%;
height: 100%;
- margin: 0;
+ margin: 0 !important;
}
#app {
--
Gitblit v1.9.1