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/components/tree/index.wxml | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/pages/bookServices/detail/components/tree/index.wxml b/pages/bookServices/detail/components/tree/index.wxml
index 08ab27b..9d3efdd 100644
--- a/pages/bookServices/detail/components/tree/index.wxml
+++ b/pages/bookServices/detail/components/tree/index.wxml
@@ -1,9 +1,9 @@
<view class="tree">
- <t-collapse defaultValue="{{activeValues}}" bind:change="handleChange">
+ <t-collapse default-value="{{activeValues}}" bind:change="handleChange">
<t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{index}}" expandIcon>
<view slot="header" class="header-title">
- <view>
- <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catch:change="checkResourceTitle" wx:if="{{tab == 'jsek_teachingResources'}}" />
+ <view wx:if="{{tab == 'jsek_cloudLearning'}}">
+ <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" />
</view>
<text>{{item.name}}</text>
</view>
@@ -11,11 +11,12 @@
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
<view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.type == 'productItem'}}">
<view class="itemsInfo" wx:if="{{citem.name}}" data-item="{{citem}}" data-index="{{cindex}}">
- <view class="contentBox">
+ <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
- <view class="box-image">
- <view class="checkBox">
- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" bind:change="checkResource" data-item="{{citem}}" wx:if="{{tab == 'jsek_teachingResources'}}" />
+ <view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
+ <view class="checkBox" wx:if="{{tab == 'jsek_cloudLearning'}}">
+ <!-- checked="{{citem.checked}}" -->
+ <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" />
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
@@ -30,29 +31,29 @@
<t-image wx:if="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
</view>
<!-- 浜戝涔犲浘鏍� -->
- <view>
-
- </view>
+ <view> </view>
<!-- 鍚嶇О -->
- <text class="name">{{citem.name}}</text>
+ <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name}}</text>
</view>
<!-- 鏁欏璧勬簮绫诲瀷 -->
- <view class="teachClass">
- {{citem.resourceClass}}
- </view>
+ <view class="teachClass"> {{citem.resourceClass}} </view>
<view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
<!-- 涓嬭浇鎸夐挳 -->
- <t-image src="/static/images/bookService/detail/download-icon.png" width="16" height="16" class="download" data-value="{{citem}}" bind:tap="downloadTeach"></t-image>
+ <t-image src="/static/images/bookService/detail/download-icon.png" width="16" height="16" class="download" data-value="{{citem}}" catchtap="downloadTeach"></t-image>
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
- <t-image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{citem.isuy }}"></t-image>
- <t-image src="/static/images/bookService/detail/need-buy.png" class="need-buy"></t-image>
+ <!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
+ <t-image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></t-image>
+ <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
+ <t-image src="/static/images/bookService/detail/cart.png" wx:if="{{citem.isShopCar}}" class="shopCar" bind:tap="onCloudShoppingCart"></t-image>
+ <!-- 浜戝涔犺喘涔板浘鏍� -->
+ <t-image bind:tap="onCloudShoppingCart" src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></t-image>
</view>
</view>
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree wx:else treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}"></tree>
+ <tree wx:else bookInfo="{{bookInfo}}" treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}" openTeachids="{{openTeachids}}" openLearnids="{{openLearnids}}"></tree>
</view>
<view class="listItems" wx:if="{{children.length <= 0 && !loading}}">
鏆傛棤鏁版嵁
@@ -62,4 +63,6 @@
</view>
</t-collapse-panel>
</t-collapse>
-</view>
\ No newline at end of file
+</view>
+
+<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
\ No newline at end of file
--
Gitblit v1.9.1