From 870e0b3c8361cfa8af3facf67b08f1f5be66252a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 10:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/App.vue | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index bc56caf..a5e51a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,11 +8,8 @@
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>
-
+ <mathBook v-if="activeBook.name == 'math'"></mathBook>
</div>
</template>
@@ -23,12 +20,8 @@
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 mathBook from './books/math/view/index.vue'
import artAndDrama from './books/artAndDrama/view/index.vue'
-
-=======
-import math from './books/math/view/index.vue'
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
export default {
name: "App",
components: {
@@ -38,11 +31,8 @@
english,
sportsAndHealth,
artAndDance,
-<<<<<<< HEAD
+ mathBook,
artAndDrama
-=======
- math
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
},
data() {
return {
@@ -87,13 +77,9 @@
// embedded
// english
// artAndDance
-<<<<<<< HEAD
// artAndDrama
- this.config.resourceCtx + "artAndDrama"
-=======
// math
- this.config.resourceCtx + "math"
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
+ this.config.resourceCtx + "artAndDrama"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
--
Gitblit v1.9.1