From 2fabb6c52d7a933c49dd896bb2b3ab25d77381b4 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:28:54 +0800
Subject: [PATCH] 图书详情bug
---
packageBookService/pages/bookServices/detail/index.wxml | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 2c8f67f..2fc8e5b 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -236,7 +236,6 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && learn.length}}">
-<<<<<<< Updated upstream
<learn-resource
bind:getFreeResource="getFreeResource"
bind:allAddShoppiingCar="allAddShoppiingCar"
@@ -245,6 +244,7 @@
bookId="{{bookDetail.id}}"
isshowDrawBtn="{{isshowDrawBtn}}"
></learn-resource>
+
<tree
id="tree"
openIds="{{openLearnids}}"
@@ -253,14 +253,9 @@
treeList="{{learn}}"
buyIds="{{buyIdList}}"
openLearnids="{{openLearnids}}"
+ bind:updateShoppingCartHidden="updateShoppingCartHidden"
+ bind:updateCloudLearning="updateCloudLearning"
></tree>
-=======
- <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
-
- <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
-
-
->>>>>>> Stashed changes
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
--
Gitblit v1.9.1