From 9d5789148e866f95f86d975011a9ef39d534c807 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 17 七月 2024 17:37:19 +0800
Subject: [PATCH] 拼树结构优化

---
 packageBookService/pages/bookServices/detail/index.js |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 990357d..d0fa544 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -190,7 +190,7 @@
     // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
     const token = wx.getStorageSync(app.config.tokenKey);
     if (token) {
-
+      this.getShoppingCartProductGet();
       this.getApplyInfo(options.id);
       this.getAlreadyPBookList();
       this.getAlreadyEBookList();
@@ -573,9 +573,6 @@
           });
         }
       }
-      if (!this.data.buy && this.data.bookDetail.isSell == '1') {
-        this.getShoppingCartProductGet();
-      }
     });
   },
   // 鑾峰彇鍥句功鍒嗙被
@@ -808,12 +805,16 @@
         // newArr.push(item)
         // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
         newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+        // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
+        rootList = rootList.filter(nitem => nitem.id != item.id)
       }
     }
     //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+    // let addnum1 = pathLength - path.length == 6 ? 6 : 7
     for (const i of newArr) {
       i.children = []
-      this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
+      let addnum1 = i.productLinkPath.length - path.length == 6 ? 6 : 7
+      this.getTreeList(rootList, pathLength + addnum1, i.children, i.productLinkPath, addnum1)
       if (i.children.length == 0) {
         delete i.children
       }
@@ -841,7 +842,6 @@
   insertAndSortObjectsByProductLinkPath(array, newObj, addNum) {
     // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆  
     let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.length - addNum, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.length - addNum, obj.productLinkPath.length)));
-
     // 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬  
     if (insertIndex === -1) {
       insertIndex = array.length;
@@ -896,14 +896,13 @@
         size: 999
       },
     }
-    app.MG.store.getProductDetail(query).then((res) => {
+    app.MG.store.getProductDetailNoChildren(query).then((res) => {
       if (!res.datas.cmsDatas[0].datas.length) {
         return this.setData({
           noResources: true,
           loading: false,
         });
       }
-      console.log(res.datas.cmsDatas[0].datas, "璧勬簮")
       let list = []
       // 娴嬭瘯 6浣�// 姝e紡 5浣�//  娴嬭瘯璋冪敤浼�20锛屽唴閮�7  姝e紡璋冪敤浼�17 鍐呴儴浼�6
       //鏁欏璧勬簮 浜戝涔�
@@ -941,19 +940,19 @@
             })
           }
         }
-        const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+        const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6
         const num = query.cmsPath.length + addNum
         this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\', addNum)
         list = this.ensureTreeConsistency(list)
         list = this.changeResourceChildren(list)
-        console.log('淇敼鍚庝簯', list);
+        console.log('淇敼鍚�', list);
         let result = [];
         if (type.refCode == "jsek_teachingResources") {
           this.findChildIds(list, result);
           this.setData({
-            teach: list,
-            loading: false,
             openTeachids: result,
+            loading: false,
+            teach: list,
           });
         } else if (type.refCode == "jsek_cloudLearning") {
           let arr = this.handleTreeData(list).filter(
@@ -1032,7 +1031,8 @@
             if (data.length > 0) {
               let list = []
               // 娴嬭瘯 6浣�// 姝e紡 5浣�//  娴嬭瘯璋冪敤浼�20锛屽唴閮�7  姝e紡璋冪敤浼�17 鍐呴儴浼�6
-              const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 13 ? 8 : 6
+
+              const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6
               const num = query.cmsPath.length + addNum
               this.getTreeList(data, num, list, '\\', addNum)
               list = this.ensureTreeConsistency(list)
@@ -1147,7 +1147,7 @@
       for (let i = 0; i < data.length; i++) {
         if (index < 3) {
           const item = data[i]
-          if (item.childrenFolderCount > 0) {
+          if (item.children && item.children.length > 0) {
             result.push(item.id)
             if (item.children) {
               for (let j = 0; j < item.children.length; j++) {

--
Gitblit v1.9.1