From b55024ee2f42aa93e0ecaa3113bdeb286f6e59ac Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期二, 29 七月 2025 18:01:55 +0800
Subject: [PATCH] 优化按钮显示，教学互动

---
 packageDomain/pages/resourceDetails/myAudio/index.js |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 74a580a..3a5af21 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -124,7 +124,6 @@
       })
       this.getLearnTime()
     }
-    this.resourceDetailsData()
     this.getBookInfo(options.bookId)
   },
   /**
@@ -267,15 +266,19 @@
       coverSize: {
         height: 1,
       },
-      fields: {},
+      fields: {
+        IsTextbook: []
+      },
     };
     if (this.data.storeInfo) query['storeInfo'] = this.data.storeInfo
     app.MG.store.getProductDetail(query).then(async (res) => {
       this.setData({
         bookDetail: res.datas,
+        bookName: res.datas.name,
         buyIdList: res.datas.purchasedSaleMethodIdList,
         learnClassData: res.datas.cmsDatas[0].datas.find(item => item.refCode == "jsek_cloudLearning")
       })
+      this.resourceDetailsData()
       this.getResourceDataList(this.data.learnClassData)
     });
   },
@@ -388,7 +391,7 @@
       if (dataItem) {
         if (dataItem.saleMethod.length > 0) {
           isBuy = 2;
-          if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+          if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1 || dataItem.saleMethod[0].Price == 0) {
             isBuy = 3;
             break;
           } else {
@@ -400,12 +403,13 @@
     if (isBuy == 2) {
       // 鏈喘涔�
       if (dataList[0].freeFile) {
+        dataList[0].isFreeFile = true; // 杩欎釜璧勬簮鍙互璇曠湅
         cmsItemData = dataList[0]
       } else {
         wx.hideLoading();
         wx.showModal({
           title: '娓╅Θ鎻愮ず',
-          content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+          content: '璇ヨ祫婧愭湭婵�娲绘垨璐拱锛屽嵆灏嗚繑鍥炲浘涔﹁鎯呴〉闈�',
           success: (res) => {
             if (res.confirm) {
               if (this.data.source == 'qrcode') {
@@ -458,9 +462,10 @@
       let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
       let showDataUrl = '';
       let titleName = '';
-      res.datas.cmsDatas[0].datas.forEach((item, index) => {
-        if (item.selectType === "audio" || item.learnSelectType === "audio") {
-          if (this.data.storeInfo == 'jsek_digitalCourses') {
+      // ###瑙嗛椤甸潰杩欓噷鍒ゆ柇浜嗘槸鍚﹁喘涔帮紝浣嗛煶棰戣繖閲屾病鏈夊垽鏂紝闇�瑕佸啀鏍稿疄
+      if (this.data.storeInfo == 'jsek_digitalCourses') {
+        res.datas.cmsDatas[0].datas.forEach((item, index) => {
+          if (item.selectType === "audio" || item.learnSelectType === "audio") {
             if (item.sysType == 'CmsItem') {
               this.data.threeLeveData.push(item)
             }
@@ -468,18 +473,25 @@
               this.data.threeLeveData.push(item)
             }
           }
+        });
+      } else {
+        const itemCms = await this.getBuyCmsItem()
+        if (itemCms != null) {
+          this.data.threeLeveData.push(itemCms)
         }
-      });
-      const itemCms = await this.getBuyCmsItem()
-      if (itemCms != null) {
-        this.data.threeLeveData.push(itemCms)
       }
       if (this.data.threeLeveData.length > 0) {
         selectedId = this.data.threeLeveData.findIndex(items => items.productLinkPath == this.data.productLinkPath)
         if (selectedId !== -1) {
           let datas = this.data.threeLeveData[selectedId];
           if (this.data.formPath == 'jsek_cloudLearning') {
-            let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : datas.freeFile
+            // let file = this.cmsItemIsBuy(datas) ? datas.protectedFile || datas.freeFile : datas.freeFile
+            let file
+            if (!datas.isFreeFile) {
+              file = datas.protectedFile
+            } else {
+              file = datas.freeFile
+            }
             showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey);
           } else {
             showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
@@ -517,7 +529,12 @@
       })
       if (item.selectType == "audio" || item.learnSelectType === "audio") {
         if (this.data.formPath == 'jsek_cloudLearning') {
-          let file = item.protectedFile ? item.protectedFile : item.freeFile
+          let file
+          if (!item.isFreeFile) {
+            file = item.protectedFile
+          } else {
+            file = item.freeFile
+          }
           // 杩欓噷澶勭悊浜戝涔犵殑
           this.setData({
             showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)

--
Gitblit v1.9.1