From 4d2bc740be7ad015243180fd86c50657bd7b4648 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期四, 24 四月 2025 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index b4fae1d..69690a8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,11 +27,14 @@
</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
+<<<<<<< HEAD
+ <childIllnessPreventionCare v-if="activeBook.name == 'childIllnessPreventionCare'"></childIllnessPreventionCare>
+=======
+ <artInitiationForAges0to3 v-if="activeBook.name == 'artInitiationForAges0to3'"></artInitiationForAges0to3>
+ <toddlerSportsSafetyProtection v-if="activeBook.name == 'toddlerSportsSafetyProtection'"></toddlerSportsSafetyProtection>
+>>>>>>> 92b4aea88467686de1009e822ba9310fb8553634
</div>
</template>
<script>
@@ -83,7 +86,13 @@
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")
+ practicalCareChildrenManual: ()=> import("./books/practicalCareChildrenManual/view/index.vue"),
+<<<<<<< HEAD
+ childIllnessPreventionCare: ()=> import("./books/childIllnessPreventionCare/view/index.vue")
+=======
+ artInitiationForAges0to3: ()=> import("./books/artInitiationForAges0to3/view/index.vue"),
+ toddlerSportsSafetyProtection : ()=> import("./books/toddlerSportsSafetyProtection/view/index.vue"),
+>>>>>>> 92b4aea88467686de1009e822ba9310fb8553634
},
data() {
return {
@@ -135,13 +144,15 @@
// preschoolBasicKnowledge //瀛﹀墠鏁欒偛鍩虹鐭ヨ瘑
// policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
// practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
+ //childIllnessPreventionCare //濠村辜鍎垮父瑙佺柧鐥呴闃蹭笌鎶ょ悊
+ // artInitiationForAges0to3 // 0-3宀佸┐骞煎効鑹烘湳鍚挋
+ // toddlerSportsSafetyProtection // 濠村辜鍎胯繍鍔ㄥ畨鍏ㄤ笌淇濇姢
this.activeBook = await this.config.getBookConfig(
- 'http://182.92.203.7:3007/books/resource/' +
+ process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "meetingPlanners")
+ : "toddlerSportsSafetyProtection")
);
-
// this.activeBook = await this.config.getBookConfig(
// 'http://182.92.203.7:3007/books/resource/'+
// (process.env.VUE_APP_ENV == "product"
--
Gitblit v1.9.1