From cf6e9bcbfc64019bb14fb0964576ae3e3bd2fde5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 26 三月 2025 11:22:20 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index f869d85..7a167d1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +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>
@@ -79,6 +83,7 @@
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 {
@@ -129,12 +134,12 @@
// preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
// preschoolBasicKnowledge //瀛﹀墠鏁欒偛鍩虹鐭ヨ瘑
// policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
- console.log(1,process.env,process.env.VUE_APP_RESOURCE_CTX);
+ // practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
this.activeBook = await this.config.getBookConfig(
'http://182.92.203.7:3007/books/resource/' +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "OralAndBroadcasting")
+ : "practicalCareChildrenManual")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1