From 5507c62b33563ec72c00bf4c3e7def936d0dfc70 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 03 四月 2024 17:37:40 +0800
Subject: [PATCH] hebing

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

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index bfe83f3..b9893ae 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,5 +1,4 @@
 <view class="tree">
-
   <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">
@@ -21,17 +20,7 @@
                 <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
+                  <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
                 </view>
                 <!-- 鏁欏璧勬簮鍥炬爣 -->
                 <view class="teach-icon">
@@ -54,16 +43,12 @@
               <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'}}">
                 <!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
@@ -91,7 +76,6 @@
       </view>
     </t-collapse-panel>
   </t-collapse>
-
 </view>
 
 <web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>

--
Gitblit v1.9.1