From eeb8cac06c60320b2b5cb8f57b668abe87d47b87 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 17:18:55 +0800
Subject: [PATCH] 艺术戏剧调整
---
src/books/artAndDrama/assets/main.less | 6 ------
src/App.vue | 2 +-
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 65f4077..77be6ac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "childHealth")
+ : "artAndDrama")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/books/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less
index 862de56..17fb90d 100644
--- a/src/books/artAndDrama/assets/main.less
+++ b/src/books/artAndDrama/assets/main.less
@@ -510,7 +510,6 @@
outline: none;
}
}
-<<<<<<< HEAD
.page-footer {
position: relative;
display: flex;
@@ -593,11 +592,6 @@
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media (max-width: 430px) {
-=======
-}
- /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
- @media (max-width: 430px) {
->>>>>>> ba76798a669c6d859d0f8b9a913e7637d3e8d7e2
.ans-drama {
.page-box {
min-height: 750px;
--
Gitblit v1.9.1