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
---
packagePersonal/pages/myCollection/index.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/packagePersonal/pages/myCollection/index.js b/packagePersonal/pages/myCollection/index.js
index 211f2f0..ad65241 100644
--- a/packagePersonal/pages/myCollection/index.js
+++ b/packagePersonal/pages/myCollection/index.js
@@ -16,6 +16,11 @@
label: '璇剧▼',
key: 1,
linkType: 'Favoriteclass',
+ },
+ {
+ label: '鏁板瓧鏁欐潗',
+ key: 2,
+ linkType: 'FavoriteTextBooks',
}
],
list: [],
@@ -35,10 +40,11 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options);
+ // this.getDataList(false);
+ },
+ onShow() {
this.getDataList(false);
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -90,6 +96,7 @@
})
} else {
this.setData({
+ list: [],
skeletonLoding: false,
loading: false
})
@@ -177,8 +184,16 @@
const {
book
} = e.currentTarget.dataset;
+ let url = ''
+ if (this.data.activeName == 'FavoriteBookCity') {
+ url = `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`
+ } else if (this.data.activeName == 'Favoriteclass') {
+ url = `/pages/digitalCourses/digitalCoursesDetails/index?id=${book.id}`
+ } else if (this.data.activeName == 'FavoriteTextBooks') {
+ url = `/pages/digitalTextbooks/digitalTextbooksDetails/index?id=${book.id}`
+ }
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
+ url: url,
});
},
--
Gitblit v1.9.1