From 36b2ce21114082da777b66b4bda250c9ca7ecd30 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 14:38:25 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/bookServices/detail/index.js |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 0b617e4..194c949 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -51,7 +51,8 @@
       residue: 0, // 缁勫嵎鍓╀綑娆℃暟
       mockList: [] // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
     },
-    flag: true
+    flag: true,
+    applyResourceLoading: false
   },
 
 
@@ -262,7 +263,6 @@
           })
         }
       }
-      console.log('缁勫嵎淇℃伅', this.data.mockData);
       this.setData({
         'bookDetail.publicationDate': this.formatDate(this.data.bookDetail.publicationDate),
         'bookDetail.class': className,
@@ -270,6 +270,7 @@
         'bookDetail.oldPrice': this.numFormat(this.data.bookDetail.oldPrice),
         'bookDetail.paperPrice': this.numFormat(this.data.bookDetail.paperPrice),
       });
+      console.log('鍥句功淇℃伅', this.data.bookDetail);
     });
 
   },
@@ -417,20 +418,23 @@
         //鏁欏璧勬簮 浜戝涔�
         if (type.refCode == 'jsek_teachingResources' || type.refCode == 'jsek_cloudLearning') {
           if (res.datas.cmsDatas[0].datas.length > 0) {
+            res.datas.cmsDatas[0].datas.forEach(item => {
+              item.checked = false
+            })
+            const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
             if (type.refCode == 'jsek_teachingResources') {
-              res.datas.cmsDatas[0].datas.forEach(item => {
-                item.checked = false
-              })
-              const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
-
-              console.log(list, 'list');
               this.setData({
                 teach: list,
                 loading: false
               })
+              console.log('鏁欏璧勬簮', this.data.teach);
               this.findChildIds(this.data.teach, this.data.openTeachids = [])
             } else if (type.refCode == 'jsek_cloudLearning') {
+              res.datas.cmsDatas[0].datas.forEach(item => {
+                item.checked = false
+              })
               const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
+              console.log(list, 'list');
               this.setData({
                 learn: list,
                 loading: false
@@ -515,6 +519,7 @@
       if (this.data.tabValue == 'jsek_teachingResources') {
         item.checked = false
       } else if (this.data.tabValue == 'jsek_cloudLearning') {
+        item.checked = false
         item.isbuy = this.resourceIsBuy(item)
         item.isShopCar = this.isShoppingCart(item)
       }
@@ -552,6 +557,17 @@
 
   // 鍥句功娣诲姞璐墿杞�
   async addBookShopcCar() {
+
+    const token = wx.getStorageSync('jsek-token')
+    if (!token) {
+      return wx.getUserProfile({
+        desc: '鐢ㄦ埛鐧诲綍',
+        success: (res) => {
+          console.log(res);
+        }
+      })
+    }
+
     const shoppingCartGetId = []
 
     let query = {
@@ -703,10 +719,15 @@
         })
       }
     })
-    console.log('鏈夋晥鏃ユ湡', this.data.deadline);
+    this.setData({
+      applyResourceLoading: false
+    })
   },
   // 鐢宠鏁欏璧勬簮
   applyResource() {
+    this.setData({
+      applyResourceLoading: true
+    })
     // let role = userStore.userInfo ? userStore.userInfo.role : null
     // if (role) {
     //   if (role == 'Teacher') {
@@ -729,7 +750,9 @@
     }
     app.MG.ugc.newTopicMessage(query).then((res) => {
       if (res) {
-        Message.success('鐢宠宸叉彁浜わ紝璇峰緟瀹℃牳閫氳繃鍚庝笅杞�')
+        wx.showToast({
+          title: '鐢宠宸叉彁浜わ紝璇峰緟瀹℃牳閫氳繃鍚庝笅杞�',
+        })
       }
       this.getApplyInfo(this.data.bookDetail.id)
     })
@@ -1143,7 +1166,6 @@
         })
         res = await app.MG.store.initOrder(query)
       }
-
       if (res.orderNumber && this.data.mockData.price) {
         wx.navigateTo({
           url: `/pages/cart/paymentPage/index?orderNumber=${res.orderNumber}`,
@@ -1194,11 +1216,16 @@
       this.buyBook()
     }
     else if (this.data.tabValue == 'jsek_cloudLearning') {
-      console.log('浜戝涔�');
+      const tree = this.selectComponent('#tree')
+
+      tree.onCloudShoppingCart()
+
+
     } else if (this.data.tabValue == 'questionBank') {
       this.buyMock()
     } else {
       console.log(this.data.tabValue);
     }
-  }
+  },
+
 })

--
Gitblit v1.9.1