From c7c2bcf1fb86862ac0bdd4af34492e7d5be90562 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 30 九月 2024 11:50:10 +0800
Subject: [PATCH] pdf

---
 packageBookService/pages/bookServices/detail/components/tree/index.js |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index d957cf7..437d7dd 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -53,6 +53,12 @@
     },
     cloundMenuIsBuy: {
       type: Boolean
+    },
+    learnMenu: {
+      type: Object
+    },
+    isCloundHaveSaleMethod: {
+      type: Boolean
     }
   },
   data: {
@@ -66,7 +72,6 @@
     purchaseList: []
   },
   ready() {},
-
   onLoad() {},
   observers: {
     treeList: function (newValue) {
@@ -160,6 +165,7 @@
     // 璺宠浆闊宠棰戞挱鏀惧櫒
     goPlayer(e) {
       // 妫�鏌ョ櫥褰曠姸鎬�
+      console.log(e.currentTarget.dataset.item)
       const token = wx.getStorageSync(app.config.tokenKey);
       if (!token) return false
       const item = e.currentTarget.dataset.item;
@@ -211,37 +217,29 @@
         }
       }
       if (this.properties.tab == "jsek_cloudLearning") {
-        // 鍒ゆ柇鐖剁骇鎴栬嚜韬槸鍚﹁喘涔�
-        var myEventOption = {
-          bubbles: true,
-          composed: true,
-        };
-        // 鍑哄彂鍒ゆ柇浜戝涔犳槸鍚﹁喘涔板垽鏂�
-        this.triggerEvent("getCloundIsBuy", {}, myEventOption)
-        if (!this.properties.cloundMenuIsBuy) {
-          // 浜戝涔犳湭璐拱锛屾煡鎵句互璐拱鐨勭洰褰曞拰璧勬簮鏈韩
-          const learn = this.handleTreeData(this.properties.treeList).filter(
+        // 1.鎵惧嚭鎵�鏈夌埗绾х洰褰曞拰鏈韩(鏈夐攢鍞柟寮�) 鍜� 浜戝涔犳湰韬�(鏈夐攢鍞柟寮�) 鏀惧埌涓�涓暟缁�  涓虹┖鍒欐殏鏈紑鏀鹃攢鍞�
+        let learn = []
+        if (this.properties.isCloundHaveSaleMethod) {
+          // 1.1 浜戝涔犳湁閿�鍞柟寮忥紝鍔犲叆鐖剁骇鏁扮粍
+          learn.push(this.properties.learnMenu)
+        } else {
+          // 1.2 浜戝涔犳棤閿�鍞柟寮忥紝灏嗙埗绾х洰褰曞拰鏈韩鍔犲叆鏁扮粍
+          const learn = this.handleTreeData(this.properties.learnList).filter(
             (citem) => citem.saleMethod &&
             citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal') &&
             new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() &&
             new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() &&
             item.productLinkPath.includes(citem.productLinkPath)
           )
-          // 璧勬簮鍜岀埗绾х洰褰曢兘鏃犻攢鍞柟寮�
-          // if (!learn.length) return wx.showToast({
-          //   icon: 'error',
-          //   title: '鏆傛湭寮�鍞�',
-          // })
-          const buyList = learn.filter((citem) => this.properties.buyIds.includes(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').Id))
-          // 璧勬簮鍜屾湰韬兘鏈喘涔�
-          if (!buyList.length) {
-            const itemSaleMethod = item.saleMethod && item.saleMethod.length ? item.saleMethod.find(citem => citem.SaleType == 'Normal') : undefined
-            return wx.showToast({
-              icon: 'error',
-              title: itemSaleMethod && itemSaleMethod.Price == 0 ? '璇峰厛棰嗗彇璧勬簮' : '璇峰厛璐拱璧勬簮',
-            })
-          }
         }
+        // 2.鎵惧嚭杩欎釜鏁扮粍閲屽凡璐拱鐨� 褰㈡垚鏂版暟缁�     涓虹┖鍒欐湭璐拱
+        let buyList = []
+        if (learn.length) buyList = learn.filter((item) => this.properties.buyIds.includes(item.saleMethod.find((citem) => citem.SaleType == 'Normal').Id))
+        // 鏈夌埗绾�(鍖呭惈閿�鍞柟寮�)锛屼笖鏈喘涔�
+        if (learn.length && !buyList.length) return wx.showToast({
+          icon: 'error',
+          title: '璇峰厛璐拱璇ヨ祫婧�',
+        })
       }
       let url;
       if (item.selectType == "video" || item.learnSelectType == "video") {
@@ -253,7 +251,7 @@
       ) {
         url = "/packageDomain/pages/resourceDetails/myAudio/index";
       }
-      if (item.selectType == "picture") {
+      if (item.selectType == "picture" || item.selectType == 'document' || item.selectType == 'pdf') {
         url = "/packageDomain/pages/resourceDetails/document/index";
       }
       wx.navigateTo({
@@ -326,6 +324,7 @@
 
     // 鍏ㄩ��
     checkAll() {
+      wx.showLoading()
       const ids = [];
       let list = [];
       let checked = "";
@@ -357,10 +356,12 @@
         composed: true,
       }; // 瑙﹀彂浜嬩欢鐨勯�夐」
       this.triggerEvent("changeCheckAll", myEventDetail, myEventOption);
+      wx.hideLoading()
     },
 
     // 绔犺妭鍕鹃��
     checkResourceTitle(e) {
+      wx.showLoading()
       const flag = e.detail.checked;
       // 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
       const item = e.currentTarget.dataset.item;
@@ -412,6 +413,7 @@
     },
     // 瀛愰」鍕鹃��
     checkResource(e) {
+      wx.showLoading()
       const citem = e.currentTarget.dataset.item;
       const parent = e.currentTarget.dataset.parent;
       let outermost;

--
Gitblit v1.9.1