From 62b664eba4027b412609c81fd3d418a66bf5bfc5 Mon Sep 17 00:00:00 2001
From: unknown <qq1940665526@163.com>
Date: 星期二, 28 五月 2024 13:58:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 58a94a1..96b2bda 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,38 +17,50 @@
name: "App",
components: {
childHealth,
- book,
+ lifeCare,
embedded,
- english
+ english,
},
data() {
return {
- activeBook: {}
+ activeBook: {},
};
},
async created() {
if (this.setGlobalState) {
this.setGlobalState({
initTestBook: async (bookId) => {
- this.activeBook = await this.config.getBookConfig(bookId);
+ // 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
+ );
console.log("鍥句功", this.activeBook);
if (
(this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig)
) {
this.$store.state.qiankun.getBookConfig({
- bookConfig: this.activeBook
+ bookConfig: this.activeBook,
});
}
- }
+ },
});
} else {
- this.activeBook = await this.config.getBookConfig();
+ this.activeBook = await this.config.getBookConfig(
+ // childHealth
+ this.config.resourceCtx + "lifeCare"
+ );
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
- }
+ },
};
</script>
@@ -89,5 +101,7 @@
.notesline {
padding-bottom: 2px;
border-bottom: 2px solid;
+ cursor: pointer;
}
+
</style>
--
Gitblit v1.9.1