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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 206ea82..69690a8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,7 +29,12 @@
<policiesAndRegulations v-if="activeBook.name == 'policiesAndRegulations'"></policiesAndRegulations>
<OralAndBroadcasting v-if="activeBook.name == 'OralAndBroadcasting'" ></OralAndBroadcasting>
<practicalCareChildrenManual v-if="activeBook.name == 'practicalCareChildrenManual'"></practicalCareChildrenManual>
+<<<<<<< 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>
@@ -82,7 +87,12 @@
policiesAndRegulations: ()=> import("./books/policiesAndRegulations/view/index.vue"),
OralAndBroadcasting:()=> import("./books/OralAndBroadcasting/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 {
@@ -125,7 +135,7 @@
// aviationBasicSkills // 鍩烘湰鎶�鑳�
// aviationSafety // 瀹夊叏妫�鏌ュ疄鍔�
// aviationEtiquette // 绀间华鏈嶅姟
- // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
+ // childcareInstitutionsManagement // 鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
// toddlerGameImplementation // 濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
// preschoolGameGuidance // 瀛﹀墠娓告垙鎸囧
// kindergartenLanguageActivity // 骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
@@ -135,11 +145,13 @@
// policiesAndRegulations //鏀跨瓥娉曞緥涓庢硶瑙剕鏃呮父绀�
// practicalCareChildrenManual // 濠村辜鍎跨収鎶ゅ疄褰�
//childIllnessPreventionCare //濠村辜鍎垮父瑙佺柧鐥呴闃蹭笌鎶ょ悊
+ // artInitiationForAges0to3 // 0-3宀佸┐骞煎効鑹烘湳鍚挋
+ // toddlerSportsSafetyProtection // 濠村辜鍎胯繍鍔ㄥ畨鍏ㄤ笌淇濇姢
this.activeBook = await this.config.getBookConfig(
- 'https://jsek.bnuic.com/books/resource/' +
+ process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "childIllnessPreventionCare")
+ : "toddlerSportsSafetyProtection")
);
// this.activeBook = await this.config.getBookConfig(
// 'http://182.92.203.7:3007/books/resource/'+
--
Gitblit v1.9.1