From dd20c89b9c333f356927ed0bfed9a4dd9121b964 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 16 七月 2025 22:26:07 +0800
Subject: [PATCH] 优化

---
 packageDomain/pages/resourceDetails/myVideo/index.js |  134 +++++++++++++++++---------
 packageDomain/pages/resourceDetails/myAudio/index.js |  133 ++++++++++++++++---------
 2 files changed, 169 insertions(+), 98 deletions(-)

diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 0aeb5fd..74a580a 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -347,6 +347,85 @@
     wx.navigateBack();
   },
 
+  async getBuyCmsItem() {
+    let cmsItemData = null
+    let query = {
+      path: '*',
+      queryType: '*',
+      cmsType: '*',
+      productId: this.data.bookId,
+      cmsPath: this.data.bookDetail.rootCmsItemId,
+      itemFields: {
+        selectType: [],
+        freeFile: [],
+        file: [],
+        protectedFile: [],
+        resourcesClassification: [],
+        isDownload: [],
+        jsek_resourceBrief: [],
+        jsek_link: [],
+        jsek_questionBank: [],
+        learnSelectType: []
+      },
+      pading: {
+        start: 0,
+        size: 999
+      }
+    }
+    if (this.data.storeInfo) {
+      query.storeInfo = this.data.storeInfo
+    }
+    const res = await app.MG.store.getProductDetail(query)
+    let linkData = this.data.productLinkPath.split("\\");
+    linkData.reverse()
+    let dataList = linkData.map(item => {
+      let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
+      if (data) return data;
+    })
+    let isBuy = 1;
+    for (let i = 0; i < dataList.length; i++) {
+      const dataItem = dataList[i];
+      if (dataItem) {
+        if (dataItem.saleMethod.length > 0) {
+          isBuy = 2;
+          if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+            isBuy = 3;
+            break;
+          } else {
+            break;
+          }
+        }
+      }
+    }
+    if (isBuy == 2) {
+      // 鏈喘涔�
+      if (dataList[0].freeFile) {
+        cmsItemData = dataList[0]
+      } else {
+        wx.hideLoading();
+        wx.showModal({
+          title: '娓╅Θ鎻愮ず',
+          content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+          success: (res) => {
+            if (res.confirm) {
+              if (this.data.source == 'qrcode') {
+                wx.navigateTo({
+                  url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+                });
+              } else {
+                wx.navigateBack()
+              }
+            }
+          }
+        })
+      }
+    } else {
+      cmsItemData = dataList[0]
+    }
+
+    return cmsItemData
+  },
+
   resourceDetailsData() {
     let query = {
       path: '*',
@@ -388,58 +467,13 @@
             if (item.sysType == 'CmsItem' && item.freeFile) {
               this.data.threeLeveData.push(item)
             }
-          } else {
-            let linkData = this.data.productLinkPath.split("\\");
-            linkData.reverse()
-            let dataList = linkData.map(item => {
-              let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
-              if (data) return data;
-            })
-            let isBuy = 1;
-            for (let i = 0; i < dataList.length; i++) {
-              const dataItem = dataList[i];
-              if (dataItem) {
-                if (dataItem.saleMethod.length > 0) {
-                  isBuy = 2;
-                  if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
-                    isBuy = 3;
-                    break;
-                  } else {
-                    break;
-                  }
-                }
-              }
-            }
-            if (isBuy == 2) {
-              // 鏈喘涔�
-              if (dataList[0].freeFile) {
-                this.data.threeLeveData.push(dataList[0])
-              } else {
-                wx.hideLoading();
-                wx.showModal({
-                  title: '娓╅Θ鎻愮ず',
-                  content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
-                  success: (res) => {
-                    if (res.confirm) {
-                      if (this.data.source == 'qrcode') {
-                        wx.navigateTo({
-                          url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
-                        });
-                      } else {
-                        wx.navigateBack()
-                      }
-                    }
-                  }
-                })
-              }
-            } else {
-              if (this.data.productLinkPath == item.productLinkPath) {
-                this.data.threeLeveData.push(dataList[0])
-              }
-            }
           }
         }
       });
+      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) {
@@ -465,6 +499,7 @@
       }
     });
   },
+
   onVideo(e) {
     this.setPlayerList()
     this.setData({
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 2ebdf56..f98e0da 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -330,6 +330,86 @@
     wx.navigateBack();
   },
 
+
+  async getBuyCmsItem() {
+    let cmsItemData = null
+    let query = {
+      path: '*',
+      queryType: '*',
+      cmsType: '*',
+      productId: this.data.bookId,
+      cmsPath: this.data.bookDetail.rootCmsItemId,
+      itemFields: {
+        selectType: [],
+        freeFile: [],
+        file: [],
+        protectedFile: [],
+        resourcesClassification: [],
+        isDownload: [],
+        jsek_resourceBrief: [],
+        jsek_link: [],
+        jsek_questionBank: [],
+        learnSelectType: []
+      },
+      pading: {
+        start: 0,
+        size: 999
+      }
+    }
+    if (this.data.storeInfo) {
+      query.storeInfo = this.data.storeInfo
+    }
+    const res = await app.MG.store.getProductDetail(query)
+    let linkData = this.data.productLinkPath.split("\\");
+    linkData.reverse()
+    let dataList = linkData.map(item => {
+      let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
+      if (data) return data;
+    })
+    let isBuy = 1;
+    for (let i = 0; i < dataList.length; i++) {
+      const dataItem = dataList[i];
+      if (dataItem) {
+        if (dataItem.saleMethod.length > 0) {
+          isBuy = 2;
+          if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
+            isBuy = 3;
+            break;
+          } else {
+            break;
+          }
+        }
+      }
+    }
+    if (isBuy == 2) {
+      // 鏈喘涔�
+      if (dataList[0].freeFile) {
+        cmsItemData = dataList[0]
+      } else {
+        wx.hideLoading();
+        wx.showModal({
+          title: '娓╅Θ鎻愮ず',
+          content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
+          success: (res) => {
+            if (res.confirm) {
+              if (this.data.source == 'qrcode') {
+                wx.navigateTo({
+                  url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
+                });
+              } else {
+                wx.navigateBack()
+              }
+            }
+          }
+        })
+      }
+    } else {
+      cmsItemData = dataList[0]
+    }
+
+    return cmsItemData
+  },
+
   resourceDetailsData() {
     this.setData({
       videoLoading: true,
@@ -376,58 +456,13 @@
                 this.data.threeLeveData.push(item)
               }
             }
-          } else {
-            let linkData = this.data.productLinkPath.split("\\");
-            linkData.reverse()
-            let dataList = linkData.map(item => {
-              let data = res.datas.cmsDatas[0].datas.find(citem => citem.id == item);
-              if (data) return data;
-            })
-            let isBuy = 1;
-            for (let i = 0; i < dataList.length; i++) {
-              const dataItem = dataList[i];
-              if (dataItem) {
-                if (dataItem.saleMethod.length > 0) {
-                  isBuy = 2;
-                  if (this.data.bookDetail.purchasedSaleMethodIdList.indexOf(dataItem.saleMethod[0].Id) > -1) {
-                    isBuy = 3;
-                    break;
-                  } else {
-                    break;
-                  }
-                }
-              }
-            }
-            if (isBuy == 2) {
-              // 鏈喘涔�
-              if (dataList[0].freeFile) {
-                this.data.threeLeveData.push(dataList[0])
-              } else {
-                wx.hideLoading();
-                wx.showModal({
-                  title: '娓╅Θ鎻愮ず',
-                  content: '璇ヨ祫婧愭湭璐拱锛屽皢杩斿洖璐拱',
-                  success: (res) => {
-                    if (res.confirm) {
-                      if (this.data.source == 'qrcode') {
-                        wx.navigateTo({
-                          url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`,
-                        });
-                      } else {
-                        wx.navigateBack()
-                      }
-                    }
-                  }
-                })
-              }
-            } else {
-              if (this.data.productLinkPath == item.productLinkPath) {
-                this.data.threeLeveData.push(dataList[0])
-              }
-            }
           }
         }
       })
+      const itemCms = await this.getBuyCmsItem()
+      if (itemCms != null) {
+        this.data.threeLeveData.push(itemCms)
+      }
       if (this.data.threeLeveData.length > 0) {
         this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
           if (this.data.productLinkPath == items.productLinkPath) {
@@ -471,6 +506,7 @@
       })
     })
   },
+
   onVideo(e) {
     this.setPlayerList()
     const item = e.currentTarget.dataset.item

--
Gitblit v1.9.1