From 8c794be279e13aa477af7ebbe4bc97570b7da816 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 03 四月 2024 16:32:15 +0800
Subject: [PATCH] 线上书展bug3
---
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 28f02cb..bfe83f3 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,24 +1,37 @@
<view class="tree">
- <t-collapse default-value="{{openIds}}" bind:change="handleChange">
+
+ <t-collapse default-value="{{openIds}}" catchchange="handleChange">
<t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{item.id}}">
<view slot="header" class="header-title">
- <view class="title-checkBox">
- <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" wx:if="{{isShowCheck}}" />
- <!-- <t-checkbox icon="rectangle" checked="{{true}}" data-item="{{item}}" bind:change="checkResourceTitle" /> -->
- <text>{{item.name}} </text><text wx:if="{{item.sysType =='CmsFolder'}}">锛坽{item.children ? item.children.length : 0}}锛�</text>
+ <view class="title-checkBox" catchtap="catchTap">
+ <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catchchange="checkResourceTitle" wx:if="{{isShowCheck}}" />
+ <!-- 绔犺妭鍚� -->
+ <view style="width: 100%">
+ <text>{{item.name}} </text><text wx:if="{{item.sysType =='CmsFolder'}}">锛坽{item.children ? item.children.length : 0}}锛�</text>
+ </view>
</view>
</view>
<view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
- <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.type == 'productItem'}}">
+ <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}">
<view class="itemsInfo" wx:if="{{citem.name}}" data-item="{{citem}}" data-index="{{cindex}}">
<view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
<view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
- <view class="checkBox" wx:if="{{isShowCheck}}">
+ <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
<!-- 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}}" /> -->
+<<<<<<< Updated upstream
+ <t-checkbox
+ disabled="{{!citem.saleMethod[0].Id}}"
+ icon="rectangle"
+ checked="{{citem.checked}}"
+ data-item="{{citem}}"
+ catch:change="checkResource"
+ />
+=======
<t-checkbox icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
+>>>>>>> Stashed changes
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
@@ -41,13 +54,22 @@
<view class="teachClass"> {{citem.resourceClass}} </view>
<view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
<!-- 涓嬭浇鎸夐挳 -->
+<<<<<<< Updated upstream
+ <!-- <image
+ src="/static/images/bookService/detail/download-icon.png"
+ class="download-image"
+ data-value="{{citem}}"
+ catchtap="downloadTeach"
+ ></image> -->
+=======
<image src="/static/images/bookService/detail/download-icon.png" class="download-image" data-value="{{citem}}" catchtap="downloadTeach"></image>
+>>>>>>> Stashed changes
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
<image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image>
<!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
- <image src="/static/images/bookService/detail/cart.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image>
+ <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image>
<!-- 浜戝涔犺喘涔板浘鏍� -->
<image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image>
</view>
@@ -55,7 +77,7 @@
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree wx:else isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openTeachids="{{openTeachids}}" openLearnids="{{openLearnids}}"></tree>
+ <tree wx:if="{{citem.childrenCount > 0 && citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openTeachids="{{openTeachids}}" openLearnids="{{openLearnids}}"></tree>
</view>
<!-- 鏆傛棤鏁版嵁 -->
<view wx:if="{{!item.children || !item.children.length}}" class="noData">
@@ -69,6 +91,8 @@
</view>
</t-collapse-panel>
</t-collapse>
+
</view>
-<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
\ No newline at end of file
+<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
+<!-- <button bind:tap="sadd"> 65498</button> -->
\ No newline at end of file
--
Gitblit v1.9.1