From ffb938e7a65c0dab30dd8ed00a13c68dcf7bd77c Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 25 十月 2024 16:48:36 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e956ce5..11c82c0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,8 @@
<artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
<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>
@@ -24,7 +26,9 @@
artAndDance: () => import("./books/artAndDance/view/index.vue"),
mathBook: () => import("./books/mathBook/view/index.vue"),
artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
- botany: () => import("./books/botany/view/index.vue")
+ botany: () => import("./books/botany/view/index.vue"),
+ civilAviation: () => import("./books/civilAviation/view/index.vue"),
+ civilAviationServices: () =>import("./books/civilAviationServices/view/index.vue"),
},
data() {
return {
@@ -61,19 +65,21 @@
// artAndDance
// artAndDrama
// mathBook
-
- // this.activeBook = await this.config.getBookConfig(
- // process.env.VUE_APP_RESOURCE_CTX +
- // (process.env.VUE_APP_ENV == "product"
- // ? process.env.VUE_APP_BOOK_ID
- // : "artAndDrama")
- // );
+ // civilAviation
+ // civilAviationServices
this.activeBook = await this.config.getBookConfig(
- 'http://182.92.203.7:3007/books/resource/'+
+ process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "botany")
+ : "civilAviationServices")
);
+
+ // this.activeBook = await this.config.getBookConfig(
+ // 'http://182.92.203.7:3007/books/resource/'+
+ // (process.env.VUE_APP_ENV == "product"
+ // ? process.env.VUE_APP_BOOK_ID
+ // : "botany")
+ // );
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
this.config.activeBook = this.activeBook;
@@ -81,11 +87,9 @@
}
},
methods: {
-
but() {
console.log(this.activeBook, 'this.activeBook789');
}
-
}
};
--
Gitblit v1.9.1