From ccda9ec2fe70d8f51ef184eafc04b78d22dfbabd Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 26 六月 2024 15:02:28 +0800
Subject: [PATCH] 小程序,教材,课程

---
 packageBookService/pages/bookServices/detail/index.js |  472 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 377 insertions(+), 95 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 1b9d9cd..57f03e7 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -16,6 +16,7 @@
     options: {
       id: "",
       name: "",
+      storeInfo: '',
     },
     bookDetail: {},
     bookClass: [],
@@ -37,6 +38,8 @@
     openTeachids: [],
     openLearnids: [],
     openTestids: [],
+    isGoBuyResource: true,
+    learnPath: '',
     applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
     resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
     applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
@@ -149,7 +152,9 @@
         width: '100%'
       },
     ],
-    showIndex: ''
+    showIndex: '',
+    successOrderNumber: '',
+    applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵��
   },
 
   resetTree: function (e) {
@@ -175,8 +180,12 @@
       options: {
         id: options.id,
         name: options.name,
+        storeInfo: options.storeInfo,
       },
     });
+    wx.setNavigationBarTitle({
+      title: options.name,
+    })
     this.getBookInfo(options.id);
     this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
     const token = wx.getStorageSync(app.config.tokenKey);
@@ -341,6 +350,7 @@
       "mockData.count": 0,
     });
     const query = {
+      storeInfo: this.data.options.storeInfo,
       path: "*",
       queryType: "*",
       productId: id,
@@ -375,10 +385,10 @@
       },
     };
     app.MG.store.getProductDetail(query).then(async (res) => {
+      console.log(res.datas, 'res.datas');
       this.setData({
         bookDetail: res.datas,
         buyIdList: res.datas.purchasedSaleMethodIdList,
-
       });
       if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
         this.setData({
@@ -526,6 +536,7 @@
               "fileInfo.freePage": this.data.bookDetail.probationPage,
             });
           } else if (this.data.bookDetail.protectedEpub) {
+
             this.setData({
               "fileInfo.bookName": this.data.bookDetail.name,
               "fileInfo.fileType": "epub",
@@ -632,6 +643,8 @@
       this.setData({
         showIndex: '1'
       })
+    console.log(this.data.bookDetail.icon, '0111111');
+    console.log(this.data.bookDetail.name, '45688');
   },
   // 璺宠浆缃戝簵
   goShop(e) {
@@ -665,15 +678,23 @@
             "buyResourceData.refCode": checkData.refCode,
           });
         }
-        if (
-          (e.detail.value == "jsek_teachingResources" &&
-            !this.data.teach.length) ||
-          (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
-          (e.detail.value == "questionBank" && !this.data.test.length)
-        ) {
+        // if (
+        //   (e.detail.value == "jsek_teachingResources" &&
+        //     !this.data.teach.length) ||
+        //   (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
+        //   (e.detail.value == "questionBank" && !this.data.test.length)
+        // ) {
+        //   if (e.detail.value == "jsek_teachingResources") {
+        //     wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
+        //   }
+        //   this.getResourceData(checkData);
+        // }
+        if ((e.detail.value == "jsek_teachingResources" && !this.data.teach.length) || (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length)) {
           if (e.detail.value == "jsek_teachingResources") {
             wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
           }
+          this.getResourceDataList(checkData)
+        } else if (e.detail.value == "questionBank" && !this.data.test.length) {
           this.getResourceData(checkData);
         }
         if (e.detail.value == "questionBank" && token) this.getMockData();
@@ -712,7 +733,233 @@
       });
     });
   },
-  //  鑾峰彇鏁欏璧勬簮  浜戝涔�  浜戞祴璇�
+
+  // 鑾峰彇鎵�鏈夊瓙椤规暟閲�
+  getChildrenItem(data) {
+    let num = 0
+
+    function getNum(data) {
+      for (let index = 0; index < data.length; index++) {
+        const item = data[index];
+        if (item.sysType == 'CmsItem') {
+          num += 1
+        } else if (item.sysType == 'CmsFolder') {
+          if (item.children && item.children.length)
+            getNum(item.children)
+        }
+      }
+    }
+    getNum(data)
+    return num
+  },
+
+  // 缁欑洰褰曟坊鍔犲瓙椤规暟閲�
+  changeResourceChildren(list) {
+    const changeList = (list) => {
+      for (let index = 0; index < list.length; index++) {
+        const item = list[index];
+        if (item.sysType == 'CmsFolder' && item.children && item.children.length) {
+          item.childrenItem = this.getChildrenItem([item])
+          changeList(item.children)
+        } else if (item.sysType == 'CmsFolder' && item.children && !item.children.length) {
+          item.childrenItem = 0
+        } else if (item.sysType == 'CmsFolder' && !item.children) {
+          item.childrenItem = 0
+        }
+      }
+    }
+    changeList(list)
+    return list
+  },
+
+  // 鎵佸钩鍖栨暟鎹浆鎹ree
+  getTreeList(rootList, pathLength, newArr, path, addNum) {
+    for (const item of rootList) {
+      // 姝ゅ鍘熸湰 item.productLinkPath.length == pathLength 浣� productLinkPath 闀垮害涓埆涔﹀瓨鍦�4銆�5浣嶄氦閿�
+      if ((pathLength - item.productLinkPath.length >= 0 && pathLength - item.productLinkPath.length <= 3) && item.productLinkPath.includes(path)) {
+        if (item.sysType == 'CmsItem') {
+          if (item.selectType == 'webpage') {
+            item.disabled = true
+          } else {
+            if (item.isDownload != 1) {
+              item.disabled = true
+            }
+          }
+          if (item.file && item.fileMap && item.fileMap[item.file]) {
+            if (item.fileMap[item.file].protectType == 'Private') item.disabled = true
+          }
+        }
+        // newArr.push(item)
+        // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
+        newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+      }
+    }
+    //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+    for (const i of newArr) {
+      i.children = []
+      this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
+      if (i.children.length == 0) {
+        delete i.children
+      }
+    }
+    return newArr
+  },
+
+  // 鍘婚櫎鏍戠粨鏋勫浣欓」
+  ensureTreeConsistency(tree) {
+    for (let index = 0; index < tree.length; index++) {
+      const item = tree[index];
+      if (item.children && item.children.length) {
+        const isFloder = item.children.findIndex(citem => citem.sysType == 'CmsFolder')
+        const isItem = item.children.findIndex(citem => citem.sysType == 'CmsItem')
+        if (isFloder > -1 && isItem > -1) {
+          item.children = item.children.filter(ditem => ditem.sysType == 'CmsItem')
+        }
+        this.ensureTreeConsistency(item.children)
+      }
+    }
+    return tree
+  },
+
+  // 鎺掑簭鏁扮粍 鎸夌収productLinkPath
+  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;
+    }
+    // 鎻掑叆鏂板璞″埌鏁扮粍  
+    array.splice(insertIndex, 0, newObj);
+    // 娴嬭瘯6 姝e紡5
+    // 瀵规暟缁勮繘琛屾帓搴�  
+    array.sort((a, b) => {
+      if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
+        return -1;
+      }
+      if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
+        return 1;
+      }
+      // a must be equal to b  
+      return 0;
+    });
+
+    // 杩斿洖鏇存柊鍚庣殑鏁扮粍  
+    return array;
+  },
+  // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+  getResourceDataList(type) {
+    this.setData({
+      loading: true,
+      noResources: false,
+    });
+    let query = {
+      path: '*',
+      queryType: '*',
+      storeInfo: this.data.options.storeInfo,
+      productId: this.data.bookDetail.id,
+      cmsPath: type.productLinkPath,
+      cmsType: '*',
+      itemFields: {
+        SysType: 'CmsFolder',
+        // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+        selectType: [],
+        learnSelectType: [],
+        freeFile: [],
+        file: [],
+        protectedFile: [],
+        resourcesClassification: [],
+        isDownload: [],
+        jsek_resourceBrief: [],
+        jsek_link: [],
+        jsek_questionBank: []
+      },
+      pading: {
+        start: 0,
+        size: 999
+      },
+    }
+    app.MG.store.getProductDetail(query).then((res) => {
+      if (!res.datas.cmsDatas[0].datas.length) {
+        return this.setData({
+          noResources: true,
+          loading: false,
+        });
+      }
+      let list = []
+      // 娴嬭瘯 6浣�// 姝e紡 5浣�//  娴嬭瘯璋冪敤浼�20锛屽唴閮�7  姝e紡璋冪敤浼�17 鍐呴儴浼�6
+      //鏁欏璧勬簮 浜戝涔�
+      if (
+        type.refCode == "jsek_teachingResources" ||
+        type.refCode == "jsek_cloudLearning"
+      ) {
+        res.datas.cmsDatas[0].datas.forEach((item) => {
+          item.checked = false;
+          if (item.sysType == 'CmsItem') {
+            // 鏁欏璧勬簮 绫诲瀷鍚嶇О璧嬪��
+            this.data.resourceClassList.forEach((type) => {
+              if (type.value == item.resourcesClassification)
+                item.resourceClass = type.name;
+            });
+            if (this.data.tabValue == "jsek_teachingResources") {} else if (this.data.tabValue == "jsek_cloudLearning") {
+              item.isbuy = this.isShowNeedBuy(item);
+              item.isShopCar = this.isShoppingCart(item);
+            }
+          }
+        });
+        if (type.refCode == "jsek_cloudLearning") {
+          this.setData({
+            learnPath: type.productLinkPath
+          })
+          const dataList = res.datas.cmsDatas[0].datas
+          if (dataList.length) {
+            const tag = dataList.findIndex(item => item.saleMethod.length && item.saleMethod[0].Price > 0)
+            this.setData({
+              isGoBuyResource: tag > -1 ? true : false
+            })
+          } else {
+            this.setData({
+              isGoBuyResource: false
+            })
+          }
+        }
+        const addNum = query.cmsPath.length > 12 ? 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);
+        let result = [];
+        if (type.refCode == "jsek_teachingResources") {
+          this.findChildIds(list, result);
+          this.setData({
+            teach: list,
+            loading: false,
+            openTeachids: result,
+          });
+        } else if (type.refCode == "jsek_cloudLearning") {
+          let arr = this.handleTreeData(list).filter(
+            (item) => item.saleMethod[0]
+          );
+          let freeIds = arr.filter((item) => {
+            return item.saleMethod[0].Price == 0;
+          });
+          if (!freeIds.length)
+            this.setData({
+              isshowDrawBtn: false,
+            });
+          this.findChildIds(list, result);
+          this.setData({
+            learn: list,
+            loading: false,
+            openLearnids: result,
+          });
+        }
+      }
+    })
+  },
+  //  鑾峰彇 浜戞祴璇�
   getResourceData(type) {
     this.setData({
       loading: true,
@@ -721,8 +968,10 @@
     let query = {
       path: "*",
       queryType: "*",
+      storeInfo: this.data.options.storeInfo,
       productId: this.data.bookDetail.id,
       cmsPath: type.productLinkPath,
+      cmsType: '*',
       itemFields: {
         SysType: "CmsFolder",
         // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
@@ -751,58 +1000,24 @@
         }
         // 浜戞祴璇曪紝閫掑綊璇锋眰閲屽眰鏁版嵁
         if (type.refCode == "questionBank") {
-          const data = res.datas.cmsDatas[0].datas.filter(
-            (item) => item.refCode == "jsek_questionBank"
-          );
-          if (data.length) return this.getResourceData(data[0]);
-        }
-        //鏁欏璧勬簮 浜戝涔�
-        if (
-          type.refCode == "jsek_teachingResources" ||
-          type.refCode == "jsek_cloudLearning"
-        ) {
-          if (res.datas.cmsDatas[0].datas.length > 0) {
-            res.datas.cmsDatas[0].datas.forEach((item) => {
-              item.checked = false;
-            });
-            const list = await this.getAllResource(res.datas.cmsDatas[0].datas);
+          const data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0);
+          if (data.length > 0) {
+            let list = []
+            console.log(query.cmsPath, query.cmsPath.length)
+            // 娴嬭瘯 6浣�// 姝e紡 5浣�//  娴嬭瘯璋冪敤浼�20锛屽唴閮�7  姝e紡璋冪敤浼�17 鍐呴儴浼�6
+            const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+            const num = query.cmsPath.length + addNum
+            this.getTreeList(data, num, list, '\\', addNum)
+            list = this.ensureTreeConsistency(list)
             let result = [];
-            if (type.refCode == "jsek_teachingResources") {
-              this.findChildIds(list, result);
-              this.setData({
-                teach: list,
-                loading: false,
-                openTeachids: result,
-              });
-            } else if (type.refCode == "jsek_cloudLearning") {
-              let arr = this.handleTreeData(list).filter(
-                (item) => item.saleMethod[0]
-              );
-              let freeIds = arr.filter((item) => {
-                return item.saleMethod[0].Price == 0;
-              });
-              if (!freeIds.length)
-                this.setData({
-                  isshowDrawBtn: false,
-                });
-              this.findChildIds(list, result);
-              this.setData({
-                learn: list,
-                loading: false,
-                openLearnids: result,
-              });
-            }
-          } else {
-            // 鏃犳暟鎹�
+            this.findChildIds(list[0].children, result);
+            this.setData({
+              test: list[0].children,
+              loading: false,
+              openTeachids: result,
+            });
+            console.log(this.data.test, "test")
           }
-        } else if (type.refCode == "jsek_questionBank") {
-          // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
-          this.setData({
-            test: res.datas.cmsDatas[0].datas,
-            loading: false,
-          });
-        } else {
-          console.log("鍏朵粬");
         }
       })
       .catch((e) => {
@@ -827,6 +1042,7 @@
     let query = {
       path: "*",
       queryType: "*",
+      storeInfo: this.data.options.storeInfo,
       productId: this.data.bookDetail.id,
       cmsPath: path,
       itemFields: {
@@ -895,29 +1111,29 @@
   },
   // 鑾峰彇灞曞紑椤�
   findChildIds(data, result) {
-    let index = 0;
+    let index = 0
     for (let i = 0; i < data.length; i++) {
       if (index < 3) {
-        const item = data[i];
-        if (item.children && item.children.length > 0) {
-          result.push(item.id);
+        const item = data[i]
+        if (item.childrenFolderCount > 0) {
+          result.push(item.id)
           for (let j = 0; j < item.children.length; j++) {
             if (index < 3) {
-              const childrenItme = item.children[j];
-              if (item.children && item.children.length > 0) {
-                result.push(childrenItme.id);
-                index += 1;
+              const childrenItme = item.children[j]
+              if (item.childrenCount > 0) {
+                result.push(childrenItme.id)
+                index += 1
               }
             } else {
-              break;
+              break
             }
           }
-        } else if (item.children && item.children.length > 0) {
-          result.push(item.id);
-          index += 1;
+        } else if (item.childrenCount > 0) {
+          result.push(item.id)
+          index += 1
         }
       } else {
-        break;
+        break
       }
     }
   },
@@ -991,7 +1207,6 @@
       // 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
       const res = await app.MG.store.initOrder(query);
       // 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
-      console.log(res, 'res456');
       bookOrdersId = res.orderNumber;
       // 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
       if (bookOrdersId) {
@@ -1104,12 +1319,12 @@
   },
   // 鐢宠鏁欏璧勬簮
   applyResource() {
-    if (this.data.applyResourceState) {
-      return wx.showToast({
-        icon: "error",
-        title: "璇峰嬁閲嶅鐐瑰嚮",
-      });
-    }
+    // if (this.data.applyResourceState) {
+    //   return wx.showToast({
+    //     icon: "error",
+    //     title: "璇峰嬁閲嶅鐐瑰嚮",
+    //   });
+    // }
     this.setData({
       applyResourceState: true,
     });
@@ -1339,7 +1554,7 @@
       if (isSHow) {
         return false;
       } else {
-        return data.saleMethod[0].price > 0 ? true : false;
+        return data.saleMethod[0].Price > 0 ? true : false;
       }
       return !isSHow;
     } else {
@@ -1389,7 +1604,6 @@
   },
 
   updateShoppingCartHidden() {
-
     const isSHow = this.data.shoppingCartGetId.some(
       (item) => item == data.saleMethod[0].Id
     );
@@ -1402,10 +1616,7 @@
     const checkData = this.data.cmsDatas.find(
       (item) => item.refCode == "jsek_cloudLearning"
     );
-    this.getResourceData(checkData);
-
-
-
+    this.getResourceDataList(checkData);
   },
   // 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
   handleTreeData(array) {
@@ -1473,6 +1684,13 @@
             title: "棰嗗彇鎴愬姛",
           });
           this.getBookInfo(this.data.bookId);
+          this.getResourceDataList({
+            refCode: 'jsek_cloudLearning',
+            productLinkPath: this.data.learnPath
+          })
+          this.setData({
+            successOrderNumber: confirmOrderRes.orderNumber
+          })
         }
       } catch (error) {
         console.log(error);
@@ -1755,6 +1973,10 @@
     }
 
     wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+    this.setData({
+      learn: [],
+      teach: []
+    })
     this.onLoad({
       id: e.detail.id,
       name: e.detail.name,
@@ -1794,6 +2016,7 @@
         this.data.bookBuy +
         "&bookId=" +
         this.data.bookDetail.id,
+
     });
   },
 
@@ -1858,6 +2081,20 @@
             list.push(item);
           }
         });
+        const smBook = list.find(item => item.content[0].id == this.data.bookDetail.id)
+        console.log('宸茬敵璇�', smBook);
+        if (smBook && smBook.state == 'Normal') {
+          const flag = new Date(smBook.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+          if (flag) {
+            this.setData({
+              applicationState: 'Normal'
+            })
+          } else {
+            this.setData({
+              applicationState: 'overdue'
+            })
+          }
+        }
         this.setData({
           alreadyElectronicBookList: list,
         });
@@ -1894,6 +2131,23 @@
 
   //鐢宠鐢靛瓙鏍蜂功
   appplyElectronicBook() {
+    // 鍏堝垽鏂笅鏁欏笀璁よ瘉锛屾湭瀵瑰師鏈夐�昏緫淇敼
+    let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+    if (role && role == "Teacher") {} else {
+      return wx.showModal({
+        title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+        content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+        confirmColor: "#ff6c00",
+        cancelColor: "#949494",
+        success: function (res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: "/packageDomain/pages/teacherCertification/index",
+            });
+          } else if (res.cancel) {}
+        },
+      });
+    }
     if (
       this.data.bookDetail.isApplyBook == 2 ||
       this.data.bookDetail.isApplyBook == 4
@@ -1929,15 +2183,27 @@
           return false;
         }
         let isApply = this.data.alreadyElectronicBookList.find(
-          (eitem) => eitem.id == this.data.bookDetail.id
+          (eitem) => eitem.content[0].id == this.data.bookDetail.id
         );
         if (isApply) {
-          wx.showToast({
-            title: "璇ヤ功宸茬敵璇凤紒",
-            icon: "none",
-            duration: 1000,
-          });
-          return false;
+          if (isApply.state == 'WaitAudit') {
+            wx.showToast({
+              title: "璇ヤ功宸茬敵璇凤紒",
+              icon: "none",
+              duration: 1000,
+            });
+            return false;
+          } else if (isApply.state == 'Normal') {
+            const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+            if (flag) {
+              wx.showToast({
+                title: "璇ヤ功宸茬敵璇凤紒",
+                icon: "none",
+                duration: 1000,
+              });
+              return false;
+            }
+          }
         }
         if (this.data.electronicBookList.length >= 2) {
           wx.showToast({
@@ -1973,6 +2239,22 @@
   },
   //鐢宠绾歌川鏍蜂功
   appplyPaperBook() {
+    let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+    if (role && role == "Teacher") {} else {
+      return wx.showModal({
+        title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+        content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+        confirmColor: "#ff6c00",
+        cancelColor: "#949494",
+        success: function (res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: "/packageDomain/pages/teacherCertification/index",
+            });
+          } else if (res.cancel) {}
+        },
+      });
+    }
     if (
       this.data.bookDetail.isApplyBook == 3 ||
       this.data.bookDetail.isApplyBook == 4
@@ -1989,7 +2271,7 @@
           return false;
         }
         let isApply = this.data.alreadyPaperBookList.find(
-          (pitem) => pitem.id == this.data.bookDetail.id
+          (pitem) => pitem.content[0].id == this.data.bookDetail.id
         );
         if (isApply) {
           wx.showToast({
@@ -2065,13 +2347,13 @@
       this.setData({
         electronicBookList: eList,
       });
-      wx.setStorageSync("electronicBookList", eList);
+      wx.setStorageSync("electronicBookList", JSON.stringify(eList));
     } else {
       pList.push(itemAttr);
       this.setData({
         paperBookList: pList,
       });
-      wx.setStorageSync("paperBookList", pList);
+      wx.setStorageSync("paperBookList", JSON.stringify(pList));
     }
     this.setData({
       num: this.data.num + 1,

--
Gitblit v1.9.1