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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 2567f12..5175ac6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,5 @@
<template>
<div id="app">
-
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
@@ -9,6 +8,8 @@
<artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
<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>
@@ -23,7 +24,9 @@
sportsAndHealth: () => import("./books/sportsAndHealth/view/index.vue"),
artAndDance: () => import("./books/artAndDance/view/index.vue"),
mathBook: () => import("./books/mathBook/view/index.vue"),
- artAndDrama: () => import("./books/artAndDrama/view/index.vue")
+ artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
+ botany: () => import("./books/botany/view/index.vue"),
+ civilAviation: () => import("./books/civilAviation/view/index.vue")
},
data() {
return {
@@ -33,13 +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) {
@@ -64,11 +64,17 @@
// artAndDrama
// mathBook
this.activeBook = await this.config.getBookConfig(
- process.env.VUE_APP_RESOURCE_CTX +
+ 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/'+
+ // (process.env.VUE_APP_ENV == "product"
+ // ? process.env.VUE_APP_BOOK_ID
+ // : "botany")
+ // );
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
this.config.activeBook = this.activeBook;
--
Gitblit v1.9.1