From 6608a6839d771d38640988e3ee496ecdd91765a4 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 09 四月 2024 15:12:59 +0800
Subject: [PATCH] 代码合并

---
 packageBookService/pages/bookServices/detail/components/tree/index.js |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 8010c50..d946ea5 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -55,10 +55,7 @@
     shoppingCart: true,
     stop: false,
   },
-  ready() {
-    this.setData({});
-    console.log("鍑嗗");
-  },
+  ready() {},
 
   onLoad() {
     this.setData({
@@ -73,7 +70,6 @@
     treeList: function (newValue) {
       const list = [];
       let checked = "";
-      console.log("鏂板��", this.properties.treeList);
       this.properties.treeList.forEach((item) => {
         if (item.children && item.children.length > 0) {
           list.push(...this.flattenTree([item]));
@@ -168,7 +164,10 @@
         ) {
           return wx.showToast({
             icon: "error",
-            title: "璇峰厛璐拱璇ヨ祫婧�",
+            title:
+              item.saleMethod[0].Price > 0
+                ? "璇峰厛璐拱璇ヨ祫婧�"
+                : "璇峰厛鐐瑰嚮棰嗗彇鏌ョ湅鎸夐挳",
           });
         }
         wx.navigateTo({
@@ -216,6 +215,7 @@
     // 鎷垮埌鎵�鏈夐」
     getAllChildren(id) {
       let result = [];
+
       function findChildren(item) {
         if (item.id === id) {
           if (item.children && item.children.length > 0) {
@@ -425,6 +425,8 @@
       });
       if (shoppingCartGetId.includes(saleMethodId)) {
         console.log(111);
+        // this.data.updateShoppingCartHidden();
+        // this.data.updateCloudLearning();
 
         wx.showToast({
           icon: "error",
@@ -451,6 +453,11 @@
         });
       }
     },
+    sadd() {
+      this.triggerEvent("updateShoppingCartHidden");
+      this.triggerEvent("updateCloudLearning");
+      console.log(789);
+    },
   },
 
   catchtap() {},

--
Gitblit v1.9.1