From a80e8f6ffe359841f017c103df859e78f6d44aba Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 11 六月 2024 19:08:25 +0800
Subject: [PATCH] 合并

---
 src/books/childHealth/view/content/index.vue |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index a3f04c0..1b0f7fa 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -21,61 +21,51 @@
         v-if="showCatalogList.indexOf(2) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterOne>
       <chapterTwo
         v-if="showCatalogList.indexOf(3) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterTwo>
       <chapterThree
         v-if="showCatalogList.indexOf(4) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterThree>
       <chapterFour
         v-if="showCatalogList.indexOf(5) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterFour>
       <chapterFive
         v-if="showCatalogList.indexOf(6) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterFive>
       <chapterSix
         v-if="showCatalogList.indexOf(7) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterSix>
       <chapterSeven
         v-if="showCatalogList.indexOf(8) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterSeven>
       <chapterEight
         v-if="showCatalogList.indexOf(9) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterEight>
       <chapterNine
         v-if="showCatalogList.indexOf(10) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterNine>
       <chapterTen
         v-if="showCatalogList.indexOf(11) > -1"
         :showPageList="loadPageList"
         :questionData="questionDataMap"
-        :isSearch="isSearch"
       ></chapterTen>
       <chapterEleven
         v-if="showCatalogList.indexOf(12) > -1"
@@ -133,7 +123,6 @@
       questionDataMap: {},
       renderSignMap: {},
       highlightData: null,
-      isSearch:false
     };
   },
   computed: {
@@ -258,9 +247,9 @@
     // const pageDom = (this.container ? this.container : document)
     //   .querySelector("#app")
     //   .querySelectorAll(".page-box");
-    // // 妫�绱�
+    // 妫�绱�
     // console.log(this.searchTextByPage("淇濇姢鍐呰剰鍣ㄥ畼"), "searchTextByPage");
-    // // 妫�绱㈣烦杞�
+    // 妫�绱㈣烦杞�
     // this.searchItemLocation({
     //   catalog: 2,
     //   page: 10,
@@ -588,7 +577,7 @@
           const catalog = catalogDom.getAttribute("num");
           let text = null;
           if (target.querySelector("p")) {
-            text = target.querySelector("p").textContent.substring(0, 20);
+            text = target.querySelector("p").textContent.substring(0, 50);
           }
           // 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
           if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
@@ -614,38 +603,32 @@
               target,
               "chapter"
             );
+            // 娣诲姞椤电爜
+            this.loadPageList.push(Number(page));
             const catalog = catalogDom.getAttribute("num");
             if (!this.questionDataMap[page]) {
-              const token = localStorage.getItem(this.config.tokenKey)
               if (testData && testData[catalog]) {
                 if (testData[catalog][page]) {
                   if (Array.isArray(testData[catalog][page])) {
-                    if(token) {
                       this.questionDataMap[page] = await getQuestionList(
                         page,
                         testData[catalog][page],
                         this.config.activeBook
                       );
-                    }
                   } else {
                     const obj = {};
                     for (let key in testData[catalog][page]) {
-                      if(token) {
                           obj[key] = await getQuestionList(
                           [],
                           testData[catalog][page][key],
                           this.config.activeBook
                         );
-                      }
                     }
                     this.questionDataMap[page] = obj;
                   }
-                  console.log("棰樼洰", this.questionDataMap);
                 }
               }
             }
-            // 娣诲姞椤电爜
-            this.loadPageList.push(Number(page));
             // 娓叉煋杩欎竴椤电殑鏍囪
             for (const key in this.renderSignMap) {
               if (this.renderSignMap[key][page]) {
@@ -818,6 +801,7 @@
           propsData: {
             showPageList: [],
             questionData: {},
+            isSearch: true
           },
         });
         pageExample.$mount(
@@ -849,6 +833,7 @@
               propsData: {
                 showPageList: [pageNum],
                 questionData: {},
+                isSearch: true
               },
             });
             pageExample.$mount(

--
Gitblit v1.9.1