From d6a63cd469e3dc803fe30ee2d897706030fe33b2 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 28 五月 2024 17:49:10 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e27c01e..8abd459 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
<template>
<div id="app">
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
- <book v-if="activeBook.name == 'content'"></book>
+ <lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
<english v-if="activeBook.name == 'english'"></english>
</div>
@@ -9,7 +9,7 @@
<script>
import childHealth from "./books/childHealth/view/index.vue";
-import book from "./books/content/index.vue";
+import lifeCare from "./books/lifeCare/index.vue";
import embedded from "./books/embedded/view/index.vue";
import english from "./books/English/view/index.vue";
@@ -17,7 +17,7 @@
name: "App",
components: {
childHealth,
- book,
+ lifeCare,
embedded,
english
},
@@ -29,8 +29,22 @@
async created() {
if (this.setGlobalState) {
this.setGlobalState({
- initTestBook: async (bookId) => {
- this.activeBook = await this.config.getBookConfig(bookId);
+ initTestBook: async (bookId, tryPageCount) => {
+ // this.activeBook = await this.config.getBookConfig(this.config.resourceCtx + bookId);
+ if (
+ this.config.resourceCtx ==
+ "http://182.92.203.7:3007/books/resource/"
+ ) {
+ this.config.resourceCtx = this.config.resourceCtx + bookId;
+ }
+ 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;
+ }
console.log("鍥句功", this.activeBook);
if (
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
@@ -42,7 +56,15 @@
}
});
} else {
- this.activeBook = await this.config.getBookConfig();
+ this.activeBook = await this.config.getBookConfig(
+ // childHealth
+ this.config.resourceCtx + "childHealth"
+ );
+ // 娴嬭瘯璇曡30椤�
+ // this.activeBook.tryPageCount = 10;
+
+ this.config.activeBook = this.activeBook;
+ this.config.goodsStore = this.activeBook.storeRefcode;
}
}
};
@@ -85,5 +107,6 @@
.notesline {
padding-bottom: 2px;
border-bottom: 2px solid;
+ cursor: pointer;
}
</style>
--
Gitblit v1.9.1