From d552843cc56cdb86d43c550f8c3a45863e0c8818 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 10:01:15 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 7b83102..2edaae6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,17 +8,20 @@
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
<artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+ <mathBook v-if="activeBook.name == 'math'"></mathBook>
</div>
</template>
<script>
import childHealth from "./books/childHealth/view/index.vue";
-import lifeCare from "./books/lifeCare/index.vue";
+import lifeCare from "./books/lifeCare/view/index.vue";
import embedded from "./books/embedded/view/index.vue";
import english from "./books/English/view/index.vue";
-import sportsAndHealth from "./books/sportsAndHealth";
+import sportsAndHealth from "./books/sportsAndHealth/view/index";
import artAndDance from './books/artAndDance/view/index.vue'
-
+import mathBook from './books/math/view/index.vue'
+import artAndDrama from './books/artAndDrama/view/index.vue'
export default {
name: "App",
components: {
@@ -27,7 +30,9 @@
embedded,
english,
sportsAndHealth,
- artAndDance
+ artAndDance,
+ mathBook,
+ artAndDrama
},
data() {
return {
@@ -40,6 +45,8 @@
initTestBook: async (bookId, tryPageCount) => {
// this.activeBook = await this.config.getBookConfig(this.config.resourceCtx + bookId);
if (
+ // "http://182.92.203.7:3007/books/resource/"
+ // "https://jsek.bnuic.com/books/resource/"
this.config.resourceCtx ==
"http://182.92.203.7:3007/books/resource/"
) {
@@ -70,7 +77,9 @@
// embedded
// english
// artAndDance
- this.config.resourceCtx + "childHealth"
+ // artAndDrama
+ // math
+ this.config.resourceCtx + "math"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
--
Gitblit v1.9.1