From d9a7a02277ade8d3c17c41c4495def9ef1b85d33 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期四, 13 二月 2025 18:11:34 +0800
Subject: [PATCH] app
---
src/App.vue | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d3f000a..4470145 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,19 +18,13 @@
<childcareInstitutionsManagement v-if="activeBook.name == 'childcareInstitutionsManagement'">
</childcareInstitutionsManagement>
<toddlerGameImplementation v-if="activeBook.name == 'toddlerGameImplementation'"></toddlerGameImplementation>
-<<<<<<< HEAD
- <preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
- <kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'"></kindergartenLanguageActivity>
- <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
-</div>
-=======
<preschoolGameGuidance v-if="activeBook.name == 'preschoolGameGuidance'"></preschoolGameGuidance>
<kindergartenLanguageActivity v-if="activeBook.name == 'kindergartenLanguageActivity'">
</kindergartenLanguageActivity>
<aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
</aurturingAndEducationAged0to3>
+ <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
</div>
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
</template>
<script>
// 瑙ｅ喅ERROR ResizeObserver loop completed with undelivered notifications.//闂鐨�
@@ -69,15 +63,6 @@
civilServices: () => import("./books/civilServices/view/index.vue"),
meetingPlanners: () => import("./books/meetingPlanners/view/index.vue"),
aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
-<<<<<<< HEAD
- aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
- aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
- childcareInstitutionsManagement: ()=> import("./books/childcareInstitutionsManagement/view/index.vue"),
- toddlerGameImplementation: ()=> import("./books/toddlerGameImplementation/view/index.vue"),
- preschoolGameGuidance: ()=> import("./books/preschoolGameGuidance/view/index.vue"),
- kindergartenLanguageActivity: ()=> import("./books/kindergartenLanguageActivity/view/index.vue"),
- preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
-=======
aviationSafety: () => import("./books/aviationSafety/view/index.vue"),
aviationEtiquette: () => import("./books/aviationEtiquette/view/index.vue"),
childcareInstitutionsManagement: () => import("./books/childcareInstitutionsManagement/view/index.vue"),
@@ -85,7 +70,7 @@
preschoolGameGuidance: () => import("./books/preschoolGameGuidance/view/index.vue"),
kindergartenLanguageActivity: () => import("./books/kindergartenLanguageActivity/view/index.vue"),
aurturingAndEducationAged0to3: () => import("./books/aurturingAndEducationAged0to3/view/index.vue"),
->>>>>>> 982b4567d39cbb1185cc1e62c56dce4302428735
+ preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
},
data() {
return {
@@ -131,10 +116,9 @@
// childcareInstitutionsManagement //鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
// toddlerGameImplementation //濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
// preschoolGameGuidance //瀛﹀墠娓告垙鎸囧 preschoolGameGuidance
- // kindergartenLanguageActivity
- //preschoolBasicKnowledge //瀛﹀墠鍩虹鏁欒偛鐭ヨ瘑
// kindergartenLanguageActivity
// aurturingAndEducationAged0to3 //0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
+ //preschoolBasicKnowledge //瀛﹀墠鍩虹鏁欒偛鐭ヨ瘑
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
--
Gitblit v1.9.1