From a954bafb1bb4a70b2baf768230f2c50fd5c7163c Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 13 六月 2024 14:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index accd2dd..17da598 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,12 +3,13 @@
<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>
- <mathBook v-if="activeBook.name == 'math'"></mathBook>
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+ <mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
</div>
</template>
@@ -18,8 +19,9 @@
import embedded from "./books/embedded/view/index.vue";
import english from "./books/English/view/index.vue";
import sportsAndHealth from "./books/sportsAndHealth/view/index";
-import artAndDance from './books/artAndDance/view/index.vue'
-import mathBook from './books/math/view/index.vue'
+import artAndDance from "./books/artAndDance/view/index.vue";
+import mathBook from "./books/mathBook/view/index.vue";
+import artAndDrama from "./books/artAndDrama/view/index.vue";
export default {
name: "App",
components: {
@@ -29,7 +31,8 @@
english,
sportsAndHealth,
artAndDance,
- mathBook
+ mathBook,
+ artAndDrama
},
data() {
return {
@@ -40,20 +43,11 @@
if (this.setGlobalState) {
this.setGlobalState({
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/"
- ) {
- this.config.resourceCtx = this.config.resourceCtx + bookId;
- }
+ 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;
- this.activeBook = await this.config.getBookConfig(
- this.config.resourceCtx
- );
if (tryPageCount) {
this.activeBook.tryPageCount = tryPageCount;
}
@@ -67,15 +61,19 @@
}
});
} else {
+ // childHealth
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+ // artAndDrama
+ // mathBook
this.activeBook = await this.config.getBookConfig(
- // childHealth
- // lifeCare
- // sportsAndHealth
- // embedded
- // english
- // artAndDance
- // math
- this.config.resourceCtx + "math"
+ process.env.VUE_APP_RESOURCE_CTX +
+ (process.env.VUE_APP_ENV == "product"
+ ? process.env.VUE_APP_BOOK_ID
+ : "english")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
@@ -177,8 +175,7 @@
margin: auto;
}
-
-.openImgBox img{
+.openImgBox img {
cursor: zoom-in;
}
</style>
--
Gitblit v1.9.1