From 1e5f5724f9f2c1c34efec7edb3f33bcfb98d66ba Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 23 七月 2024 14:21:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 99 +++++++++++++++++++++----------------------------
1 files changed, 42 insertions(+), 57 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index bc56caf..28bc26f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,48 +1,29 @@
<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>
<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>
-
- <math v-if="activeBook.name == 'math'"></math>
-
+ <mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
</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'
-<<<<<<< HEAD
-import artAndDrama from './books/artAndDrama/view/index.vue'
-
-=======
-import math from './books/math/view/index.vue'
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
export default {
name: "App",
components: {
- childHealth,
- lifeCare,
- embedded,
- english,
- sportsAndHealth,
- artAndDance,
-<<<<<<< HEAD
- artAndDrama
-=======
- math
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
+ 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")
},
data() {
return {
@@ -52,21 +33,15 @@
async created() {
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;
}
@@ -80,28 +55,35 @@
}
});
} else {
+ // childHealth
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+ // artAndDrama
+ // mathBook
this.activeBook = await this.config.getBookConfig(
- // childHealth
- // lifeCare
- // sportsAndHealth
- // embedded
- // english
- // artAndDance
-<<<<<<< HEAD
- // artAndDrama
- this.config.resourceCtx + "artAndDrama"
-=======
- // math
- this.config.resourceCtx + "math"
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
+ process.env.VUE_APP_RESOURCE_CTX +
+ (process.env.VUE_APP_ENV == "product"
+ ? process.env.VUE_APP_BOOK_ID
+ : "sportsAndHealth")
);
// 娴嬭瘯璇曡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">
@@ -111,16 +93,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;
}
@@ -134,6 +119,7 @@
text-underline-thickness: 2px;
cursor: pointer;
}
+
.underline:hover {
border: 1px dashed #949494 !important;
}
@@ -195,8 +181,7 @@
margin: auto;
}
-
-.openImgBox img{
+.openImgBox img {
cursor: zoom-in;
}
</style>
--
Gitblit v1.9.1