From d89711152df6f372e6de0ff2292f62688b441b39 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 11 六月 2024 19:08:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index c2d403e..81ff827 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,19 +3,21 @@
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
- <english v-if="activeBook.name == 'english'"></english>
+ <english v-if="activeBook.name == 'english'"> </english>
<sportsAndHealth
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
+ <artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
</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'
export default {
name: "App",
@@ -24,7 +26,8 @@
lifeCare,
embedded,
english,
- sportsAndHealth
+ sportsAndHealth,
+ artAndDance
},
data() {
return {
@@ -37,6 +40,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/"
) {
@@ -66,11 +71,11 @@
// sportsAndHealth
// embedded
// english
- this.config.resourceCtx + "english"
+ // artAndDance
+ this.config.resourceCtx + "sportsAndHealth"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
-
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
--
Gitblit v1.9.1