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 |  166 +++-----------------
 packageBookService/pages/bookServices/detail/index.wxml                 |  274 +++++----------------------------
 packageBookService/pages/components/webView/index.js                    |    2 
 3 files changed, 71 insertions(+), 371 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index bfd7ca2..b9893ae 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,137 +1,47 @@
 <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}}"
-    >
+    <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" catchtap="catchTap">
-          <t-checkbox
-            icon="rectangle"
-            checked="{{item.checked}}"
-            data-item="{{item}}"
-            catchchange="checkResourceTitle"
-            wx:if="{{isShowCheck}}"
-          />
+          <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
-            >
+            <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"
-      >
+      <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.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="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}}"
-                  catchtap="catchTap"
-                >
+              <view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
+                <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}}" /> -->
-                  <t-checkbox
-                    disabled="{{!citem.saleMethod[0].Id}}"
-                    icon="rectangle"
-                    checked="{{citem.checked}}"
-                    data-item="{{citem}}"
-                    catch:change="checkResource"
-                  />
+                  <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
                 </view>
                 <!-- 鏁欏璧勬簮鍥炬爣 -->
                 <view class="teach-icon">
-                  <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: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" />
                 </view>
                 <!-- 浜戝涔犲浘鏍� -->
                 <view> </view>
                 <!-- 鍚嶇О -->
-                <text
-                  class="name"
-                  style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}"
-                  >{{citem.name}}</text
-                >
+                <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name}}</text>
               </view>
               <!-- 鏁欏璧勬簮绫诲瀷 -->
               <view class="teachClass"> {{citem.resourceClass}} </view>
-              <view
-                class="teach-btn"
-                wx:if="{{tab == 'jsek_teachingResources'}}"
-              >
+              <view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
                 <!--  涓嬭浇鎸夐挳 -->
                 <!-- <image
                   src="/static/images/bookService/detail/download-icon.png"
@@ -142,41 +52,17 @@
               </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/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></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/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>
+                <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image>
               </view>
             </view>
           </view>
         </view>
         <!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
-        <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>
+        <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">
@@ -193,4 +79,4 @@
 </view>
 
 <web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
-<!-- <button bind:tap="sadd"> 65498</button> -->
+<!-- <button bind:tap="sadd"> 65498</button> -->
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 2fc8e5b..be4310e 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,55 +4,30 @@
   <view style="width: 100%; height: {{barHeight}}px; "></view>
   <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
     <view>
-      <t-icon
-        name="chevron-left"
-        size="30"
-        data-name="{{item}}"
-        bind:click="goBack"
-      />
+      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
     </view>
     <view class="navbar-title">{{options.name}}</view>
   </view>
   <t-toast id="t-toast" />
-  <scroll-view
-    scroll-y="{{true}}"
-    class="book"
-    bindscrolltolower="onReachBottom"
-  >
+  <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
     <!-- 鍥句功璇︽儏 -->
     <view class="book-box">
       <view class="book-detail" id="book-detail">
         <view class="detail-left">
           <view class="book-img">
-            <image
-              loading=""
-              src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
-              mode="aspectFill"
-              aria-label="{{bookDetail.name}}"
-            />
+            <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
           </view>
           <view class="book-use">
             <view class="collect" bind:tap="setCollect">
               <view>
-                <image
-                  loading=""
-                  src="/static/images/bookService/detail/collect.png"
-                  wx:if="{{!bookDetail.isFavourite}}"
-                />
-                <image
-                  loading=""
-                  src="/static/images/bookService/detail/collecting.png"
-                  wx:if="{{bookDetail.isFavourite}}"
-                />
+                <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+                <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
               </view>
               <view class="use-title">鏀惰棌</view>
             </view>
             <view class="suggest" bind:tap="suggestBtn">
               <view>
-                <image
-                  loading=""
-                  src="/static/images/bookService/detail/suggest.png"
-                />
+                <image loading="" src="/static/images/bookService/detail/suggest.png" />
               </view>
               <view class="use-title">鎴戣寤鸿</view>
             </view>
@@ -74,24 +49,15 @@
               <view class="li-content">{{bookDetail.isbn}}</view>
             </view>
             <view class="message-li">
-              <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
-                >鍑虹増鏃堕棿锛�</view
-              >
+              <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
               <view class="li-content">{{bookDetail.publicationDate}}</view>
             </view>
-            <view
-              class="message-li"
-              wx:if="{{bookDetail.class}}"
-              style="height: 80rpx"
-            >
+            <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
               <view class="li-title">鍥句功鍒嗙被锛�</view>
               <view class="class-name showTow">{{bookDetail.class}}</view>
             </view>
           </view>
-          <image
-            src="/static/images/bookService/detail/square.png"
-            class="right-background"
-          />
+          <image src="/static/images/bookService/detail/square.png" class="right-background" />
         </view>
       </view>
       <!-- 閿�鍞俊鎭� -->
@@ -100,17 +66,12 @@
           <!-- 鐢靛瓙涔﹀敭浠� -->
           <view class="electron-price" wx:if="{{bookDetail.price}}">
             <view>
-              <image
-                src="/static/images/bookService/detail/electon-price.png"
-              />
+              <image src="/static/images/bookService/detail/electon-price.png" />
             </view>
             <view class="price">
-              <view class="price-text"
-                >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
-                bookDetail.price}}</view
-              >
-              <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
-                >楼{{bookDetail.oldPrice}}
+              <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+                bookDetail.price}}</view>
+              <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
               </view>
             </view>
             <view> </view>
@@ -120,66 +81,24 @@
             <view>
               <image src="/static/images/bookService/detail/paper-price.png" />
             </view>
-            <view class="price"
-              >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
-              '楼'+bookDetail.paperPrice}}</view
-            >
+            <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+              '楼'+bookDetail.paperPrice}}</view>
           </view>
         </view>
         <!-- 缃戝簵 -->
         <view class="book-web">
-          <image
-            src="/static/images/bookService/detail/jd.png"
-            wx:if="{{bookDetail.JDLink}}"
-            bind:tap="goShop"
-            data-link="{{bookDetail.JDLink}}"
-            data-type="jd"
-          />
-          <image
-            class="tmall-image"
-            src="/static/images/bookService/detail/tmall.png"
-            bind:tap="goShop"
-            data-link="{{bookDetail.tmallLink}}"
-            wx:if="{{bookDetail.tmallLink}}"
-          />
-          <image
-            src="/static/images/bookService/detail/dangdang.png"
-            bind:tap="goShop"
-            data-link="{{bookDetail.dangdangLink}}"
-            wx:if="{{bookDetail.dangdangLink}}"
-          />
-          <image
-            src="/static/images/bookService/detail/weidian.png"
-            bind:tap="goShop"
-            data-link="{{bookDetail.weidianLink}}"
-            wx:if="{{bookDetail.weidianLink}}"
-          />
+          <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+          <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+          <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+          <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
         </view>
       </view>
     </view>
     <view class="book-resource">
-      <t-tabs
-        value="{{tabValue}}"
-        bind:change="onTabsChange"
-        t-class="custom-tabs"
-        t-class-content="custom-panel"
-        class="tab-class"
-      >
-        <t-tab-panel
-          label="鍥句功绠�浠�"
-          icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
-          value="brief"
-          style="{{tabPanelstyle}}"
-        >
-          <book-brief
-            content="{{bookDetail.content}}"
-            authorIntroduction="{{bookDetail.authorIntroduction}}"
-            wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
-          ></book-brief>
-          <view
-            wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
-            class="noData"
-          >
+      <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+        <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
+          <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
+          <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
             <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
           </view>
         </t-tab-panel>
@@ -190,140 +109,47 @@
           style="{{tabPanelstyle}}"
         >
         </t-tab-panel> -->
-        <t-tab-panel
-          label="鏁欏璧勬簮"
-          icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
-          value="jsek_teachingResources"
-          class="{{loading ? 'loading': ''}}"
-        >
-          <view
-            wx:if="{{!loading && teach.length && !noResources && applyState}}"
-          >
-            <teach-resource
-              applyState="{{applyState}}"
-              rejectCause="{{rejectCause}}"
-              deadline="{{deadline}}"
-              bind:applyResource="applyResource"
-              applyResourceLoading="{{applyResourceLoading}}"
-            ></teach-resource>
-            <tree
-              id="teach-tree"
-              openIds="{{openTeachids}}"
-              bookInfo="{{bookDetail}}"
-              treeList="{{teach}}"
-              tab="{{tabValue}}"
-              applyState="{{applyState}}"
-              bind:downloadTeach="downloadTeach"
-              bind:handleTree="handleTree"
-              openTeachids="{{openTeachids}}"
-              wx:if="{{teach.length}}"
-            ></tree>
+        <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+          <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
+            <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+            <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
           </view>
-          <t-loading
-            theme="circular"
-            size="60rpx"
-            class="loading"
-            loading="{{loading }}"
-          />
+          <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
           <view wx:if="{{noResources}}" class="noData">
             <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
           </view>
         </t-tab-panel>
-        <t-tab-panel
-          label="浜戝涔�"
-          icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
-          value="jsek_cloudLearning"
-          style="{{tabPanelstyle}}"
-        >
+        <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
           <view wx:if="{{!loading && learn.length}}">
-            <learn-resource
-              bind:getFreeResource="getFreeResource"
-              bind:allAddShoppiingCar="allAddShoppiingCar"
-              id="learn-resource"
-              buyResourceData="{{buyResourceData}}"
-              bookId="{{bookDetail.id}}"
-              isshowDrawBtn="{{isshowDrawBtn}}"
-            ></learn-resource>
-
-            <tree
-              id="tree"
-              openIds="{{openLearnids}}"
-              bookInfo="{{bookDetail}}"
-              tab="{{tabValue}}"
-              treeList="{{learn}}"
-              buyIds="{{buyIdList}}"
-              openLearnids="{{openLearnids}}"
-              bind:updateShoppingCartHidden="updateShoppingCartHidden"
-              bind:updateCloudLearning="updateCloudLearning"
-            ></tree>
+            <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource>
+            <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
           </view>
           <view wx:if="{{noResources}}" class="noData">
             <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
           </view>
         </t-tab-panel>
-        <t-tab-panel
-          label="浜戞祴璇�"
-          icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
-          value="questionBank"
-          style="{{tabPanelstyle}}"
-        >
+        <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
           <view wx:if="{{!loading}}">
-            <test-resource
-              list="{{test}}"
-              bookInfo="{{bookDetail}}"
-              mockData="{{mockData}}"
-              bind:buyMock="buyMock"
-            ></test-resource>
+            <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource>
           </view>
         </t-tab-panel>
-        <t-tab-panel
-          label="浜戠瑪璁�"
-          icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
-          value="jsek_note"
-          style="{{tabPanelstyle}}"
-        >
+        <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
           <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
         </t-tab-panel>
-        <t-tab-panel
-          label="鐩稿叧鍥句功"
-          icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
-          value="related_books"
-          style="{{tabPanelstyle}}"
-        >
-          <related-books
-            relatedBookData="{{relatedBookData}}"
-            relatedBookLoading="{{relatedBookLoading}}"
-            noRelatedBookData="{{noRelatedBookData}}"
-            bind:goBookDetails="goBookDetails"
-          ></related-books>
+        <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
+          <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
         </t-tab-panel>
       </t-tabs>
     </view>
   </scroll-view>
   <!-- 鎴戣寤鸿寮圭獥 -->
-  <suggest
-    class="suggest-component"
-    id="suggest-component"
-    bookIcon="{{bookDetail.icon}}"
-    bookName="{{bookDetail.name}}"
-  ></suggest>
+  <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
   <!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
-  <t-dialog
-    class="teachDownloadDialog"
-    visible="{{isShowTeachDownload}}"
-    title="鎻愮ず"
-    content="璇峰墠寰�PC绔笅杞�"
-    confirm-btn="{{ confirmBtn }}"
-    bind:confirm="closeTeachDownload"
-  />
+  <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
 
   <view class="applyBox" bindtap="goApply">
     <view class="box">
-      <t-image
-        src="/static/images/home/yangshuForm1.png"
-        mode="heightFix"
-        class="img"
-      />
+      <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
       <view class="num" wx:if="{{num > 0}}">{{num}}</view>
     </view>
   </view>
@@ -331,18 +157,13 @@
   <view class="box-bottom">
     <view class="bottom-btn" bind:tap="appplyElectronicBook">
       <view>
-        <t-image
-          loading=""
-          src="/static/images/bookService/detail/ebook.png"
-        ></t-image>
+        <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
       </view>
       <view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
     </view>
     <view class="bottom-btn" bind:tap="appplyPaperBook">
       <view>
-        <t-image
-          src="/static/images/bookService/detail/paper-book.png"
-        ></t-image>
+        <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
       </view>
       <view class="btn-text">绾歌川鏍蜂功鐢宠</view>
     </view>
@@ -353,19 +174,12 @@
       <view class="btn-text">璇曡</view>
     </view>
 
-    <view
-      class="shopCar shopCarColor"
-      bind:tap="addBookShopcCar"
-      wx:if="{{!bookBuy}}"
-      >鍔犲叆璐墿杞�</view
-    >
-    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}"
-      >绔嬪嵆璐拱</view
-    >
+    <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy}}">鍔犲叆璐墿杞�</view>
+    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}">绔嬪嵆璐拱</view>
     <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
   </view>
 </view>
 
 <view class="loading" wx:if="{{pageLoading}}">
   <t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
index 48d319c..fba1875 100644
--- a/packageBookService/pages/components/webView/index.js
+++ b/packageBookService/pages/components/webView/index.js
@@ -75,7 +75,7 @@
           "&token=" +
           wx.getStorageSync(app.config.tokenKey) +
           "&recordLocation=" +
-          that.data.currentPage + "&freeEpubPage=" + data.freePage
+          that.data.currentPage + "&isPreview=true&freeEpubPage=" + data.freePage
       }
       that.setData({
         src: url,

--
Gitblit v1.9.1