From 9d126c9e3a111a7ad0568a859f2cad56565543a9 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期三, 02 四月 2025 14:48:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 7e69a13..7a167d1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,11 @@
</preschoolEvaluation>
<preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
<policiesAndRegulations v-if="activeBook.name == 'policiesAndRegulations'"></policiesAndRegulations>
+<<<<<<< HEAD
+ <OralAndBroadcasting v-if="activeBook.name == 'OralAndBroadcasting'" ></OralAndBroadcasting>
+=======
+ <practicalCareChildrenManual v-if="activeBook.name == 'practicalCareChildrenManual'"></practicalCareChildrenManual>
+>>>>>>> aaa13b34449445bdf7aa03d4a8fb3944b5250d6b
</div>
</template>
<script>
@@ -77,6 +82,8 @@
preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue"),
preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
policiesAndRegulations: ()=> import("./books/policiesAndRegulations/view/index.vue"),
+ OralAndBroadcasting:()=> import("./books/OralAndBroadcasting/view/index.vue"),
+ practicalCareChildrenManual: ()=> import("./books/practicalCareChildrenManual/view/index.vue")
},
data() {
return {
@@ -127,11 +134,12 @@
// preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
// preschoolBasicKnowledge //瀛﹀墠鏁欒偛鍩虹鐭ヨ瘑
// policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
+ // practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
this.activeBook = await this.config.getBookConfig(
- process.env.VUE_APP_RESOURCE_CTX +
+ 'http://182.92.203.7:3007/books/resource/' +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "policiesAndRegulations")
+ : "practicalCareChildrenManual")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1