From e6a156a6a8bb6f1d3a17e9310269f53c56e10b42 Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期一, 08 四月 2024 22:29:26 +0800 Subject: [PATCH] 问题修改 --- packageDomain/pages/sampleBookList/index.js | 631 ++++++++++++++++++++++++++------------------------------- 1 files changed, 290 insertions(+), 341 deletions(-) diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js index ab27b30..eb4db74 100644 --- a/packageDomain/pages/sampleBookList/index.js +++ b/packageDomain/pages/sampleBookList/index.js @@ -1,3 +1,6 @@ +import { + loginInfo +} from '../../../assets/js/login'; const app = getApp(); Page({ @@ -113,39 +116,37 @@ Path: options.secondCode, Type: '*', StoreRefCode: app.config.goodsStore, - } - ], + }], }) } this.getIconTypeList(); - // 鑾峰彇閲嶇偣椤圭洰 this.getProjectList('bookClassification'); //鏂板舰鎬佹暀鏉� this.getProjectList('newFormsTextbooks'); - if (wx.getStorageSync(app.config.tokenKey)) { - this.getAlreadyPBookList() - this.getAlreadyEBookList() - } - if (wx.getStorageSync(app.config.userInfoKey)) { + + // 妫�鏌ョ櫥褰曠姸鎬� + 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({ userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey)) }) + } - if (wx.getStorageSync("paperBookList")) { - this.setData({ - paperBookList: wx.getStorageSync("paperBookList"), - }) - } - if (wx.getStorageSync("electronicBookList")) { - this.setData({ - electronicBookList: wx.getStorageSync("electronicBookList"), - }) - } - this.setData({ - num: this.data.paperBookList.length + this.data.electronicBookList.length - }) - this.getBookList(false); }, /** @@ -159,31 +160,85 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず */ onShow() { - + this.setData({ + page: 1, + paperBookList: [], + electronicBookList: [] + }) + this.getAlreadyPBookList() + this.getAlreadyEBookList() + // 鑾峰彇鐢宠娆℃暟 + this.getSelectPaperBookCount() + this.getSelectBookCount() + console.log(this.data.electronicBookList.length, this.data.paperBookList.length, 1) + if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) { + if (wx.getStorageSync("paperBookList")) { + this.setData({ + paperBookList: wx.getStorageSync("paperBookList"), + }) + } + if (wx.getStorageSync("electronicBookList")) { + this.setData({ + electronicBookList: wx.getStorageSync("electronicBookList"), + }) + } + this.setData({ + num: this.data.paperBookList.length + this.data.electronicBookList.length + }) + } + this.getBookList(false); }, goBack() { wx.navigateBack(); + }, + + // 鑾峰彇绾歌川涔﹀墿浣欐鏁� + getSelectPaperBookCount() { + app.MG.app + .getTicketResult({ + ticketRefCodeOrGuid: 'paperSampleBookapplyNum', + roleId: this.data.userInfo.roleId + }) + .then((res) => { + this.setData({ + paperBookCount: res.totalCount - res.usedCount + }) + }) + }, + // 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁� + getSelectBookCount() { + app.MG.app + .getTicketResult({ + ticketRefCodeOrGuid: 'electronicSampleBookapplyNum', + roleId: this.data.userInfo.roleId + }) + .then((res) => { + this.setData({ + ebookCount: res.totalCount - res.usedCount + }) + }) }, //鑾峰彇楂樼骇鍒嗙被 getIconTypeList() { let query = { path: '*', - filterList: [ - { - value: 'Normal', - field: 'state' - } - ], + filterList: [{ + value: 'Normal', + field: 'state' + }], queryType: '\\', searchList: [], size: '5', start: '0', storeRefCode: app.config.goodsStore, - sort: { type: 'Asc', field: 'LinkOrder' } + sort: { + type: 'Asc', + field: 'LinkOrder' + } } app.MG.store.getStoreChannelList(query).then((res) => { let list = []; - if (res.datas.length > 0) ( + if (res.datas.length > 0)( res.datas.forEach((item) => { item.value = item.refCode; item.label = item.name; @@ -212,7 +267,10 @@ size: '30', start: '0', storeRefCode: app.config.goodsStore, - sort: { type: 'Asc', field: 'LinkOrder' }, + sort: { + type: 'Asc', + field: 'LinkOrder' + }, }; app.MG.store.getStoreChannelList(query).then(async (res) => { let options = []; @@ -229,6 +287,7 @@ 'stairList.options': options, 'stairList.value': this.data.stairCode, }); + console.log(this.data.stairList.options) }); }, // 鑾峰彇涓�绾у垎绫讳笅浜岀骇鍒嗙被 @@ -242,7 +301,10 @@ size: '30', start: '0', storeRefCode: app.config.goodsStore, - sort: { type: 'Asc', field: 'LinkOrder' }, + sort: { + type: 'Asc', + field: 'LinkOrder' + }, }; app.MG.store.getStoreChannelList(query).then((res) => { if (res.datas.length > 0) { @@ -345,12 +407,10 @@ } const query = { ...pathObj, - filterList: [ - { - value: 'Normal', - field: 'state', - }, - ], + filterList: [{ + value: 'Normal', + field: 'state', + }, ], sort, paging: { start: that.data.page * that.data.limit - that.data.limit, @@ -360,6 +420,8 @@ author: [], isbn: [], publicationDate: [], + pdf: [], + protectedEpub: [], isApplyBook: [], 'isApplyBook>': ['1'], ...searchObj, @@ -379,26 +441,30 @@ } 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 (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) => { - eBook.content.forEach((eBookItem) => { - if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') { - item.electronDisabled = true - item.electronChecked = true - } - }) + 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) { @@ -431,6 +497,9 @@ }) } else { that.setData({ + bookList: [], + pageTotalCount: 0, + bottomLoading: false, skeletonLoding: false, loading: false }) @@ -443,9 +512,7 @@ //楂樼骇鍒嗙被閫夋嫨 onChangeIcon(e) { this.setData({ - assortCheck: { - code: e.detail.value, - }, + 'assortCheck.code': e.detail.value, stairCode: '', secondCode: '', path: `${e.detail.value}`, @@ -457,9 +524,9 @@ }, // 涓�绾у垎绫诲垏鎹� onChangeStair(e) { - const path = e.detail.value.length - ? `${this.data.assortCheck.code}\\${e.detail.value}` - : this.data.assortCheck.code; + const path = e.detail.value.length ? + `${this.data.assortCheck.code}\\${e.detail.value}` : + this.data.assortCheck.code; this.setData({ pathList: [], stairCode: e.detail.value, @@ -555,7 +622,9 @@ }, // 璺宠浆鍥句功璇︽儏 goDetail(e) { - const { book } = e.currentTarget.dataset; + const { + book + } = e.currentTarget.dataset; wx.navigateTo({ url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`, }); @@ -621,7 +690,9 @@ this.setData({ alreadyElectronicBookList: list, }); - this.getBookList(false); + if (wx.getStorageSync(app.config.tokenKey)) { + this.getBookList(false); + } } }) }, @@ -677,17 +748,34 @@ //绾歌川鏍蜂功 onChangePaper(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 - if (role) { - if (item.paperDisabled) { - wx.showToast({ - title: "璇ユ牱涔﹀凡鐢宠", - icon: 'none', - duration: 1000, + if (role && role == 'Teacher') { + // 鏄暀甯� + if (e.detail.checked) { + // 鐐瑰嚮閫変腑 + if (this.data.paperBookCount == 0) { + wx.showToast({ + title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠$悊鍛橈紒", + icon: "none", + duration: 1000, + }) + return false; + } + if (this.data.paperBookList.length >= 2) { + wx.showToast({ + title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�", + icon: "none", + duration: 1000, + }) + return false; + } + this.addBookFun(item, "pBook") + this.setData({ + ["bookList[" + index + "].paperChecked"]: e.detail.checked }) - return - } - if (item.paperChecked) { + } else { + // 鍙栨秷閫変腑 let pList = this.data.paperBookList; if (pList.length > 0) { pList.forEach((obj, index) => { @@ -696,107 +784,44 @@ } }) } - item.paperChecked = false; - if (this.data.bookList.length > 0) { - this.data.bookList.forEach(i => { - if (i.id == item.id) { - i.paperChecked = false; - } - }) - } + this.setData({ + paperBookList: pList, + num: this.data.num - 1, + ["bookList[" + index + "].paperChecked"]: e.detail.checked + }) + wx.setStorageSync("paperBookList", JSON.stringify(pList)); wx.showToast({ title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�", icon: 'none', duration: 1000, - }) - this.setData({ - paperBookList: pList, - num: pList.length + this.data.electronicBookList.length - }) - wx.setStorageSync("paperBookList", JSON.stringify(pList)); - return - } - if (role == 'Teacher') { - this.getSelectPaperBookCount(item) - } else { - item.paperChecked = false - wx.showModal({ - title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰� - content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹� - success: function (res) { - if (res.confirm) { - wx.navigateTo({ - url: "/packageDomain/pages/teacherCertification/index", - }); - } else if (res.cancel) { - item.paperChecked = false - } - } }) } } else { - item.paperChecked = false + wx.showModal({ + title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰� + content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹� + success: function (res) { + if (res.confirm) { + wx.navigateTo({ + url: "/packageDomain/pages/teacherCertification/index", + }); + } + } + }) } }, - getSelectPaperBookCount(item) { - app.MG.app - .getTicketResult({ - ticketRefCodeOrGuid: 'paperSampleBookapplyNum', - roleId: this.data.userInfo.roleId - }) - .then((res) => { - this.setData({ - paperBookCount: res.totalCount - res.usedCount - }) - if (!item.paperDisabled) { - this.getAlreadyBookList(item, 'pBook') - } - }) - }, + //閫夋嫨鐢靛瓙鏍蜂功 - onChangeElectron(e) { + async onChangeElectron(e) { const item = e.currentTarget.dataset.book; - let role = this.data.userInfo != null ? this.data.userInfo.role : null; - if (role) { - if (item.electronDisabled) { - wx.showToast({ - title: "璇ユ牱涔﹀凡鐢宠", - icon: 'none', - duration: 1000, - }) - return - } - if (item.electronChecked) { - let eList = this.data.electronicBookList; - if (eList.length > 0) { - eList.forEach((obj, index) => { - if (obj.id == item.id) { - eList.splice(index, 1); - } - }) - } - if (this.data.bookList.length > 0) { - this.data.bookList.forEach(i => { - if (i.id == item.id) { - i.electronChecked = false; - } - }) - } - item.electronChecked = false; - wx.showToast({ - title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�", - icon: 'none', - duration: 1000, - }) - this.setData({ - electronicBookList: eList, - num: eList.length + this.data.paperBookList.length - }) - wx.setStorageSync("electronicBookList", eList); - return - } - if (role == 'Teacher') { - //鏈夋棤瀛愬晢鍝侊紝瀛愬晢鍝佹湁鏃犵數瀛愪功鏂囦欢 + console.log(item) + const index = this.data.bookList.findIndex(citem => citem.id == item.id) + let role = this.data.userInfo != null ? this.data.userInfo.role : null + if (role && role == 'Teacher') { + // 鏄暀甯� + if (e.detail.checked) { + // 鐐瑰嚮閫変腑 + //鍟嗗搧鏈夋棤鐢靛瓙涔� const obj = { path: '*', queryType: 'SubProduct', @@ -806,7 +831,7 @@ }, paging: { start: 0, - size: 6 + size: 1 }, mainProductId: item.id, fields: { @@ -814,60 +839,90 @@ bookshelf_protectedEpub: [], } } - app.MG.store.getProductList(obj).then((res) => { - if (res.datas.length > 0) { - if (res.datas[0].bookshelf_pdf || res.datas[0].bookshelf_protectedEpub) { - this.getSelectBookCount(item) - } else { - wx.showToast({ - title: "鏆傛棤鐢靛瓙涔︽枃浠�,璇疯仈绯荤鐞嗗憳!", - icon: 'none', - duration: 1000, - }) - } - } else { - this.getSelectBookCount(item) + 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: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠$悊鍛橈紒", + icon: "none", + duration: 1000, + }) + return false; + } + if (this.data.electronicBookList.length >= 2) { + wx.showToast({ + title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�", + icon: "none", + duration: 1000, + }) + return false; + } + this.addBookFun(item, "eBook") + this.setData({ + ["bookList[" + index + "].electronChecked"]: e.detail.checked }) } else { - item.electronChecked = false - wx.showModal({ - title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰� - content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹� - success: function (res) { - if (res.confirm) { - wx.navigateTo({ - url: "/packageDomain/pages/teacherCertification/index", - }); - } else if (res.cancel) { - item.electronChecked = false + // 鍙栨秷閫変腑 + let eList = this.data.electronicBookList; + if (eList.length > 0) { + eList.forEach((obj, index) => { + if (obj.id == item.id) { + eList.splice(index, 1); } - } + }) + } + this.setData({ + electronicBookList: eList, + num: this.data.num - 1, + ["bookList[" + index + "].electronChecked"]: e.detail.checked + }) + wx.setStorageSync("electronicBookList", JSON.stringify(eList)); + wx.showToast({ + title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�", + icon: 'none', + duration: 1000, }) } } else { - item.electronChecked = false - } - }, - getSelectBookCount(item) { - app.MG.app - .getTicketResult({ - ticketRefCodeOrGuid: 'electronicSampleBookapplyNum', - roleId: this.data.userInfo.roleId - }) - .then((res) => { - this.setData({ - ebookCount: res.totalCount - res.usedCount - }) - if (!item.electronDisabled) { - this.getAlreadyBookList(item, 'eBook') + wx.showModal({ + title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰� + content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹� + success: function (res) { + if (res.confirm) { + wx.navigateTo({ + url: "/packageDomain/pages/teacherCertification/index", + }); + } } }) + } }, - getAlreadyBookList(item, type) { + // 娣诲姞鏍蜂功 + addBookFun(item, type) { let itemAttr = null - let isHas = false + const eList = this.data.electronicBookList; + const pList = this.data.paperBookList; itemAttr = { id: item.id, title: item.name || '-', @@ -880,146 +935,27 @@ isbn: item.isbn || '-', publicationDate: item.publicationDate } - if (type == 'eBook') { - if (this.data.ebookCount > 0) { - const eBookData = this.data.electronicBookList - if (eBookData.length == 2) { - item.electronChecked = false - wx.showToast({ - title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�", - icon: 'none', - duration: 1000, - }) - return false - } - if (eBookData.length > 0) { - for (let i = 0; i < eBookData.length; i++) { - if (eBookData[i].id == item.id) { - isHas = true - } - } - if (!isHas) { - wx.showToast({ - title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~", - icon: "none", - duration: 1000, - }) - this.setData({ - electronicBookList: [...this.data.electronicBookList, ...[itemAttr]], - num: this.data.electronicBookList.length + this.data.paperBookList.length - }) - wx.setStorageSync("electronicBookList", this.data.electronicBookList); - } else { - let list = this.data.electronicBookList; - list.forEach((obj, index) => { - if (obj.id == item.id) { - list.splice(index, 1); - } - }) - item.electronChecked = false - wx.showToast({ - title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�", - icon: "none", - duration: 1000, - }) - this.setData({ - electronicBookList: list, - num: list.length + this.data.paperBookList.length - }) - wx.setStorageSync("electronicBookList", list); - } - } else { - wx.showToast({ - title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~", - icon: "none", - duration: 1000, - }) - this.setData({ - electronicBookList: [itemAttr], - num: 1 + this.data.paperBookList.length - }) - wx.setStorageSync("electronicBookList", [itemAttr]); - } - } else { - item.electronChecked = false - wx.showToast({ - title: "鎮ㄧ殑鐢靛瓙鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠$悊鍛橈紒", - icon: "none", - duration: 1000, - }) - } + eList.push(itemAttr) + this.setData({ + electronicBookList: eList, + }) + wx.setStorageSync("electronicBookList", eList); } else { - if (this.data.paperBookCount > 0) { - const pBookData = this.data.paperBookList - if (pBookData.length == 2) { - item.paperChecked = false - wx.showToast({ - title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�", - icon: 'none', - duration: 1000, - }) - return false - } - if (pBookData.length > 0) { - for (let i = 0; i < pBookData.length; i++) { - if (pBookData[i].id == item.id) { - isHas = true - } - } - if (!isHas) { - item.paperChecked = true - wx.showToast({ - title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~", - icon: 'none', - duration: 1000, - }) - this.setData({ - paperBookList: [...this.data.paperBookList, ...[itemAttr]], - num: this.data.paperBookList.lenght + this.data.electronicBookList.length - }) - wx.setStorageSync("paperBookList", this.data.paperBookList); - } else { - let list = this.data.paperBookList; - list.forEach((obj, index) => { - if (obj.id == item.id) { - list.splice(index, 1); - } - }) - item.paperChecked = false - wx.showToast({ - title: "宸蹭粠鏍蜂功鐢宠鍗曠Щ闄�", - icon: "none", - duration: 1000, - }) - this.setData({ - paperChecked: list, - num: list.length + this.data.electronicBookList.length - }) - wx.setStorageSync("paperBookList", list); - } - } else { - item.paperChecked = true; - wx.showToast({ - title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~", - icon: 'none', - duration: 1000, - }) - this.setData({ - paperBookList: [itemAttr], - num: 1 + this.data.electronicBookList.length - }) - wx.setStorageSync("paperBookList", [itemAttr]); - } - } else { - item.paperChecked = false - wx.showToast({ - title: "鎮ㄧ殑绾歌川鏍蜂功鐢宠娆℃暟宸茬敤灏斤紝鑻ヨ缁х画锛岃鑱旂郴绠$悊鍛橈紒", - icon: 'none', - duration: 1000, - }) - } + pList.push(itemAttr) + this.setData({ + paperBookList: pList, + }) + wx.setStorageSync("paperBookList", pList); } + this.setData({ + num: this.data.num + 1 + }) + wx.showToast({ + title: "娣诲姞鎴愬姛锛屽湪鏍蜂功鐢宠鍗曠瓑鎮ㄥ摝~", + icon: "none", + duration: 1000, + }) }, //鍘绘牱涔︾敵璇峰崟 goApply() { @@ -1027,6 +963,19 @@ url: "/packageDomain/pages/sampleBookList/applicationForm/index", }); }, + + // 鐩戝惉婊氬姩璺濈 + onPageScroll(e) { + if (e && e.scrollTop >= 1000) { + this.setData({ + isBackTop: true + }) + } else { + this.setData({ + isBackTop: false + }) + } + }, /** * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜� */ -- Gitblit v1.9.1