From cb2fcaef30cc26ed6273eff93f918ea702fa5957 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 19 九月 2024 13:36:06 +0800
Subject: [PATCH] yangshu
---
packageDomain/pages/sampleBookList/index.js | 163 ++++++++++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 72 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 1f8093b..66082cd 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -84,6 +84,7 @@
num: 0,
x: 280,
y: 300,
+ scrollTop: 0
},
/**
@@ -159,8 +160,13 @@
that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
-
+ const paperBookList = wx.getStorageSync('paperBookList') ? JSON.parse(wx.getStorageSync('paperBookList')).length : 0
+ const electronicBookList = wx.getStorageSync('electronicBookList') ? JSON.parse(wx.getStorageSync('electronicBookList')).length : 0
+ this.setData({
+ num: paperBookList + electronicBookList
+ })
}
+ that.getBookList(false)
},
/**
@@ -175,11 +181,11 @@
*/
onShow() {
let that = this;
- that.setData({
- page: 1,
- paperBookList: [],
- electronicBookList: []
- })
+ // that.setData({
+ // page: 1,
+ // paperBookList: [],
+ // electronicBookList: []
+ // })
that.getAlreadyPBookList()
that.getAlreadyEBookList()
// 鑾峰彇鐢宠娆℃暟
@@ -200,7 +206,19 @@
num: Number(that.data.paperBookList.length) + Number(that.data.electronicBookList.length)
})
}
- that.getBookList(false);
+ // that.getBookList(false);
+ that.dataRebuild(that.data.bookList)
+ },
+ onHide() {
+ const query = wx.createSelectorQuery()
+ query.select('#scrollView').scrollOffset(res => {
+ console.log(1, res);
+ this.setData({
+ scrollTop: res.scrollTop
+ })
+ console.log('闅愯棌', this.data.scrollTop);
+ }).exec()
+
},
goBack() {
wx.navigateBack();
@@ -432,59 +450,7 @@
app.MG.store.getProductList(query).then((res) => {
try {
if (res.datas.length > 0) {
- res.datas.forEach((item) => {
- item.paperDisabled = false
- item.paperChecked = false
- item.electronDisabled = false
- item.electronChecked = false
- if (item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1) {
- item.electronDisabled = true
- item.electronChecked = true
- }
- if (that.data.alreadyPaperBookList.length > 0) {
- that.data.alreadyPaperBookList.forEach((pBook) => {
- if (pBook.content.length > 0) {
- pBook.content.forEach((pBookItem) => {
- if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
- item.paperDisabled = true
- item.paperChecked = true
- }
- if (pBookItem.id === item.id && pBook.state == 'Normal') {
- item.paperDisabled = false
- }
- })
- }
- })
- }
-
- if (that.data.alreadyElectronicBookList.length > 0) {
- that.data.alreadyElectronicBookList.forEach((eBook) => {
- if (eBook.content.length > 0) {
- eBook.content.forEach((eBookItem) => {
- if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
- item.electronDisabled = true
- item.electronChecked = true
- }
- })
- }
- })
- }
- if (that.data.paperBookList.length > 0) {
- for (let i = 0; i < that.data.paperBookList.length; i++) {
- if (that.data.paperBookList[i].id == item.id) {
- item.paperChecked = true
- }
- }
- }
- if (that.data.electronicBookList.length > 0) {
- for (let i = 0; i < that.data.electronicBookList.length; i++) {
- if (that.data.electronicBookList[i].id == item.id) {
- item.electronChecked = true
- }
- }
- }
- });
- let list = res.datas;
+ let list = this.dataRebuild(res.datas);
//瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
if (isReachBottom) {
list = [...this.data.bookList, ...list] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
@@ -506,6 +472,65 @@
}
});
},
+ dataRebuild(list) {
+ let that = this;
+ console.log(list, 123)
+ list.forEach((item) => {
+ item.paperDisabled = false
+ item.paperChecked = false
+ item.electronDisabled = false
+ item.electronChecked = false
+ if (item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1) {
+ item.electronDisabled = true
+ item.electronChecked = true
+ }
+ if (that.data.alreadyPaperBookList.length > 0) {
+ that.data.alreadyPaperBookList.forEach((pBook) => {
+ if (pBook.content.length > 0) {
+ pBook.content.forEach((pBookItem) => {
+ if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
+ item.paperDisabled = true
+ item.paperChecked = true
+ }
+ if (pBookItem.id === item.id && pBook.state == 'Normal') {
+ item.paperDisabled = false
+ }
+ })
+ }
+ })
+ }
+
+ if (that.data.alreadyElectronicBookList.length > 0) {
+ that.data.alreadyElectronicBookList.forEach((eBook) => {
+ if (eBook.content.length > 0) {
+ eBook.content.forEach((eBookItem) => {
+ if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
+ item.electronDisabled = true
+ item.electronChecked = true
+ }
+ })
+ }
+ })
+ }
+ if (that.data.paperBookList.length > 0) {
+ for (let i = 0; i < that.data.paperBookList.length; i++) {
+ if (that.data.paperBookList[i].id == item.id) {
+ item.paperChecked = true
+ }
+ }
+ }
+ if (that.data.electronicBookList.length > 0) {
+ for (let i = 0; i < that.data.electronicBookList.length; i++) {
+ if (that.data.electronicBookList[i].id == item.id) {
+ item.electronChecked = true
+ }
+ }
+ }
+ });
+ return list
+ },
+
+
//楂樼骇鍒嗙被閫夋嫨
onChangeIcon(e) {
this.setData({
@@ -540,8 +565,8 @@
this.getBookList(false);
this.getSecondList(path);
},
- // 浜岀骇鍒嗙被鍒囨崲
- onChangeSecond(e) {
+ // 浜岀骇鍒嗙被鍒囨崲
+ onConfirmSecond(e) {
const pathList = [];
for (let index = 0; index < e.detail.value.length; index++) {
const element = e.detail.value[index];
@@ -556,14 +581,12 @@
pathList: pathList,
'secondList.value': e.detail.value,
});
-
- },
- //
- onConfirmSecond() {
this.getBookList(false);
},
onResetSecond() {
this.setData({
+ skeletonLoding: true,
+ pathList: [],
'secondList.value': [],
});
this.getBookList(false);
@@ -666,9 +689,6 @@
this.setData({
alreadyElectronicBookList: list,
});
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.getBookList(false);
- }
}
})
},
@@ -952,7 +972,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
--
Gitblit v1.9.1