From 8bb0a518dd4d9450370582c4d4ac3ae1dba1466b Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期五, 25 四月 2025 15:28:18 +0800
Subject: [PATCH] 资源

---
 src/views/readerPages/webHome.vue    |    7 ++++---
 src/assets/base.css                  |    1 +
 src/views/readerPages/mobileHome.vue |   15 +++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

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