From a64ed910c7ed920b216d9420c67c12bcd3f02c6f Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 14 二月 2025 18:10:34 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 71fab48..7ca11fd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,8 +23,12 @@
</kindergartenLanguageActivity>
<aurturingAndEducationAged0to3 v-if="activeBook.name == 'aurturingAndEducationAged0to3'">
</aurturingAndEducationAged0to3>
+<<<<<<< HEAD
<preschoolEvaluation v-if="activeBook.name == 'preschoolEvaluation'">
</preschoolEvaluation>
+=======
+ <preschoolBasicKnowledge v-if="activeBook.name == 'preschoolBasicKnowledge'"></preschoolBasicKnowledge>
+>>>>>>> d9a7a02277ade8d3c17c41c4495def9ef1b85d33
</div>
</template>
<script>
@@ -71,7 +75,8 @@
preschoolGameGuidance: () => import("./books/preschoolGameGuidance/view/index.vue"),
kindergartenLanguageActivity: () => import("./books/kindergartenLanguageActivity/view/index.vue"),
aurturingAndEducationAged0to3: () => import("./books/aurturingAndEducationAged0to3/view/index.vue"),
- preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue")
+ preschoolEvaluation: () => import("./books/preschoolEvaluation/view/index.vue"),
+ preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
},
data() {
return {
--
Gitblit v1.9.1