From 9f916f98c6cc6827c84da18fbc9a5e2cacbefc0a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 16:20:08 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/index.wxml | 107 ++++++++++++++---------------------------------------
1 files changed, 28 insertions(+), 79 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 630ae8b..1461b12 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -1,6 +1,6 @@
<!--pages/bookServices/detail/index.wxml-->
<!--瀵艰埅鍖哄煙 -->
-<view class="page-bookService">
+<view class="page-bookService" wx:if="{{!pageLoading}}">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
@@ -64,7 +64,7 @@
<view class="book-sale">
<view class="book-price">
<!-- 鐢靛瓙涔﹀敭浠� -->
- <view class="electron-price">
+ <view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
<image src="/static/images/bookService/detail/electon-price.png" />
</view>
@@ -95,28 +95,10 @@
</view>
</view>
<view class="book-resource">
- <t-tabs
- defaultValue="{{tabValue}}"
- bind:change="onTabsChange"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
- <t-tab-panel
- label="鍥句功绠�浠�"
- icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
- value="brief"
- style="{{tabPanelstyle}}"
- >
- <book-brief
- content="{{bookDetail.content}}"
- authorIntroduction="{{bookDetail.authorIntroduction}}"
- wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
- ></book-brief>
- <view
- wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
- class="noData"
- >
+ <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
+ <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
+ <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
@@ -127,46 +109,17 @@
style="{{tabPanelstyle}}"
>
</t-tab-panel> -->
- <t-tab-panel
- label="鏁欏璧勬簮"
- icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
- value="jsek_teachingResources"
- class="{{loading ? 'loading': ''}}"
- >
- <view
- wx:if="{{!loading && teach.length && !noResources && applyState}}"
- >
- <teach-resource
- applyState="{{applyState}}"
- rejectCause="{{rejectCause}}"
- deadline="{{deadline}}"
- bind:applyResource="applyResource"
- applyResourceLoading="{{applyResourceLoading}}"
- ></teach-resource>
- <tree
- id="teach-tree"
- openIds="{{openTeachids}}"
- bookInfo="{{bookDetail}}"
- treeList="{{teach}}"
- tab="{{tabValue}}"
- applyState="{{applyState}}"
- bind:downloadTeach="downloadTeach"
- bind:handleTree="handleTree"
- openTeachids="{{openTeachids}}"
- wx:if="{{teach.length}}"
- ></tree>
+ <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+ <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
</view>
<t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戝涔�"
- icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
- value="jsek_cloudLearning"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
<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}}"></tree>
@@ -175,25 +128,12 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戞祴璇�"
- icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
- value="questionBank"
- style="{{tabPanelstyle}}"
- >
- <view wx:if="{{!loading && test.length}}">
- <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
- </view>
- <view wx:if="{{noResources}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
+ <view wx:if="{{!loading}}">
+ <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource>
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戠瑪璁�"
- icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
- value="jsek_note"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
</t-tabs>
@@ -224,10 +164,19 @@
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
+ <view class="bottom-btn tryRead" bind:tap="goRead" wx:if="{{!bookBuy}}">
+ <view>
+ <t-image src="/static/images/bookService/detail/shidu.png"></t-image>
+ </view>
+ <view class="btn-text">璇曡</view>
+ </view>
- <view class="shopCar {{((tabValue == 'brief' && bookBuy) || tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
- <view class="buy {{((tabValue == 'brief' && bookBuy) ||tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
- <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
- <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && !bookBuy}}">鍦ㄧ嚎璇曡</view>
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}">绔嬪嵆璐拱</view>
+ <view class="buy read " bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
+</view>
+
+<view class="loading" wx:if="{{pageLoading}}">
+ <t-loading loading="{{pageLoading}}" size="40"></t-loading>
</view>
\ No newline at end of file
--
Gitblit v1.9.1