From 6aba48776b8a3c7112adc7627f1b4a71be6770fb Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 03 四月 2024 17:04:58 +0800
Subject: [PATCH] 1
---
packageBookService/pages/bookServices/detail/index.wxml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 882a230..2c8f67f 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -21,7 +21,7 @@
>
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
- <view class="book-detail">
+ <view class="book-detail" id="book-detail">
<view class="detail-left">
<view class="book-img">
<image
@@ -159,7 +159,7 @@
</view>
<view class="book-resource">
<t-tabs
- defaultValue="{{tabValue}}"
+ value="{{tabValue}}"
bind:change="onTabsChange"
t-class="custom-tabs"
t-class-content="custom-panel"
@@ -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