From c96612e8a63ecef9590be0f8b5199277ec94e5b9 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 18 九月 2024 18:43:12 +0800
Subject: [PATCH] 云学习购买目录,修改bug

---
 packageBookService/pages/bookServices/detail/components/tree/index.wxml |  342 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 304 insertions(+), 38 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 307998f..16070da 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,59 +1,324 @@
 <view class="tree">
-  <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 disabled="{{!item.children}}">
-      <view slot="header" class="header-title">
-        <view wx:if="{{tab == 'jsek_cloudLearning'}}">
-          <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" />
+  <t-collapse default-value="{{openIds}}" catchchange="handleChange">
+    <view
+      wx:for="{{treeList}}"
+      wx:for-item="item"
+      wx:for-index="index"
+      wx:key="id"
+      wx:if="{{item.sysType== 'CmsItem' }}"
+    >
+      <view
+        class="listItems"
+        wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}"
+      >
+        <view class="itemsInfo" data-item="{{item}}" data-index="{{index}}">
+          <view
+            class="contentBox"
+            bind:tap="goPlayer"
+            data-item="{{item}}"
+            data-parent="{{''}}"
+          >
+            <!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
+            <view class="box-image fl-cn" style="width: 80%">
+              <view
+                class="checkBox"
+                wx:if="{{isShowCheck}}"
+                catchtap="catchTap"
+              >
+                <t-checkbox
+                  disabled="{{item.disabled}}"
+                  icon="rectangle"
+                  checked="{{item.checked}}"
+                  data-item="{{item}}"
+                  data-parent="{{item}}"
+                  catch:change="checkResource"
+                />
+              </view>
+              <!-- 鏁欏璧勬簮鍥炬爣 -->
+              <view class="teach-icon fl-cn">
+                <image
+                  wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}"
+                  src="/static/images/bookService/detail/audioIcon.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}"
+                  src="/static/images/bookService/detail/video.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{item.selectType == 'pdf'}}"
+                  src="/static/images/bookService/detail/pdf.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{item.selectType == 'webpage'}}"
+                  src="/static/images/bookService/detail/net.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{item.selectType == 'picture'}}"
+                  src="/static/images/bookService/detail/picture.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{item.selectType == 'zip'}}"
+                  src="/static/images/bookService/detail/zip.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{ item.fileMap[item.file].extension == 'doc' ||  item.fileMap[item.file].extension == 'docx'}}"
+                  src="/static/images/bookService/detail/word.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' ||  item.fileMap[item.file].extension == 'xlsx'}}"
+                  src="/static/images/bookService/detail/excel.png"
+                  mode="aspectFill"
+                />
+                <image
+                  wx:elif="{{ item.fileMap[item.file].extension == 'ppt' ||  item.fileMap[item.file].extension == 'pptx'}}"
+                  src="/static/images/bookService/detail/PPT.png"
+                  mode="aspectFill"
+                />
+                <!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
+                <image
+                  wx:else
+                  src="/static/images/bookService/detail/word.png"
+                  mode=""
+                />
+              </view>
+              <!-- 鍚嶇О -->
+              <text class="name" style="width: 100%">{{item.name || '-'}}</text>
+            </view>
+            <!-- 鏁欏璧勬簮绫诲瀷 -->
+            <view class="teachClass fl-cn"> {{item.resourceClass}} </view>
+            <view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
+              <!--  涓嬭浇鎸夐挳 -->
+              <!-- <image
+                  src="/static/images/bookService/detail/download-icon.png"
+                  class="download-image"
+                  data-value="{{citem}}"
+                  catchtap="downloadTeach"
+                ></image> -->
+            </view>
+            <view wx:if="{{tab == 'jsek_cloudLearning'}}">
+              <!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
+              <image
+                src="/static/images/bookService/detail/shikan.png"
+                class="testSee"
+                wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"
+              ></image>
+              <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
+              <image
+                src="/static/images/bookService/detail/cart@2x.png"
+                wx:if="{{item.isShopCar}}"
+                class="shopCar"
+                data-item="{{item}}"
+                catch:tap="onCloudShoppingCart"
+              ></image>
+              <!-- 浜戝涔犺喘涔板浘鏍� -->
+              <image
+                src="/static/images/bookService/detail/need-buy.png"
+                class="need-buy"
+                wx:if="{{item.isbuy }}"
+              ></image>
+            </view>
+          </view>
         </view>
-        <text>{{item.name}}</text>
       </view>
-      <view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
+    </view>
+    <t-collapse-panel
+      wx:for="{{treeList}}"
+      wx:for-item="item"
+      wx:for-index="index"
+      wx:key="id"
+      value="{{item.id}}"
+      wx:if="{{item.sysType == 'CmsFolder' }}"
+    >
+      <view slot="header" class="header-title">
+        <view class="title-checkBox" catchtap="catchTap">
+          <t-checkbox
+            style="align-items: center"
+            icon="rectangle"
+            disabled="{{item.disabled}}"
+            checked="{{item.checked}}"
+            data-item="{{item}}"
+            catchchange="checkResourceTitle"
+            wx:if="{{isShowCheck}}"
+          />
+          <!-- 绔犺妭鍚� -->
+          <view class="title-box">
+            <view class="title-t" >
+              <view class="title-name">{{item.name}} </view>
+              <view wx:if="{{item.sysType =='CmsFolder'}}" class="title-num">
+                锛坽{item.childrenItem}}锛�
+              </view>
+            </view>
+            <view class="title-icon" >
+              <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
+              <image
+                src="/static/images/bookService/detail/cart@2x.png"
+                wx:if="{{item.isShopCar}}"
+                class="shopCar"
+                data-item="{{item}}"
+                catch:tap="onCloudShoppingCart"
+              ></image>
+              <!-- 浜戝涔犺喘涔板浘鏍� -->
+              <image
+                src="/static/images/bookService/detail/need-buy.png"
+                class="need-buy"
+                wx:if="{{item.isbuy }}"
+              ></image>
+            </view>
+          </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="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="{{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
+          class="listItems"
+          wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}"
+        >
+          <view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}">
+            <view
+              class="contentBox"
+              bind:tap="goPlayer"
+              data-item="{{citem}}"
+              data-parent="{{item}}"
+            >
+              <!-- 鏁欏璧勬簮 鍥炬爣 -->
+              <view class="box-image fl-cn">
+                <view
+                  class="checkBox"
+                  wx:if="{{isShowCheck}}"
+                  catchtap="catchTap"
+                >
+                  <t-checkbox
+                    disabled="{{citem.disabled}}"
+                    icon="rectangle"
+                    checked="{{citem.checked}}"
+                    data-item="{{citem}}"
+                    data-parent="{{item}}"
+                    catch:change="checkResource"
+                  />
                 </view>
                 <!-- 鏁欏璧勬簮鍥炬爣 -->
-                <view class="teach-icon">
-                  <t-image wx:if="{{citem.selectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
-                  <t-image wx:if="{{citem.selectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
-                  <t-image wx:if="{{citem.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
-                  <t-image wx:if="{{citem.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
-                  <t-image wx:if="{{citem.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
-                  <t-image wx:if="{{citem.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
-                  <t-image wx:if="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
-                  <t-image wx:if="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
-                  <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 class="teach-icon fl-cn">
+                  <image
+                    wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}"
+                    src="/static/images/bookService/detail/audioIcon.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
+                    src="/static/images/bookService/detail/video.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{citem.selectType == 'pdf'}}"
+                    src="/static/images/bookService/detail/pdf.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{citem.selectType == 'webpage'}}"
+                    src="/static/images/bookService/detail/net.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{citem.selectType == 'picture'}}"
+                    src="/static/images/bookService/detail/picture.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{citem.selectType == 'zip'}}"
+                    src="/static/images/bookService/detail/zip.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    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:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}"
+                    src="/static/images/bookService/detail/excel.png"
+                    mode="aspectFill"
+                  />
+                  <image
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx'}}"
+                    src="/static/images/bookService/detail/PPT.png"
+                    mode="aspectFill"
+                  />
+                  <!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
+                  <image
+                    wx:else
+                    src="/static/images/bookService/detail/word.png"
+                    mode=""
+                  />
                 </view>
-                <!-- 浜戝涔犲浘鏍� -->
-                <view> </view>
                 <!-- 鍚嶇О -->
-                <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name}}</text>
+                <text
+                  class="name"
+                  style="{{ tab == 'jsek_teachingResources' ? citem.resourceClass ? 'width: 420rpx'  :  'width: 500rpx;' : (citem.isShopCar &&citem.isbuy ) ? 'width: 400rpx;' : (citem.isShopCar ||citem.isbuy) ? 'width:460rpx' :  'width:500rpx'}}"
+                  >{{citem.name || '-'}}</text
+                >
               </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}}" catchtap="downloadTeach"></t-image>
+              <view
+                class="teachClass fl-cn"
+                wx:if="{{citem.resourceClass && tab == 'jsek_teachingResources'}}"
+              >
+                {{citem.resourceClass}}
               </view>
-              <view wx:if="{{tab == 'jsek_cloudLearning'}}">
+              <view wx:if="{{tab == 'jsek_cloudLearning'}}" class="clound-icon">
                 <!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
-                <t-image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></t-image>
+                <image
+                  src="/static/images/bookService/detail/shikan.png"
+                  class="testSee"
+                  wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"
+                ></image>
                 <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
-                <t-image src="/static/images/bookService/detail/cart.png" wx:if="{{citem.isShopCar}}" class="shopCar" bind:tap="onCloudShoppingCart"></t-image>
+                <image
+                  src="/static/images/bookService/detail/cart@2x.png"
+                  wx:if="{{citem.isShopCar}}"
+                  class="shopCar"
+                  data-item="{{citem}}"
+                  catch:tap="onCloudShoppingCart"
+                ></image>
                 <!-- 浜戝涔犺喘涔板浘鏍� -->
-                <t-image bind:tap="onCloudShoppingCart" src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></t-image>
+                <image
+                  src="/static/images/bookService/detail/need-buy.png"
+                  class="need-buy"
+                  wx:if="{{citem.isbuy }}"
+                ></image>
               </view>
             </view>
           </view>
         </view>
         <!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
-        <tree wx:else bookInfo="{{bookInfo}}" treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}" openTeachids="{{openTeachids}}" openLearnids="{{openLearnids}}"></tree>
+        <tree
+          wx:if="{{ citem.sysType == 'CmsFolder' }}"
+          isShowCheck="{{isShowCheck}}"
+          bookInfo="{{bookInfo}}"
+          treeList="{{[citem]}}"
+          learnList="{{learnList}}"
+          itemId="{{itemId}}"
+          tab="{{tab}}"
+          buyIds="{{buyIds}}"
+          openIds="{{openIds}}"
+        ></tree>
+      </view>
+      <!-- 鏆傛棤鏁版嵁 -->
+      <view wx:if="{{!item.children || !item.children.length}}" class="noData">
+        <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+        <empty />
       </view>
       <view class="listItems" wx:if="{{children.length <= 0 && !loading}}">
         鏆傛棤鏁版嵁
@@ -65,4 +330,5 @@
   </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> -->

--
Gitblit v1.9.1