From 14de3e90ae29af2ccfd51b08c6a11ab02fe8f8e7 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 05 三月 2024 19:02:35 +0800
Subject: [PATCH] feat(合并代码): 和冰帝阿
---
pages/bookServices/detail/index.wxml | 100 +++++++++++++++++---------------------------------
1 files changed, 34 insertions(+), 66 deletions(-)
diff --git a/pages/bookServices/detail/index.wxml b/pages/bookServices/detail/index.wxml
index 9788ffb..9b67d3c 100644
--- a/pages/bookServices/detail/index.wxml
+++ b/pages/bookServices/detail/index.wxml
@@ -13,33 +13,21 @@
<view class="book-detail">
<view class="detail-left">
<view class="book-img">
- <t-image
- src="{{bookDetail.icon}}"
- mode="aspectFill"
- width="120"
- height="170"
- aria-label="{{bookDetail.name}}"
- />
+ <t-image src="{{bookDetail.icon}}" mode="aspectFill" width="120" height="170" aria-label="{{bookDetail.name}}" />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <t-image
- src="/static/images/bookService/detail/collect.png"
- wx:if="{{!bookDetail.isFavourite}}"
- ></t-image>
- <t-image
- src="/static/images/bookService/detail/collecting.png"
- wx:if="{{bookDetail.isFavourite}}"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}"></t-image>
+ <t-image src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}"></t-image>
</view>
- <view>鏀惰棌</view>
+ <view class="use-title">鏀惰棌</view>
</view>
- <view class="suggest">
+ <view class="suggest" bind:tap="suggestBtn">
<view>
<t-image src="/static/images/bookService/detail/suggest.png"></t-image>
</view>
- <view>鎴戣寤鸿</view>
+ <view class="use-title">鎴戣寤鸿</view>
</view>
</view>
</view>
@@ -78,8 +66,9 @@
<t-image src="/static/images/bookService/detail/electon-price.png"></t-image>
</view>
<view class="price">
- <view>楼{{bookDetail.price}}</view>
- <view class="price-old">楼{{bookDetail.oldPrice}} <view class="line"></view> </view>
+ <view class="price-text">楼{{bookDetail.price == '0.00' ? '鍏嶈垂' :bookDetail.price}}</view>
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}} <view class="line"></view>
+ </view>
</view>
<view> </view>
</view>
@@ -88,58 +77,35 @@
<view>
<t-image src="/static/images/bookService/detail/paper-price.png"></t-image>
</view>
- <view class="price">楼{{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/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>
+ <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/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>
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs
- defaultValue="{{0}}"
- bind:change="onTabsChange"
- bind:click="onTabsClick"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- >
- <t-tab-panel label="鍥句功绠�浠�" value="0" style="{{tabPanelstyle}}">
- <book-brief
- content="{{bookDetail.content}}"
- authorIntroduction="{{bookDetail.authorIntroduction}}"
- ></book-brief>
+ <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
+ <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}"></book-brief>
</t-tab-panel>
- <t-tab-panel label="鐢靛瓙涔�" value="1" style="{{tabPanelstyle}}">閫夐」浜屽唴瀹�</t-tab-panel>
- <t-tab-panel label="浜戝涔�" value="2" style="{{tabPanelstyle}}">閫夐」涓夊唴瀹�</t-tab-panel>
- <t-tab-panel label="浜戞祴璇�" value="3" style="{{tabPanelstyle}}">閫夐」鍥涘唴瀹�</t-tab-panel>
+ <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>
+ <t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
+ <learn-resource></learn-resource>
+ <tree tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}"></tree>
+ </t-tab-panel>
+ <t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">閫夐」鍥涘唴瀹�</t-tab-panel>
</t-tabs>
</view>
<!-- 璐拱鎸夐挳 -->
@@ -148,15 +114,17 @@
<view>
<t-image src="/static/images/bookService/detail/ebook.png"></t-image>
</view>
- <view>鐢靛瓙鏍蜂功鐢宠</view>
+ <view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn">
<view>
<t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
</view>
- <view>绾歌川鏍蜂功鐢宠</view>
+ <view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="shopCar">鍔犲叆璐墿杞�</view>
+ <view class="shopCar" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
<view class="buy">绔嬪嵆璐拱</view>
</view>
</scroll-view>
+<!-- 鎴戣寤鸿寮圭獥 -->
+<suggest class="suggest-component" id="suggest-component"></suggest>
\ No newline at end of file
--
Gitblit v1.9.1