From 80cee152c8c7f314d43a05ae1994aeeecd28b08a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 20 九月 2024 18:35:47 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/bookServices/detail/index.js |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 44051f6..61d49e7 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -50,10 +50,12 @@
     resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
     applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
     deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡,
+    isShowBuyCloundBtn: false,
     isshowDrawBtn: true, // 浜戝涔犻鍙栨煡鐪嬫寜閽槸鍚︽樉绀�
     isShowBuyCloundMenu: false, //   浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
     isCloundHaveSaleMethod: false, // 浜戝涔犳槸鍚︽湁閿�鍞柟寮� 
     cloundMenuIsBuy: false,
+    learnTaskData: {},
     rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜
     buyIdList: [],
     shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃
@@ -524,8 +526,8 @@
     app.MG.store.getProductDetail(query).then((res) => {
       this.setData({
         resourceCodeList: res.datas.cmsDatas[0].datas,
+        learnTaskData: res.datas.cmsDatas[0].datas.filter((item) => item.refCode == 'jsek_learningTasks')[0]
       })
-      console.log('refcode', this.data.resourceCodeList);
     })
   },
   //璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -949,7 +951,6 @@
     let query = {
       path: '*',
       queryType: '*',
-      // storeInfo: this.data.options.storeInfo,
       productId: this.data.bookDetail.id,
       cmsPath: type.productLinkPath,
       cmsType: '*',
@@ -962,10 +963,9 @@
         file: [],
         protectedFile: [],
         resourcesClassification: [],
-        isDownload: [],
+        // isDownload: [],
         jsek_resourceBrief: [],
         jsek_link: [],
-        jsek_questionBank: []
       },
       pading: {
         start: 0,
@@ -973,7 +973,6 @@
       },
     }
     app.MG.store.getProductDetailNoChildren(query).then((res) => {
-      console.log('鏈鐞嗚祫婧�', res.datas.cmsDatas[0].datas);
       if (!res.datas.cmsDatas[0].datas.length) {
         return this.setData({
           noResources: true,
@@ -1042,6 +1041,8 @@
         ) || (flags && cloundSaleMethod.Price == 0)
         // 鍒ゆ柇浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
         let isShowBuyCloundMenu = flags && cloundSaleMethod.Price >= 0
+        // 鍒ゆ柇璧勬簮璐拱鎸夐挳鏄惁鏄剧ず
+        let isShowBuyCloundBtn = res.datas.cmsDatas[0].datas.some(citem => citem.saleMethod.length != 0) || type.saleMethod.length
         // 鍒ゆ柇璐墿杞︽寜閽拰閿佹寜閽槸鍚︽樉绀�
         this.handleTreeData(list).forEach(item => {
           item.isbuy = this.resourceIsBuy(item);
@@ -1051,6 +1052,7 @@
         this.setData({
           isshowDrawBtn,
           isShowBuyCloundMenu,
+          isShowBuyCloundBtn,
           isCloundHaveSaleMethod: flags,
           learn: list,
           loading: false,
@@ -1836,6 +1838,32 @@
       });
     }
   },
+  // 浜戝涔犲叏閮ㄨ喘涔�
+  async buyCloudLearnClass() {
+    const cloundMenu = this.data.resourceCodeList.find((item) => item.refCode == 'jsek_cloudLearning')
+    debugger
+    let query = {
+      remarks: '浜戝涔�',
+      requests: [{
+        saleMethodId: cloundMenu.saleMethod.find((eitem) => eitem.SaleType == 'Normal').Id,
+        count: 1
+      }]
+    }
+    const initOrderRes = await app.MG.store.initOrder(query)
+    // 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
+    if (initOrderRes.orderNumber) {
+      // bookService: orderNumber.value,  灏戜紶杩欎釜 锛屾殏鏃朵笉鐭ラ亾鏈変粈涔堢敤
+      wx.navigateTo({
+        url: `/pages/cart/paymentPage/index?&bookId=${this.data.bookDetail.id}&bookName=${this.data.bookDetail.name}&orderNumber=${initOrderRes.orderNumber}`,
+      });
+    } else {
+      // 璁㈠崟鍙蜂笉瀛樺湪锛屾樉绀鸿鍛婃秷鎭�
+      wx.showToast({
+        icon: "error",
+        title: "璇烽噸璇�",
+      });
+    }
+  },
   // 浜戝涔犲瓧娈佃喘涔�
   async buyCloundMenu() {
     const cloundData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
@@ -2544,6 +2572,11 @@
     return childrenList
   },
   uploadFile(e) {
+    const userInfo = JSON.parse(wx.getStorageSync(app.config.userInfoKey))
+    if (userInfo.role != 'Teacher') return wx.showToast({
+      icon: 'error',
+      title: '璇峰厛杩涜鏁欏笀璁よ瘉',
+    })
     this.setData({
       dialogBox: true,
       isShowUp: true

--
Gitblit v1.9.1