From c99f9976a5ef9d8974105feb8fc0580a10adf98c Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 23 十二月 2024 14:58:49 +0800
Subject: [PATCH] 111

---
 packageBookService/pages/bookServices/detail/components/tree/index.wxml |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index e01fd77..aeb2510 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -47,37 +47,37 @@
                   mode="aspectFill"
                 />
                 <image
-                  wx:elif="{{item.selectType == 'pdf'}}"
+                  wx:elif="{{item.selectType == 'pdf' || item.learnSelectType == 'pdf'}}"
                   src="/static/images/bookService/detail/pdf.png"
                   mode="aspectFill"
                 />
                 <image
-                  wx:elif="{{item.selectType == 'webpage'}}"
+                  wx:elif="{{item.selectType == 'webpage' || item.learnSelectType == 'webpage'}}"
                   src="/static/images/bookService/detail/net.png"
                   mode="aspectFill"
                 />
                 <image
-                  wx:elif="{{item.selectType == 'picture'}}"
+                  wx:elif="{{item.selectType == 'picture' || item.learnSelectType == 'picture'}}"
                   src="/static/images/bookService/detail/picture.png"
                   mode="aspectFill"
                 />
                 <image
-                  wx:elif="{{item.selectType == 'zip'}}"
+                  wx:elif="{{item.selectType == 'zip' || item.learnSelectType == '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'}}"
+                  wx:elif="{{ item.fileMap[item.file].extension == 'doc' ||  item.fileMap[item.file].extension == 'docx' || item.fileMap[item.freeFile].extension == 'doc' ||  item.fileMap[item.freeFile].extension == 'docx' || item.fileMap[item.protectedFile].extension == 'doc' ||  item.fileMap[item.protectedFile].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'}}"
+                  wx:elif="{{ item.fileMap[item.file].extension == 'xls' ||  item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.freeFile].extension == 'xls' ||  item.fileMap[item.freeFile].extension == 'xlsx' || item.fileMap[item.protectedFile].extension == 'xls' ||  item.fileMap[item.protectedFile].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'}}"
+                  wx:elif="{{ item.fileMap[item.file].extension == 'ppt' ||  item.fileMap[item.file].extension == 'pptx' || item.fileMap[item.freeFile].extension == 'ppt' ||  item.fileMap[item.freeFile].extension == 'pptx' || item.fileMap[item.protectedFile].extension == 'ppt' ||  item.fileMap[item.protectedFile].extension == 'pptx'}}"
                   src="/static/images/bookService/detail/PPT.png"
                   mode="aspectFill"
                 />
@@ -222,37 +222,37 @@
                     mode="aspectFill"
                   />
                   <image
-                    wx:elif="{{citem.selectType == 'pdf'}}"
+                    wx:elif="{{citem.selectType == 'pdf' || citem.learnSelectType == 'pdf'}}"
                     src="/static/images/bookService/detail/pdf.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:elif="{{citem.selectType == 'webpage'}}"
+                    wx:elif="{{citem.selectType == 'webpage' || citem.learnSelectType == 'webpage'}}"
                     src="/static/images/bookService/detail/net.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:elif="{{citem.selectType == 'picture'}}"
+                    wx:elif="{{citem.selectType == 'picture' || citem.learnSelectType == 'picture'}}"
                     src="/static/images/bookService/detail/picture.png"
                     mode="aspectFill"
                   />
                   <image
-                    wx:elif="{{citem.selectType == 'zip'}}"
+                    wx:elif="{{citem.selectType == 'zip' || citem.learnSelectType == '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'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx' || citem.fileMap[citem.freeFile].extension == 'doc' ||  citem.fileMap[citem.freeFile].extension == 'docx' || citem.fileMap[citem.protectedFile].extension == 'doc' ||  citem.fileMap[citem.protectedFile].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'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'xls' ||  citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.freeFile].extension == 'xls' ||  citem.fileMap[citem.freeFile].extension == 'xlsx' || citem.fileMap[citem.protectedFile].extension == 'xls' ||  citem.fileMap[citem.protectedFile].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'}}"
+                    wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx' || citem.fileMap[citem.freeFile].extension == 'ppt' ||  citem.fileMap[citem.freeFile].extension == 'pptx' || citem.fileMap[citem.protectedFile].extension == 'ppt' ||  citem.fileMap[citem.protectedFile].extension == 'pptx'}}"
                     src="/static/images/bookService/detail/PPT.png"
                     mode="aspectFill"
                   />
@@ -313,6 +313,8 @@
           tab="{{tab}}"
           buyIds="{{buyIds}}"
           openIds="{{openIds}}"
+          learnMenu="{{learnMenu}}"
+          isCloundHaveSaleMethod="{{isCloundHaveSaleMethod}}"
         ></tree>
       </view>
       <!-- 鏆傛棤鏁版嵁 -->

--
Gitblit v1.9.1