From 39da75fa54f4a0bfc6c135bcacdd5a4df4890210 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 17 十月 2024 16:22:13 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index c598bd8..5175ac6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,7 @@
<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>
</div>
</template>
@@ -24,7 +25,8 @@
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")
},
data() {
return {
@@ -34,12 +36,10 @@
async created() {
if (this.setGlobalState) {
this.setGlobalState({
-
initTestBook: async (bookId, tryPageCount) => {
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX + process.env.VUE_APP_BOOK_ID
);
-
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
if (tryPageCount) {
@@ -63,12 +63,11 @@
// 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
- : "sportsAndHealth")
+ : "mathBook")
);
// this.activeBook = await this.config.getBookConfig(
// 'http://182.92.203.7:3007/books/resource/'+
--
Gitblit v1.9.1