From cdfdcec9cc8a7644e70fb28d39a01d438cc74496 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 25 三月 2024 09:26:30 +0800
Subject: [PATCH] 详情，阅读器
---
packageBookService/pages/bookServices/detail/index.wxml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index b55720f..198773c 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -173,8 +173,8 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel label="鐢靛瓙涔�" value="1" style="{{tabPanelstyle}}">
- 鐢靛瓙涔�
+ <t-tab-panel label="鐢靛瓙涔�" value="jsek_eBook" style="{{tabPanelstyle}}">
+ <epub-view fileInfo="{{fileInfo}}" id="eBook" class="webView"></epub-view>
</t-tab-panel>
<t-tab-panel
label="鏁欏璧勬簮"
@@ -248,6 +248,7 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
+<<<<<<< Updated upstream
<t-tab-panel label="浜戠瑪璁�" value="jesk_note" style="{{tabPanelstyle}}">
<note
bookInfo="{{bookDetail}}"
@@ -255,6 +256,10 @@
class="note-list"
bind:changeLoaidng="changeLoaidng"
></note>
+=======
+ <t-tab-panel label="浜戠瑪璁�" value="jsek_note" style="{{tabPanelstyle}}">
+ <note bookInfo="{{bookDetail}}" id="note" class="note-list" bind:changeLoaidng="changeLoaidng"></note>
+>>>>>>> Stashed changes
</t-tab-panel>
</t-tabs>
</view>
@@ -274,6 +279,7 @@
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
+<<<<<<< Updated upstream
<view
class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jesk_note') ? 'disabledColor' : 'shopCarColor' }}"
bind:tap="addBookShopcCar"
@@ -284,6 +290,13 @@
bind:tap="buyBtn"
>绔嬪嵆璐拱</view
>
+=======
+ <view class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar" wx:if="{{tabValue != 'jsek_eBook'}}">鍔犲叆璐墿杞�</view>
+ <view class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn" wx:if="{{tabValue != 'jsek_eBook'}}">绔嬪嵆璐拱</view>
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">绔嬪嵆璐拱</view>
+ <view class="read buyColor" bind:tap="goRead" wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
+>>>>>>> Stashed changes
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
--
Gitblit v1.9.1