From 92a0bff4761945ea8fb7a682915ba342cbb51b8d Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 10 七月 2024 12:18:39 +0800
Subject: [PATCH] yinpin

---
 packageBookService/pages/bookServices/detail/components/tree/index.js |   42 ++++++++++++++++++++++--------------------
 packageDomain/pages/resourceDetails/myAudio/index.js                  |    1 -
 packageBookService/pages/bookServices/detail/index.js                 |    4 +---
 packageDomain/pages/resourceDetails/myAudio/index.wxml                |    2 +-
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 0fbed14..72a7a3a 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -122,15 +122,16 @@
     },
     // 鍒ゆ柇璧勬簮鏄惁璐拱
     resourceIsBuy(data) {
-      if (data.saleMethod && data.saleMethod.length) {
-        if (data.saleMethod[0].State == "Disable") return false;
-        const isSHow = this.properties.buyIds.some(
-          (item) => item == data.saleMethod[0].Id
-        );
-        return !isSHow;
-      } else {
-        return false;
-      }
+      return true
+      // if (data.saleMethod && data.saleMethod.length) {
+      //   if (data.saleMethod[0].State == "Disable") return false;
+      //   const isSHow = this.properties.buyIds.some(
+      //     (item) => item == data.saleMethod[0].Id
+      //   );
+      //   return !isSHow;
+      // } else {
+      //   return false;
+      // }
     },
     // 璺宠浆闊宠棰戞挱鏀惧櫒
     goPlayer(e) {
@@ -173,7 +174,8 @@
         }
         if (
           this.properties.tab == "jsek_cloudLearning" &&
-          this.resourceIsBuy(item)
+          // this.resourceIsBuy(item)
+          item.saleMethod.length > 0
         ) {
           return wx.showToast({
             icon: "error",
@@ -181,16 +183,16 @@
               "璇峰厛璐拱璇ヨ祫婧�" : "璇峰厛鐐瑰嚮棰嗗彇鏌ョ湅鎸夐挳",
           });
         }
-        if (
-          item.saleMethod.length == 0 &&
-          item.sysType == "CmsItem" &&
-          this.properties.tab == "jsek_cloudLearning"
-        ) {
-          return wx.showToast({
-            icon: "error",
-            title: "鏆傛湭寮�濮嬮攢鍞紝璇疯仈绯荤鐞嗗憳",
-          });
-        }
+        // if (
+        //   item.saleMethod.length == 0 &&
+        //   item.sysType == "CmsItem" &&
+        //   this.properties.tab == "jsek_cloudLearning"
+        // ) {
+        //   return wx.showToast({
+        //     icon: "error",
+        //     title: "鏆傛湭寮�濮嬮攢鍞紝璇疯仈绯荤鐞嗗憳",
+        //   });
+        // }
         if (this.properties.tab == "jsek_teachingResources" && (item.file || item.freeFile)) {
           let file = item.fileMap[item.file] ? item.fileMap[item.file] : item.fileMap[item.freeFile]
           if (file && file.protectType !== "Public") {
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 3d48186..042346a 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -690,9 +690,7 @@
         //   this.getResourceData(checkData);
         // }
         if ((e.detail.value == "jsek_teachingResources" && !this.data.teach.length) || (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length)) {
-          if (e.detail.value == "jsek_teachingResources") {
-            wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
-          }
+          wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
           this.getResourceDataList(checkData)
         } else if (e.detail.value == "questionBank" && !this.data.test.length) {
           this.getResourceData(checkData);
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 27fce10..d92cba3 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -284,7 +284,6 @@
           showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
         }
         titleName = datas.name;
-        console.log(showDataUrl, 676767)
       }
 
       this.setData({
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 905341f..8d11b4c 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -82,7 +82,7 @@
             </t-collapse-panel>
           </t-collapse> -->
           <view class="outsideDetailsName">
-            <view class="titleBox"  > {{parentName}}</view>
+            <view class="titleBox"> {{parentName}}</view>
             <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
               <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}} ">{{item.name}}</view>
             </view>

--
Gitblit v1.9.1