From aa2c08b3be23a01d44205b2c19d21a2bf53f944f Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 01 四月 2024 16:15:38 +0800
Subject: [PATCH] 图书服务列表、详情页bug修改

---
 packageBookService/pages/bookServices/detail/components/tree/index.wxml |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 3820ca8..5c40ca7 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,25 +1,27 @@
 <view class="tree">
-  <t-collapse default-value="{{activeValues}}" bind:change="handleChange">
+  <t-collapse default-value="{{openIds}}" bind:change="handleChange">
     <t-collapse-panel
       wx:for="{{treeList}}"
       wx:for-item="item"
       wx:for-index="index"
       wx:key="id"
-      value="{{index}}"
-      expandIcon
-      disabled="{{!item.children}}"
+      value="{{item.id}}"
     >
       <view slot="header" class="header-title">
-        <view wx:if="{{tab == 'jsek_cloudLearning'}}">
+        <view class="title-checkBox">
           <t-checkbox
             icon="rectangle"
             checked="{{item.checked}}"
             data-item="{{item}}"
-            bind:change="checkResourceTitle"
+            catch: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>
-        <text>{{item.name}}</text>
       </view>
       <view
         class="list"
@@ -50,7 +52,7 @@
                 class="box-image"
                 style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}"
               >
-                <view class="checkBox" wx:if="{{tab == 'jsek_cloudLearning'}}">
+                <view class="checkBox" wx:if="{{isShowCheck}}">
                   <!-- 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}}" /> -->
                   <t-checkbox
@@ -63,47 +65,47 @@
                 <!-- 鏁欏璧勬簮鍥炬爣 -->
                 <view class="teach-icon">
                   <image
-                    wx:if="{{citem.selectType == 'audio'}}"
+                    wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}"
                     src="/static/images/bookService/detail/audioIcon.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{citem.selectType == 'video'}}"
+                    wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
                     src="/static/images/bookService/detail/video.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{citem.selectType == 'pdf'}}"
+                    wx:elif="{{citem.selectType == 'pdf'}}"
                     src="/static/images/bookService/detail/pdf.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{citem.selectType == 'webpage'}}"
+                    wx:elif="{{citem.selectType == 'webpage'}}"
                     src="/static/images/bookService/detail/net.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{citem.selectType == 'picture'}}"
+                    wx:elif="{{citem.selectType == 'picture'}}"
                     src="/static/images/bookService/detail/picture.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{citem.selectType == 'zip'}}"
+                    wx:elif="{{citem.selectType == 'zip'}}"
                     src="/static/images/bookService/detail/zip.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx'}}"
                     src="/static/images/bookService/detail/word.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}"
                     src="/static/images/bookService/detail/excel.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:if="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx'}}"
                     src="/static/images/bookService/detail/PPT.png"
                     mode="aspectFill"
                   />
@@ -143,11 +145,11 @@
                   src="/static/images/bookService/detail/cart.png"
                   wx:if="{{citem.isShopCar}}"
                   class="shopCar"
-                  bind:tap="onCloudShoppingCart"
+                  data-item="{{citem}}"
+                  catch:tap="onCloudShoppingCart"
                 ></image>
                 <!-- 浜戝涔犺喘涔板浘鏍� -->
                 <image
-                  bind:tap="onCloudShoppingCart"
                   src="/static/images/bookService/detail/need-buy.png"
                   class="need-buy"
                   wx:if="{{citem.isbuy }}"
@@ -159,14 +161,20 @@
         <!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
         <tree
           wx:else
+          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">
+        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+      </view>
       <view class="listItems" wx:if="{{children.length <= 0 && !loading}}">
         鏆傛棤鏁版嵁
       </view>

--
Gitblit v1.9.1