From c4d8fe2a4b9c5427d4bee1332384f0dd995db948 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 15 五月 2024 16:49:26 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/childHealth/view/content/index.vue |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index b47b0c3..2cd253b 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -3,7 +3,6 @@
     <div class="page-content">
       <pageHeader v-if="showCatalogList.indexOf(0) > -1"></pageHeader>
       <chapterOne v-if="showCatalogList.indexOf(1) > -1"></chapterOne>
-      <chapterOne v-if="showCatalogList.indexOf(1) > -1"></chapterOne>
       <chapterTwo v-if="showCatalogList.indexOf(2) > -1"></chapterTwo>
       <chapterThree v-if="showCatalogList.indexOf(3) > -1"></chapterThree>
       <chapterFour v-if="showCatalogList.indexOf(4) > -1"></chapterFour>
@@ -37,9 +36,7 @@
 import chapterEleven from "./components/chapter011.vue";
 import chapterTwelve from "./components/chapter012.vue";
 import chapterThirteen from "./components/chapter013.vue";
-
 import _ from "lodash";
-
 export default {
   data() {
     return {
@@ -48,18 +45,20 @@
       loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
       throttleThreshold: 100, // 鑺傛祦闃堝��
       previousScrollTop: 0,
-      throttledScrollHandler: null,
+      throttledScrollHandler: null
     };
   },
   watch: {
     showCatalogList: {
       handler(newVal) {
-        console.log("鏄剧ず绔犺妭", newVal);
-        this.$store.state.qiankun.windowSelection({
-          showCatalogList: newVal,
-        });
-      },
-    },
+        if (this.$store.state.qiankun && this.$store.state.qiankun.catalogChange) {
+          // 璋冪敤鐖跺眰鏂规硶
+          this.$store.state.qiankun.catalogChange({
+            showCatalogList: newVal
+          });
+        }
+      }
+    }
   },
   mounted() {
     // 榛樿鍔犺浇绔犺妭
@@ -72,12 +71,15 @@
     );
     // 鎻愪緵椤甸潰璺宠浆鍔熻兘
     if (this.setGlobalState) {
+      // 瀹氫箟瀛愬眰鏂规硶
       this.setGlobalState({
         gotoPage: (catalog, page) => {
+          console.log(catalog, page, "gotoPage锛歝atalog, page");
           this.gotoPage(catalog, page);
         }
       });
     }
+
     // 娴嬭瘯椤甸潰璺宠浆
     // setTimeout(() => {
     //   this.gotoPage(5, 100);
@@ -87,7 +89,6 @@
     scrollFun(e) {
       // 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
       if (event.target.scrollTop > this.previousScrollTop) {
-        console.log("鍚戜笅婊氬姩");
         const currentScrollTop =
           event.target.scrollTop + event.target.offsetHeight;
         if (
@@ -110,7 +111,6 @@
           }
         }
       } else if (event.target.scrollTop < this.previousScrollTop) {
-        console.log("鍚戜笂婊氬姩");
         const currentScrollTop = event.target.scrollTop;
         if (currentScrollTop <= this.loadThreshold) {
           // 鍒拌揪闃堝��
@@ -125,9 +125,17 @@
         }
       }
       // showCatalogList 褰撳墠鏄剧ず鐨勪笁涓珷鑺傦紝watch鐩戝惉浼犻�掔粰涓诲簲鐢�
-      console.log(this.showCatalogList);
       // 鏇存柊涓婁竴娆℃粴鍔ㄧ殑浣嶇疆
       this.previousScrollTop = event.target.scrollTop;
+
+      // 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
+      if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
+        this.$store.state.qiankun.pageChange({
+          page: 100,
+          catalog: 5,
+          catalogId: "",
+          catalogName: ""
+        });
     },
     gotoPage(catalog, page) {
       if (catalog >= 0 && catalog <= this.catalogLength) {
@@ -144,6 +152,8 @@
           this.showCatalogList = [catalog - 1, catalog, catalog + 1];
         }
         setTimeout(() => {
+          console.log(document);
+          console.log(document.querySelector(`[page="${page}"]`));
           // 璺宠浆椤电爜
           const pageDom = document.querySelector(`[page="${page}"]`);
           if (pageDom) {
@@ -151,7 +161,7 @@
           } else {
             console.log("椤电爜閿欒锛�");
           }
-        }, 50);
+        }, 100);
       } else {
         console.log("绔犺妭閿欒锛�");
       }
@@ -171,8 +181,8 @@
     chapterTen,
     chapterEleven,
     chapterTwelve,
-    chapterThirteen,
-  },
+    chapterThirteen
+  }
 };
 </script>
 

--
Gitblit v1.9.1