From 8c794be279e13aa477af7ebbe4bc97570b7da816 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 03 四月 2024 16:32:15 +0800
Subject: [PATCH] 线上书展bug3
---
packageBookService/pages/bookServices/detail/index.wxml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 9e93aee..2c8f67f 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -236,6 +236,7 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && learn.length}}">
+<<<<<<< Updated upstream
<learn-resource
bind:getFreeResource="getFreeResource"
bind:allAddShoppiingCar="allAddShoppiingCar"
@@ -253,6 +254,13 @@
buyIds="{{buyIdList}}"
openLearnids="{{openLearnids}}"
></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