From 608eefe5fb03d2f3d3145b11d7de573434451e76 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期五, 29 三月 2024 19:42:58 +0800 Subject: [PATCH] 详情页bug修改 --- packageBookService/pages/bookServices/detail/index.js | 403 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 242 insertions(+), 161 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js index 69057b1..dfc5171 100644 --- a/packageBookService/pages/bookServices/detail/index.js +++ b/packageBookService/pages/bookServices/detail/index.js @@ -1,7 +1,9 @@ // pages/bookServices/detail/index.js -import Message from 'tdesign-miniprogram/message/index.js'; import Toast from 'tdesign-miniprogram/toast'; -import tool from '../../../../assets/js/toolClass' +import tool from '../../../../assets/js/toolClass'; +import { + loginInfo +} from '../../../../assets/js/login' const app = getApp(); Page({ /** @@ -34,17 +36,20 @@ openTeachids: [], openLearnids: [], openTestids: [], - applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈 + applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈 resourceClassList: [], // 璧勬簮鎵�灞炲垎绫� - applyState: "", // 鏁欏璧勬簮鐢宠鐘舵�� - deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡 - rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜 + applyState: "", // 鏁欏璧勬簮鐢宠鐘舵�� + deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡 + rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜 buyIdList: [], shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃 shoppingList: [], loading: false, - isShowTeachDownload: false, // 鎻愮ずPC涓嬭浇寮圭獥鐘舵�� - confirmBtn: { content: '鎴戠煡閬撲簡', variant: 'base' }, + isShowTeachDownload: false, // 鎻愮ずPC涓嬭浇寮圭獥鐘舵�� + confirmBtn: { + content: '鎴戠煡閬撲簡', + variant: 'base' + }, mockData: { id: 0, // 閿�鍞甶d price: 0, // 鍞环 @@ -55,9 +60,9 @@ }, flag: true, noResources: false, - selectedIds: "",//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮� + selectedIds: "", //鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮� bookBuy: false, //鍟嗗搧鎴栧瓙鍟嗗搧鏄惁璐拱 - expire: false,//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮忔槸鍚﹁繃鏈� + expire: false, //鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮忔槸鍚﹁繃鏈� noFile: false, //鍟嗗搧鎴栧瓙鍟嗘湁鏃犵數瀛愪功鏂囦欢 num: 0, //鏍蜂功鐢宠鍗曟暟閲� alreadyPaperBookList: [], //宸茬敵璇风焊璐ㄦ牱涔� @@ -67,15 +72,55 @@ paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁� ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁� userInfo: {}, + pageLoading: true, fileInfo: { bookName: "", fileType: "", md5: "", freePage: "" - }, //闃呰鍣ㄦ暟鎹� + }, //闃呰鍣ㄦ暟鎹� buyResourceData: { productLinkPath: '', refCode: '', + }, + briefIcon: { + name: "/static/images/bookService/detail/tushujianjie-g.png" + }, + briefIconClick: { + name: '/static/images/bookService/detail/tushujianjie-click.png' + }, + eBookIcon: { + name: '/static/images/bookService/detail/ebook-g.png' + }, + eBookClickIcon: { + name: '/static/images/bookService/detail/ebook-click.png' + }, + teachResourcesIcon: { + name: '/static/images/bookService/detail/jiaoxueziyuan.png' + }, + teachResourcesClickIcon: { + name: '/static/images/bookService/detail/jiaoxueziyuan-click.png' + }, + learnResourceIcon: { + name: '/static/images/bookService/detail/yunxuexi.png' + }, + learnResourceClickIcon: { + name: '/static/images/bookService/detail/yunxuexi-click.png' + }, + testResourceIocn: { + name: '/static/images/bookService/detail/test-icon-g.png' + }, + testResourceClickIocn: { + name: '/static/images/bookService/detail/test-click-icon.png' + }, + noteIcon: { + name: '/static/images/bookService/detail/biji-icon-g.png' + }, + noteClickIcon: { + name: '/static/images/bookService/detail/biji-click-icon.png' + }, + icon1: { + name: "/static/images/bookService/detail/dangdang.png" } }, @@ -90,6 +135,22 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(options) { + + // 妫�鏌ョ櫥褰曠姸鎬� + // const token = wx.getStorageSync(app.config.tokenKey) + // if (!token) { + // loginInfo(app, (data) => { + // // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋� + // if (data) { + // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue + // } else { + // // 鍑虹幇閿欒锛岃繑鍥瀎alse + // } + // }) + // } else { + // // 濡傛灉鏄涓�娆$櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽~鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級 + // } + const systInfo = wx.getSystemInfoSync(); const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅 const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴� @@ -107,7 +168,7 @@ this.getBookInfo(options.id); this.getResourceClass() // 鑾峰彇璧勬簮鎵�灞炲垎绫� - const token = wx.getStorageSync('jsek-token') + const token = wx.getStorageSync(app.config.tokenKey) if (token) { this.getShoppingCartProductGet() this.getApplyInfo(options.id) @@ -118,6 +179,20 @@ userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey)) }) } + + }, + + /** + * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚 + */ + onReady() { + + }, + + /** + * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず + */ + onShow() { if (wx.getStorageSync("paperBookList")) { this.setData({ paperBookList: wx.getStorageSync("paperBookList"), @@ -134,26 +209,14 @@ }, /** - * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚 - */ - onReady() { - - }, - - /** - * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず - */ - onShow() { }, - - /** * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌 */ - onHide() { }, + onHide() {}, /** * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇 */ - onUnload() { }, + onUnload() {}, /** * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔 @@ -176,7 +239,7 @@ /** * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜� */ - onShareAppMessage() { }, + onShareAppMessage() {}, // 鏍煎紡鍖栨棩鏈� formatDate(dateString) { if (!dateString) { @@ -237,7 +300,7 @@ this.setData({ "mockData'.id": 0, "mockData.price": 0, - "mockData.count": 0 + "mockData.count": 0, }) const query = { path: '*', @@ -315,6 +378,7 @@ 'bookDetail.price': this.numFormat(this.data.bookDetail.price), 'bookDetail.oldPrice': this.numFormat(this.data.bookDetail.oldPrice), 'bookDetail.paperPrice': this.numFormat(this.data.bookDetail.paperPrice), + pageLoading: false }); console.log('鍥句功淇℃伅', this.data.bookDetail); }); @@ -441,49 +505,74 @@ }, // 鏀惰棌 setCollect() { - if (this.data.bookDetail.isFavourite) { - app.MG.store - .delProductLink({ + const token = wx.getStorageSync(app.config.tokenKey) + if (!token) { + // 妫�鏌ョ櫥褰曠姸鎬� + loginInfo(app, (data) => { + // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋� + if (data) { + // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue + this.getBookInfo(this.data.bookId) + } else { + // 鍑虹幇閿欒锛岃繑鍥瀎alse + } + }) + } else { + debugger + if (this.data.bookDetail.isFavourite) { + app.MG.store + .delProductLink({ + productIds: [this.data.bookDetail.id], + linkType: 'FavoriteBookCity', + }) + .then(() => { + this.setData({ + 'bookDetail.isFavourite': false + }) + }); + } else { + const params = { productIds: [this.data.bookDetail.id], linkType: 'FavoriteBookCity', - }) - .then(() => { + }; + app.MG.store.addProductLink(params).then((res) => { this.setData({ - 'bookDetail.isFavourite': false + 'bookDetail.isFavourite': true }) - Message.success({ - context: this, - offset: [20, 32], - duration: 5000, - content: '杩欐槸涓�鏉℃垚鍔熺殑鎻愮ず娑堟伅', - }); }); - } else { - const params = { - productIds: [this.data.bookDetail.id], - linkType: 'FavoriteBookCity', - }; - app.MG.store.addProductLink(params).then((res) => { - this.setData({ - 'bookDetail.isFavourite': true - }) - Message.success({ - context: this, - offset: ['20rpx', '32rpx'], - duration: 2000, - content: '鏀惰棌鎴愬姛', - }); - }); + } } + }, // 鎴戣寤鸿 suggestBtn() { + // 妫�鏌ョ櫥褰曠姸鎬� + const token = wx.getStorageSync(app.config.tokenKey) const child = this.selectComponent('#suggest-component') - child.showDialog() + if (!token) { + wx.showLoading({ + title: '鍔犺浇涓�', + }) + loginInfo(app, (data) => { + // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋� + if (data) { + // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue + child.showDialog() + wx.hideLoading() + } else { + // 鍑虹幇閿欒锛岃繑鍥瀎alse + } + }) + } else { + // 濡傛灉鏄涓�娆$櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽~鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級 + child.showDialog() + } }, // 璺宠浆缃戝簵 goShop(e) { - const { link } = e.currentTarget.dataset; + const { + link + } = e.currentTarget.dataset; wx.navigateTo({ url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`, }) @@ -502,9 +591,9 @@ 'buyResourceData.refCode': checkData.refCode }) } - if ((e.detail.value == 'jsek_teachingResources' && !this.data.teach.length) - || (e.detail.value == 'jsek_cloudLearning' && !this.data.learn.length) - || (e.detail.value == 'questionBank' && !this.data.test.length)) { + if ((e.detail.value == 'jsek_teachingResources' && !this.data.teach.length) || + (e.detail.value == 'jsek_cloudLearning' && !this.data.learn.length) || + (e.detail.value == 'questionBank' && !this.data.test.length)) { this.getResourceData(checkData) } } else { @@ -513,20 +602,18 @@ }) } } else if (e.detail.label == '浜戠瑪璁�') { - const token = wx.getStorageSync('jsek-token') + const token = wx.getStorageSync(app.config.tokenKey) const child = this.selectComponent('#note') child.handleSubmitTitle() if (token) { child.changeLoading() child.getNoteList() } - } else if (e.detail.label == '鐢靛瓙涔�') { const child = this.selectComponent('#eBook') if (child) { child.getProgress() } - } }, // 鑾峰彇璧勬簮鎵�灞炲垎绫� @@ -729,9 +816,7 @@ // 鍥句功娣诲姞璐墿杞� async addBookShopcCar() { - if (!this.data.expire) { - const token = wx.getStorageSync('jsek-token') if (!token) { return wx.getUserProfile({ @@ -760,13 +845,11 @@ console.log(determine); if (!determine) { let query = { - requests: [ - { - saleMethodId: this.data.selectedIds, - storeEventId: null, - agentCode: '鐢靛瓙涔�' - } - ] + requests: [{ + saleMethodId: this.data.selectedIds, + storeEventId: null, + agentCode: '鐢靛瓙涔�' + }] } const addRes = app.MG.store.addShoppingCart(query) this.showSuccessToast() @@ -775,8 +858,8 @@ Toast({ context: this, selector: '#t-toast', - message: '宸叉坊鍔�', - theme: 'success', + message: '璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞', + theme: 'warning', direction: 'column', }); } @@ -802,16 +885,15 @@ }, async buyBook() { + console.log(this.data.bookItemDetail.defaultSaleMethodId, 'this.data.bookItemDetail.defaultSaleMethodId'); if (!this.data.expire) { let bookOrdersId = '' let query = { remarks: '鐢靛瓙涔�', - requests: [ - { - saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ? this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId, - count: 1 - } - ] + requests: [{ + saleMethodId: this.data.bookItemDetail.defaultSaleMethodId ? this.data.bookItemDetail.defaultSaleMethodId : this.data.bookDetail.defaultSaleMethodId, + count: 1 + }] } // 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉 const res = await app.MG.store.initOrder(query) @@ -935,14 +1017,12 @@ cmsTypeRefCode: '', newDataListRequest: [], name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О - content: JSON.stringify([ - { - name: this.data.bookDetail.name, - id: this.data.bookDetail.id, - // defaultSaleMethodId: bookData.value.defaultSaleMethodId, - icon: this.data.bookDetail.icon - } - ]) + content: JSON.stringify([{ + name: this.data.bookDetail.name, + id: this.data.bookDetail.id, + // defaultSaleMethodId: bookData.value.defaultSaleMethodId, + icon: this.data.bookDetail.icon + }]) } app.MG.ugc.newTopicMessage(query).then(async (res) => { if (res) { @@ -1156,54 +1236,57 @@ // 浜戝涔犱竴閿鍙� async getFreeResource() { const child = this.selectComponent('#learn-resource') - const token = wx.getStorageSync('jsek-token') + const token = wx.getStorageSync(app.config.tokenKey) if (!token) { - return wx.getUserProfile({ - desc: '鐢ㄦ埛鐧诲綍', - success: (res) => { - console.log(res); + loginInfo(app, (data) => { + // 濡傛灉涓嶆槸绗竴娆$櫥褰曪紝浼氭墽琛屽洖璋� + if (data) { + // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue + } else { + // 鍑虹幇閿欒锛岃繑鍥瀎alse } }) - } - let arr = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item)) - let freeIds = arr.filter((item) => { - return item.saleMethod[0].Price == 0 - }) - if (!freeIds.length) return wx.showToast({ - icon: "error", - title: '鏆傛棤鍏嶈垂璧勬簮', - }) - child.changeReceive(true) - let requests = [] - freeIds.forEach((item, index) => { - if (this.resourceIsBuy(item)) { - requests.push({ - saleMethodId: item.saleMethod[0].Id, - count: 1 - }) - } - }) + } else { + let arr = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item)) + let freeIds = arr.filter((item) => { + return item.saleMethod[0].Price == 0 + }) + if (!freeIds.length) return wx.showToast({ + icon: "error", + title: '鏆傛棤鍏嶈垂璧勬簮', + }) + child.changeReceive(true) + let requests = [] + freeIds.forEach((item, index) => { + if (this.resourceIsBuy(item)) { + requests.push({ + saleMethodId: item.saleMethod[0].Id, + count: 1 + }) + } + }) - let query = { - remarks: '浜戝涔�', - requests, - } - try { - const initOrderRes = await app.MG.store.initOrder(query) - let parameter = { - orderNum: initOrderRes.orderNumber + let query = { + remarks: '浜戝涔�', + requests, } - // 纭璁㈠崟 - const confirmOrderRes = await app.MG.store.confirmOrder(parameter) - if (confirmOrderRes.orderNumber) { - child.changeReceive(false) - wx.showToast({ - title: '棰嗗彇鎴愬姛', - }) - this.getBookInfo(this.data.bookId) + try { + const initOrderRes = await app.MG.store.initOrder(query) + let parameter = { + orderNum: initOrderRes.orderNumber + } + // 纭璁㈠崟 + const confirmOrderRes = await app.MG.store.confirmOrder(parameter) + if (confirmOrderRes.orderNumber) { + child.changeReceive(false) + wx.showToast({ + title: '棰嗗彇鎴愬姛', + }) + this.getBookInfo(this.data.bookId) + } + } catch (error) { + console.log(error) } - } catch (error) { - console.log(error) } }, // 浜戝涔犱竴閿喘涔� @@ -1293,9 +1376,9 @@ if (new RegExp('(' + k + ')').test(fmt)) { fmt = fmt.replace( RegExp.$1, - RegExp.$1.length == 1 - ? (o)[k] - : ('00' + (o)[k]).substr(('' + (o)[k]).length) + RegExp.$1.length == 1 ? + (o)[k] : + ('00' + (o)[k]).substr(('' + (o)[k]).length) ) } } @@ -1348,12 +1431,10 @@ try { let query = { remarks: '缁勫嵎', - requests: [ - { - saleMethodId: this.data.mockData.id, - count: 1 - } - ] + requests: [{ + saleMethodId: this.data.mockData.id, + count: 1 + }] } if (this.data.flag) { this.setData({ @@ -1368,7 +1449,9 @@ } else { // 0鍏冪洿鎺ラ鍙� // 纭璁㈠崟 - const confirmOrderRes = await app.MG.store.confirmOrder({ orderNum: res.orderNumber }) + const confirmOrderRes = await app.MG.store.confirmOrder({ + orderNum: res.orderNumber + }) if (confirmOrderRes) { wx.showToast({ icon: "success", @@ -1388,33 +1471,33 @@ recordBuyMock() { const num = this.data.mockData.mockList.length const id = tool.uuid(8) - const createDate = new Date().getTime() + const createDate = this.DateFormat(new Date().getTime(), 'yyyy-MM-dd') const mockList = this.data.mockData.mockList - mockList.push({ id, createDate, name: `绗�${num + 1}濂楄瘯鍗穈, state: '0' }) + mockList.push({ + id, + createDate, + name: `绗�${num + 1}濂楄瘯鍗穈, + state: '0' + }) this.setData({ 'mockData.mockList': mockList }) // 璁板綍璐拱鏃堕棿锛屽苟璁剧姸鎬乻tate涓�1锛岃〃绀哄垰璐拱瀹屾垚缁勫嵎 app.MG.identity.setUserKey({ - setKeyRequests: [ - { - domain: 'mockData', - key: this.data.bookDetail.id + '', - value: JSON.stringify(this.data.mockData.mockList) - } - ] + setKeyRequests: [{ + domain: 'mockData', + key: this.data.bookDetail.id + '', + value: JSON.stringify(this.data.mockData.mockList) + }] }) }, // 搴曢儴璐拱鎸夐挳 buyBtn() { - if (this.data.tabValue == 'brief') { + if (this.data.tabValue == 'brief' && !this.data.bookBuy) { this.buyBook() - } - else if (this.data.tabValue == 'jsek_cloudLearning') { + } else if (this.data.tabValue == 'jsek_cloudLearning') { const tree = this.selectComponent('#tree') tree.onCloudShoppingCart() - } else if (this.data.tabValue == 'questionBank') { - this.buyMock() } else { console.log(this.data.tabValue); } @@ -1430,7 +1513,7 @@ return false; } wx.navigateTo({ - url: '/packageBookService/pages/components/webView/index?md5=' + this.data.fileInfo.md5 + '&fileName=' + this.data.fileInfo.bookName + '&fileType=' + this.data.fileInfo.fileType + '&freePage=' + this.data.fileInfo.freePage + url: '/packageBookService/pages/components/webView/index?md5=' + this.data.fileInfo.md5 + '&fileName=' + this.data.fileInfo.bookName + '&fileType=' + this.data.fileInfo.fileType + '&freePage=' + this.data.fileInfo.freePage + '&bookBuy=' + this.data.bookBuy }) }, @@ -1462,8 +1545,7 @@ wx.navigateTo({ url: "/packageDomain/pages/teacherCertification/index", }); - } else if (res.cancel) { - } + } else if (res.cancel) {} } }) } @@ -1492,8 +1574,7 @@ wx.navigateTo({ url: "/packageDomain/pages/teacherCertification/index", }); - } else if (res.cancel) { - } + } else if (res.cancel) {} } }) } @@ -1747,4 +1828,4 @@ teach: tree }) }, -}) +}) \ No newline at end of file -- Gitblit v1.9.1