From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
pages/bookServices/detail/index.wxml | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/pages/bookServices/detail/index.wxml b/pages/bookServices/detail/index.wxml
index c1c9f80..e26b9f5 100644
--- a/pages/bookServices/detail/index.wxml
+++ b/pages/bookServices/detail/index.wxml
@@ -7,7 +7,8 @@
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
-<scroll-view scroll-y="{{true}}" class="book">
+<t-toast id="t-toast" />
+<scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail">
@@ -50,9 +51,9 @@
<view class="li-title">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view class="message-li">
+ <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
- <view class="li-content">{{bookDetail.class}}</view>
+ <view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
</view>
@@ -77,12 +78,13 @@
<view>
<t-image src="/static/images/bookService/detail/paper-price.png"></t-image>
</view>
- <view class="price">楼{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : bookDetail.paperPrice}}</view>
+ <view class="price">楼{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ bookDetail.paperPrice}}</view>
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <t-image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" data-type="jd"></t-image>
+ <t-image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd"></t-image>
<t-image src="/static/images/bookService/detail/tmall.png" width="32" height="22" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}"></t-image>
<t-image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}"></t-image>
<t-image src="/static/images/bookService/detail/jd.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}"></t-image>
@@ -97,19 +99,26 @@
<t-tab-panel label="鐢靛瓙涔�" value="1" style="{{tabPanelstyle}}">
鐢靛瓙涔�
</t-tab-panel>
- <t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources">
- <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource"></teach-resource>
- <tree treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach"></tree>
+ <t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <view wx:if="{{!loading && teach.length}}">
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource"></teach-resource>
+ <tree bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}"></tree>
+ </view>
+ <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading}}" />
</t-tab-panel>
<t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
- <learn-resource></learn-resource>
- <tree tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}"></tree>
+ <view wx:if="{{!loading && learn.length}}">
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource"></learn-resource>
+ <tree bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+ </view>
</t-tab-panel>
<t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
- <test-resource list="{{test}}"></test-resource>
+ <view wx:if="{{!loading && test.length}}">
+ <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
+ </view>
</t-tab-panel>
- <t-tab-panel label="浜戠瑪璁�" value="note" style="{{tabPanelstyle}}">
- <note></note>
+ <t-tab-panel label="浜戠瑪璁�" value="jesk_note" style="{{tabPanelstyle}}">
+ <note bookInfo="{{bookDetail}}" id="note" class="note-list" bind:changeLoaidng="changeLoaidng"></note>
</t-tab-panel>
</t-tabs>
</view>
@@ -128,8 +137,10 @@
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
<view class="shopCar" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
- <view class="buy">绔嬪嵆璐拱</view>
+ <view class="buy" bind:tap="buyBook">绔嬪嵆璐拱</view>
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
-<suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
\ No newline at end of file
+<suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
+<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
+<t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
\ No newline at end of file
--
Gitblit v1.9.1