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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4470145..7ca11fd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,7 +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>
@@ -70,6 +75,7 @@
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"),
preschoolBasicKnowledge: ()=> import("./books/preschoolBasicKnowledge/view/index.vue"),
},
data() {
@@ -116,14 +122,14 @@
// childcareInstitutionsManagement //鎵樿偛鏈烘瀯绠＄悊涓庡疄鍔�
// toddlerGameImplementation //濠村辜鍎挎父鎴忔椿鍔ㄥ疄鏂�
// preschoolGameGuidance //瀛﹀墠娓告垙鎸囧 preschoolGameGuidance
- // kindergartenLanguageActivity
+ // kindergartenLanguageActivity //骞煎効鍥瑷�鏁欒偛涓庢椿鍔ㄦ寚瀵�
// aurturingAndEducationAged0to3 //0~3宀佸┐骞煎効鎶氳偛涓庢暀鑲�
- //preschoolBasicKnowledge //瀛﹀墠鍩虹鏁欒偛鐭ヨ瘑
+ // preschoolEvaluation // 瀛﹀墠鏁欒偛璇勪环
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "aurturingAndEducationAged0to3")
+ : "preschoolEvaluation")
);
// this.activeBook = await this.config.getBookConfig(
--
Gitblit v1.9.1