From 45c4fce3753275f5bb7d0cd593ae50197b7641b0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 30 四月 2025 16:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader
---
src/views/readerPages/webHome.vue | 7 ++++---
src/assets/base.css | 1 +
index.html | 3 +++
src/views/readerPages/mobileHome.vue | 15 +++++++--------
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/index.html b/index.html
index 465a048..d2e4204 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,9 @@
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline';"> -->
+ <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+ <meta http-equiv="Pragma" content="no-cache">
+ <meta http-equiv="Expires" content="0">
<title>鏁板瓧鏁欐潗闃呰鍣�</title>
</head>
diff --git a/src/assets/base.css b/src/assets/base.css
index 48c1d52..dbaae73 100644
--- a/src/assets/base.css
+++ b/src/assets/base.css
@@ -80,6 +80,7 @@
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ color:#333;
}
diff --git a/src/views/readerPages/mobileHome.vue b/src/views/readerPages/mobileHome.vue
index b872b00..afb5331 100644
--- a/src/views/readerPages/mobileHome.vue
+++ b/src/views/readerPages/mobileHome.vue
@@ -840,7 +840,6 @@
const getAllSearchReault = () => {
allSearchReault.value = []
- console.log(window.qiankunState.searchBookByKeyword)
if (window.qiankunState && window.qiankunState.searchBookByKeyword) {
let searchReault = window.qiankunState.searchBookByKeyword(searchText.value)
if (searchReault.length > 0) {
@@ -1019,14 +1018,14 @@
item.icon = ''
}
if (resourceType.value == 'default') {
- if (item.isTeacherResource == '鍚�') {
- defaultResourceList.value.push(item)
+ if (item.isDefaultResource == '鏄�') {
+ defaultResourceList.value.push(item)
+ }
+ } else {
+ if (item.isTeacherResource == '鏄�' && item.isDefaultResource == '鍚�') {
+ teacherResourceList.value.push(item)
+ }
}
- } else {
- if (item.isTeacherResource == '鏄�') {
- teacherResourceList.value.push(item)
- }
- }
})
if (defaultResourceList.value.length > 0) {
let imgCount = 0
diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue
index 2c9cb33..f6b981a 100644
--- a/src/views/readerPages/webHome.vue
+++ b/src/views/readerPages/webHome.vue
@@ -2011,11 +2011,11 @@
item.icon = ''
}
if (resourceType.value == 'default') {
- if (item.isTeacherResource == '鍚�') {
+ if (item.isDefaultResource == '鏄�') {
defaultResourceList.value.push(item)
}
} else {
- if (item.isTeacherResource == '鏄�') {
+ if (item.isTeacherResource == '鏄�' && item.isDefaultResource == '鍚�') {
teacherResourceList.value.push(item)
}
}
@@ -2260,7 +2260,7 @@
// } else if (data.resourcePath) {
// window.open(bookConfig.value.resourceUrl + '/' + data.resourcePath)
// }
- } else if (data.resourceType == 'PPT' || data.resourceType == 'PDF') {
+ } else if (data.resourceType == 'PPT' || data.resourceType == 'PDF' || data.resourceType == 'WORD') {
let md5 = data.md5
let dataList = []
MG.file
@@ -2827,6 +2827,7 @@
case '妫�绱�':
allSearchReault.value = []
if (window.qiankunState && window.qiankunState.searchBookByKeyword) {
+ console.log(window.qiankunState.searchBookByKeyword)
let searchReault = window.qiankunState.searchBookByKeyword(searchText.value)
if (searchReault.length > 0) {
listLoading.value = true
--
Gitblit v1.9.1