From 24ecdeb033eb6a447a8c05ef60f03a56d5ea0d47 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 10:12:01 +0800
Subject: [PATCH] drama
---
src/App.vue | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index bc56caf..2dc96e6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,12 +23,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 artAndDrama from './books/artAndDrama/view/index.vue'
-
-=======
import math from './books/math/view/index.vue'
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
export default {
name: "App",
components: {
@@ -38,11 +34,8 @@
english,
sportsAndHealth,
artAndDance,
-<<<<<<< HEAD
- artAndDrama
-=======
+ artAndDrama,
math
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
},
data() {
return {
@@ -87,13 +80,8 @@
// embedded
// english
// artAndDance
-<<<<<<< HEAD
// artAndDrama
this.config.resourceCtx + "artAndDrama"
-=======
- // math
- this.config.resourceCtx + "math"
->>>>>>> 5502440dd8d7c8f7d911904150d14bdfc2c35944
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
--
Gitblit v1.9.1