From e060ad2b2da9884e00b36796548eacc6a2b9a5d3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 29 三月 2024 09:44:30 +0800
Subject: [PATCH] 图书详情，列表页bug修改
---
packageBookService/pages/bookServices/detail/index.js | 205 ++++++++++++++++++++++++++++++--------------------
1 files changed, 123 insertions(+), 82 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 91a8109..969db46 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({
/**
@@ -70,6 +72,7 @@
paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁�
ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁�
userInfo: {},
+ pageLoading: true,
fileInfo: {
bookName: "",
fileType: "",
@@ -132,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; // 瀵艰埅鏍忛珮搴�
@@ -149,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)
@@ -281,7 +300,7 @@
this.setData({
"mockData'.id": 0,
"mockData.price": 0,
- "mockData.count": 0
+ "mockData.count": 0,
})
const query = {
path: '*',
@@ -359,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);
});
@@ -485,45 +505,68 @@
},
// 鏀惰棌
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) {
@@ -559,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()
}
-
}
},
// 鑾峰彇璧勬簮鎵�灞炲垎绫�
@@ -775,9 +816,7 @@
// 鍥句功娣诲姞璐墿杞�
async addBookShopcCar() {
-
if (!this.data.expire) {
-
const token = wx.getStorageSync('jsek-token')
if (!token) {
return wx.getUserProfile({
@@ -1197,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)
}
},
// 浜戝涔犱竴閿喘涔�
@@ -1453,8 +1495,7 @@
buyBtn() {
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 {
--
Gitblit v1.9.1