From 59b7c7975f7ee38fc5a048a6b63cdaf9312908ee Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:51:26 +0800
Subject: [PATCH] diam
---
src/App.vue | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 81ff827..bc56caf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,11 +3,16 @@
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
- <english v-if="activeBook.name == 'english'"> </english>
+ <english v-if="activeBook.name == 'english'"></english>
<sportsAndHealth
v-if="activeBook.name == 'sportsAndHealth'"
></sportsAndHealth>
<artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
+
+ <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
+
+ <math v-if="activeBook.name == 'math'"></math>
+
</div>
</template>
@@ -18,7 +23,12 @@
import english from "./books/English/view/index.vue";
import sportsAndHealth from "./books/sportsAndHealth/view/index";
import artAndDance from './books/artAndDance/view/index.vue'
+<<<<<<< HEAD
+import artAndDrama from './books/artAndDrama/view/index.vue'
+=======
+import math from './books/math/view/index.vue'
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
export default {
name: "App",
components: {
@@ -27,7 +37,12 @@
embedded,
english,
sportsAndHealth,
- artAndDance
+ artAndDance,
+<<<<<<< HEAD
+ artAndDrama
+=======
+ math
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
},
data() {
return {
@@ -72,7 +87,13 @@
// embedded
// english
// artAndDance
- this.config.resourceCtx + "sportsAndHealth"
+<<<<<<< HEAD
+ // artAndDrama
+ this.config.resourceCtx + "artAndDrama"
+=======
+ // math
+ this.config.resourceCtx + "math"
+>>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
--
Gitblit v1.9.1