From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/study/index.js | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/pages/study/index.js b/pages/study/index.js
index 45af0a6..a925f80 100644
--- a/pages/study/index.js
+++ b/pages/study/index.js
@@ -132,23 +132,23 @@
titleBook: "鍥句功锛�" + res.totalSize + "鏈級",
})
})
- // let data1 = {
- // Size: 9999,
- // Start: 0,
- // sort: {
- // type: "Desc",
- // field: "CreateDate",
- // },
- // searchList: [{
- // keywords: 'jsek_digitalCourses',
- // field: "ProductType",
- // }],
- // }
- // app.MG.store.getPurchasedProductList(data1).then((res) => {
- // that.setData({
- // titleCourse: "璇剧▼锛�" + res.totalSize + "闂級",
- // })
- // })
+ let data1 = {
+ Size: 9999,
+ Start: 0,
+ sort: {
+ type: "Desc",
+ field: "CreateDate",
+ },
+ searchList: [{
+ keywords: 'jsek_digitalCourses',
+ field: "ProductType",
+ }],
+ }
+ app.MG.store.getPurchasedProductList(data1).then((res) => {
+ that.setData({
+ titleCourse: "璇剧▼锛�" + res.totalSize + "闂級",
+ })
+ })
let data2 = {
Size: 9999,
Start: 0,
@@ -241,15 +241,16 @@
const {
book
} = e.currentTarget.dataset;
+ console.log(book);
if (this.data.active == 0) {
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.product.id}&name=${book.product.name}`,
});
}
if (this.data.active == 1) {
- // wx.navigateTo({
- // url: `/packageBookService/pages/bookServices/detail/index?id=${book.product.id}&name=${book.product.name}`,
- // });
+ wx.navigateTo({
+ url: `/pages/digitalCourses/digitalCoursesDetails/index?id=${book.product.id}&path=${book.product.linkPathList[1] + '\\' + book.product.id}`,
+ });
}
if (this.data.active == 2) {
wx.navigateTo({
--
Gitblit v1.9.1