From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

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

diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index d50c15f..917c602 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -293,7 +293,7 @@
     this.setData({
       num: Number(this.data.paperBookList.length) + Number(this.data.electronicBookList.length),
     });
-    if (this.data.bookDetail) {
+    if (this.data.bookDetail.id) {
       this.getBookInfo(this.data.bookDetail.id)
     }
   },
@@ -394,6 +394,7 @@
   },
   // 鑾峰彇鍥句功璇︽儏
   getBookInfo(id) {
+    console.log(id, "id")
     this.setData({
       "mockData'.id": 0,
       "mockData.price": 0,
@@ -1166,9 +1167,8 @@
               });
             }
           } else {
-
             if (isTSFW.length > 0) {
-              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && (item.childrenFolderCount > 0 || item.childrenCount > 0) && (item.name !== '濉┖棰�' &&
+              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.refCode != 'jsek_interaction' && (item.childrenFolderCount > 0 || item.childrenCount > 0) && (item.name !== '濉┖棰�' &&
                 item.name !== '鍒ゆ柇棰�' &&
                 item.name !== '澶氶�夐' &&
                 item.name !== '绠�绛旈') && item.name !== '鍗曢�夐')
@@ -1993,7 +1993,7 @@
       requests: [{
         saleMethodId: this.data.bankSaleData.Id,
         storeEventId: null,
-        agentCode: "鐢靛瓙涔�",
+        agentCode: "浜戞祴璇�",
       }, ],
     };
     app.MG.store.addShoppingCart(query).then(res => {

--
Gitblit v1.9.1