From 04c7b0163caeae4ab1c5da62e301fa993101cfad Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 31 三月 2025 10:40:45 +0800
Subject: [PATCH] bug修改
---
packageDomain/pages/sampleBookList/index.js | 487 +++++++++++++++++++++++++++++------------------------
1 files changed, 266 insertions(+), 221 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 9d63ba3..2db2783 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -14,7 +14,6 @@
userInfo: null,
path: '*',
pathList: [],
-
bookList: [],
//楂樼骇鍒嗙被
iconList: {
@@ -24,20 +23,13 @@
//涓�绾у垎绫�
stairList: {
value: '',
- options: [],
+ options: [{
+ value: "",
+ label: "涓�绾у垎绫�",
+ }],
},
//浜岀骇鍒嗙被
secondList: {
- value: [],
- options: [],
- },
- //閲嶇偣椤圭洰
- majorProjectList: {
- value: [],
- options: [],
- },
- //鏂板舰鎬佹暀鏉�
- newTextBook: {
value: [],
options: [],
},
@@ -46,10 +38,33 @@
name: '',
code: '',
},
-
stairCode: '', // 涓�绾у垎绫婚�変腑椤�
secondCode: '', // 浜岀骇鍒嗙被閫変腑椤�
sort: '', // 鎺掑簭
+ sortList: {
+ value: "default",
+ options: [{
+ value: "default",
+ label: "榛樿鎺掑簭",
+ },
+ {
+ value: "name-asc",
+ label: "鍚嶇О姝ｅ簭",
+ },
+ {
+ value: "name-desc",
+ label: "鍚嶇О鍊掑彊",
+ },
+ {
+ value: "time-asc",
+ label: "鍑虹増鏃堕棿姝ｅ簭",
+ },
+ {
+ value: "time-desc",
+ label: "鍑虹増鏃堕棿鍊掑彊",
+ },
+ ],
+ },
//鍒嗛〉
page: 1,
limit: 10,
@@ -67,28 +82,32 @@
paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁�
ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁�
num: 0,
+ x: 280,
+ y: 300,
+ scrollTop: 0
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ let that = this;
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
- this.setData({
+ that.setData({
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
// 鎼滅储璧嬪��
if (options && options.searchValue) {
- this.setData({
+ that.setData({
searchValue: options.searchValue,
});
}
// 楂樼骇鍒嗙被璧嬪��
if (options && options.assortCode) {
- this.setData({
+ that.setData({
assortCheck: {
name: options.assorName,
code: options.assortCode,
@@ -96,13 +115,13 @@
},
});
}
- if (this.data.assortCheck.code) {
+ if (that.data.assortCheck.code) {
// 鑾峰彇涓�绾у垎绫�
- this.getStairList(this.data.assortCheck.code);
+ ththatis.getStairList(that.data.assortCheck.code);
}
// 涓�绾у垎绫诲拰path璧嬪��
if (options && options.assortCode && options.stairCode) {
- this.setData({
+ that.setData({
'stairList.value': options.stairCode,
stairCode: options.stairCode,
path: `${options.assortCode}\\${options.stairCode}`,
@@ -110,7 +129,7 @@
}
// 浜岀骇鍒嗙被璧嬪��
if (options && options.secondCode) {
- this.setData({
+ that.setData({
secondCode: options.secondCode,
pathList: [{
Path: options.secondCode,
@@ -119,38 +138,21 @@
}],
})
}
- this.getIconTypeList();
- // 鑾峰彇閲嶇偣椤圭洰
- this.getProjectList('bookClassification');
- //鏂板舰鎬佹暀鏉�
- this.getProjectList('newFormsTextbooks');
+ that.getIconTypeList();
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- loginInfo(app, (data) => {
- if (data) {
- this.setData({
- userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
- })
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
- // 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
-
- }
- })
- } else {
- this.setData({
+ if (token) {
+ that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
- // 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
+ 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)
},
/**
@@ -164,27 +166,60 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
+ let that = this;
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ that.setData({
+ userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
+ })
+ that.getAlreadyPBookList()
+ that.getAlreadyEBookList()
+ that.getSelectPaperBookCount()
+ that.getSelectBookCount()
+ } else {
+ wx.switchTab({
+ url: '/pages/home/home',
+ })
+ }
})
}
- if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
+ if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
+ if (wx.getStorageSync("paperBookList")) {
+ that.setData({
+ paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
+ })
+ }
+ if (wx.getStorageSync("electronicBookList")) {
+ that.setData({
+ electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList")),
+ })
+ }
+ that.setData({
+ num: Number(that.data.paperBookList.length) + Number(that.data.electronicBookList.length)
})
}
- this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length
- })
- this.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();
},
// 鑾峰彇绾歌川涔﹀墿浣欐鏁�
- getSelectPaperBookCount(item) {
+ getSelectPaperBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
@@ -197,7 +232,7 @@
})
},
// 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁�
- getSelectBookCount(item) {
+ getSelectBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
@@ -228,7 +263,10 @@
}
}
app.MG.store.getStoreChannelList(query).then((res) => {
- let list = [];
+ let list = [{
+ value: "",
+ label: "鎬诲垎绫�",
+ }];
if (res.datas.length > 0)(
res.datas.forEach((item) => {
item.value = item.refCode;
@@ -244,7 +282,7 @@
)
this.setData({
'iconList.options': list,
- 'iconList.value': this.data.assortCode,
+ 'iconList.value': this.data.assortCheck.code,
});
})
},
@@ -264,7 +302,10 @@
},
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
- let options = [];
+ let options = [{
+ value: "",
+ label: "涓�绾у垎绫�",
+ }];
if (res.datas.length > 0) {
for (let index = 0; index < res.datas.length; index++) {
let item = res.datas[index];
@@ -278,7 +319,6 @@
'stairList.options': options,
'stairList.value': this.data.stairCode,
});
- console.log(this.data.stairList.options)
});
},
// 鑾峰彇涓�绾у垎绫讳笅浜岀骇鍒嗙被
@@ -316,50 +356,7 @@
})
});
},
- // 鑾峰彇閲嶇偣椤圭洰
- getProjectList(type) {
- const options = [];
- const arr = [];
- let array = [];
- const query = {
- refCodes: [type],
- };
- app.MG.store.getProductTypeField(query).then((res) => {
- array = JSON.parse(res[0].config).option;
- for (let index = 0; index < array.length; index++) {
- const element = array[index];
- if (element.child) {
- for (let index = 0; index < element.child.length; index++) {
- const item = element.child[index];
- arr.push(item);
- }
- }
- }
- if (type == 'bookClassification') {
- for (let index = 0; index < arr.length; index++) {
- const element = arr[index];
- options.push({
- value: element.value,
- label: element.name,
- });
- }
- this.setData({
- 'majorProjectList.options': options,
- });
- } else if (type == 'newFormsTextbooks') {
- for (let index = 0; index < arr.length; index++) {
- const element = arr[index];
- options.push({
- value: element.value,
- label: element.name,
- });
- }
- this.setData({
- 'newTextBook.options': options,
- });
- }
- });
- },
+
// 鑾峰彇鍥句功鍒楄〃
getBookList(isReachBottom) {
let that = this;
@@ -375,17 +372,43 @@
queryType: '*',
};
}
- if (that.data.sort) {
+ if (this.data.sortList.value == "name-asc") {
sort = {
- Name: that.data.sort,
- BaseType: '',
+ Name: "Asc",
+ BaseType: "",
};
- } else {
+ } else if (this.data.sortList.value == "name-desc") {
sort = {
- type: 'Desc',
- field: 'ViewCount',
+ Name: "Desc",
+ BaseType: "",
+ };
+ } else if (this.data.sortList.value == "time-asc") {
+ sort = {
+ PublicationDate: "Asc",
+ BaseType: "DateTime",
+ };
+ } else if (this.data.sortList.value == "time-desc") {
+ sort = {
+ PublicationDate: "Desc",
+ BaseType: "DateTime",
+ };
+ } else if (this.data.sortList.value == "default") {
+ sort = {
+ field: "order",
+ type: "Desc",
};
}
+ // if (that.data.sort) {
+ // sort = {
+ // Name: that.data.sort,
+ // BaseType: '',
+ // };
+ // } else {
+ // sort = {
+ // type: 'Desc',
+ // field: 'ViewCount',
+ // };
+ // }
// 鎼滅储
let searchObj = {};
if (that.data.searchValue) {
@@ -411,6 +434,8 @@
author: [],
isbn: [],
publicationDate: [],
+ pdf: [],
+ protectedEpub: [],
isApplyBook: [],
'isApplyBook>': ['1'],
...searchObj,
@@ -419,55 +444,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) => {
- 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) => {
- 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] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
@@ -478,12 +455,10 @@
bottomLoading: false,
isMoreData: list.length > 0 ? false : true,
skeletonLoding: false,
- loading: false
})
} else {
that.setData({
skeletonLoding: false,
- loading: false
})
}
} catch (error) {
@@ -491,14 +466,76 @@
}
});
},
+ 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({
+ skeletonLoding: true,
+ bookList: [],
'assortCheck.code': e.detail.value,
stairCode: '',
secondCode: '',
path: `${e.detail.value}`,
'iconList.value': e.detail.value,
+
});
this.getBookList(false);
this.getStairList(this.data.assortCheck.code);
@@ -510,17 +547,20 @@
`${this.data.assortCheck.code}\\${e.detail.value}` :
this.data.assortCheck.code;
this.setData({
+ skeletonLoding: true,
+ bookList: [],
pathList: [],
stairCode: e.detail.value,
secondCode: '',
path: path,
'stairList.value': e.detail.value,
+ 'secondList.value': ""
});
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];
@@ -531,69 +571,40 @@
});
}
this.setData({
+ skeletonLoding: true,
pathList: pathList,
'secondList.value': e.detail.value,
});
+ this.getBookList(false);
+ },
+ onResetSecond() {
+ this.setData({
+ skeletonLoding: true,
+ pathList: [],
+ 'secondList.value': [],
+ });
+ this.getBookList(false);
+ },
- },
- //
- onConfirmSecond() {
- this.getBookList(false);
- },
- // 閲嶇偣椤圭洰鏀瑰彉
- changeMajorProject(e) {
+ // 鎺掑簭鍒囨崲
+ onSortChange(e) {
this.setData({
- 'majorProjectList.value': e.detail.value,
+ backTop: "#assort-title",
+ "sortList.value": e.detail.value,
});
- this.getBookList(false);
- },
- // 閲嶇偣椤圭洰閲嶇疆
- resetMajorProject() {
- this.setData({
- 'majorProjectList.value': [],
- });
- this.getBookList(false);
- },
- changeNewText(e) {
- this.setData({
- 'newTextBook.value': e.detail.value,
- });
- this.getBookList(false);
- },
- resetNewText() {
- this.setData({
- 'newTextBook.value': [],
- });
- this.getBookList(false);
- },
- // 鎺掑簭鎸夐挳
- sortClick() {
- if (!this.data.sort.length) {
- this.setData({
- sort: 'Desc',
- });
- } else if (this.data.sort == 'Desc') {
- this.setData({
- sort: 'Asc',
- });
- } else if (this.data.sort == 'Asc') {
- this.setData({
- sort: '',
- });
- }
+
let path;
if (this.data.secondCode) {
path = this.data.secondCode;
} else if (this.data.stairCode) {
- path = `${this.data.assortCheck.code
- }\\${this.data.stairCode}`;
+ path = `${this.data.assortCheck.code}\\${this.data.stairCode}`;
} else {
path = this.data.assortCheck.code;
}
this.setData({
path: path,
});
- this.getBookList(false);
+ this.getBookList(path);
},
// 鎼滅储鍥句功
searchBook(e) {
@@ -672,9 +683,6 @@
this.setData({
alreadyElectronicBookList: list,
});
- if (wx.getStorageSync(app.config.tokenKey)) {
- this.getBookList(false);
- }
}
})
},
@@ -794,7 +802,7 @@
},
//閫夋嫨鐢靛瓙鏍蜂功
- onChangeElectron(e) {
+ async onChangeElectron(e) {
const item = e.currentTarget.dataset.book;
const index = this.data.bookList.findIndex(citem => citem.id == item.id)
let role = this.data.userInfo != null ? this.data.userInfo.role : null
@@ -802,6 +810,44 @@
// 鏄暀甯�
if (e.detail.checked) {
// 鐐瑰嚮閫変腑
+ //鍟嗗搧鏈夋棤鐢靛瓙涔�
+ const obj = {
+ path: '*',
+ queryType: 'SubProduct',
+ sort: {
+ type: 'Desc',
+ field: 'CreateDate'
+ },
+ paging: {
+ start: 0,
+ size: 1
+ },
+ mainProductId: item.id,
+ fields: {
+ bookshelf_pdf: [],
+ bookshelf_protectedEpub: [],
+ }
+ }
+ const res = await app.MG.store.getProductList(obj)
+ if (res.datas.length > 0) {
+ if (!res.datas[0].bookshelf_pdf && !res.datas[0].bookshelf_protectedEpub) {
+ wx.showToast({
+ title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
+ icon: 'none',
+ duration: 1000,
+ })
+ return false;
+ }
+ } else {
+ if (!item.pdf && !item.protectedEpub) {
+ wx.showToast({
+ title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!",
+ icon: 'none',
+ duration: 1000,
+ })
+ return false;
+ }
+ }
if (this.data.ebookCount == 0) {
wx.showToast({
title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠＄悊鍛橈紒",
@@ -881,13 +927,13 @@
this.setData({
electronicBookList: eList,
})
- wx.setStorageSync("electronicBookList", eList);
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
} else {
pList.push(itemAttr)
this.setData({
paperBookList: pList,
})
- wx.setStorageSync("paperBookList", pList);
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
}
this.setData({
num: this.data.num + 1
@@ -920,7 +966,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
--
Gitblit v1.9.1