From 0743d47eca07827e1ade3554db67b1f6fde4aae1 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 16 十月 2024 18:25:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 17da598..28a3f4f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,35 +4,27 @@
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
<english v-if="activeBook.name == 'english'"></english>
- <sportsAndHealth
- v-if="activeBook.name == 'sportsAndHealth'"
- ></sportsAndHealth>
+ <sportsAndHealth 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 == 'mathBook'"></mathBook>
+ <botany v-if="activeBook.name == 'botany'"></botany>
</div>
</template>
<script>
-import childHealth from "./books/childHealth/view/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/view/index";
-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: {
- childHealth,
- lifeCare,
- embedded,
- english,
- sportsAndHealth,
- artAndDance,
- mathBook,
- artAndDrama
+ childHealth: () => import("./books/childHealth/view/index.vue"),
+ lifeCare: () => import("./books/lifeCare/view/index.vue"),
+ embedded: () => import("./books/embedded/view/index.vue"),
+ english: () => import("./books/english/view/index.vue"),
+ 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"),
+ botany: () => import("./books/botany/view/index.vue")
},
data() {
return {
@@ -69,19 +61,34 @@
// 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
+ // : "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
- : "english")
+ '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;
this.config.goodsStore = this.activeBook.storeRefcode;
}
+ },
+ methods: {
+
+ but() {
+ console.log(this.activeBook, 'this.activeBook789');
+ }
+
}
};
+
</script>
<style lang="less">
@@ -91,16 +98,19 @@
height: 100%;
margin: 0;
}
+
#app {
width: 100%;
height: 100%;
}
+
.highLight {
border: 1px dashed rgba(255, 255, 255, 0);
border-radius: 5px;
padding: 3px 0;
cursor: pointer;
}
+
.highLight:hover {
border: 1px dashed #949494 !important;
}
@@ -114,6 +124,7 @@
text-underline-thickness: 2px;
cursor: pointer;
}
+
.underline:hover {
border: 1px dashed #949494 !important;
}
--
Gitblit v1.9.1