From 7adfe5210fad2b4ab1b1be41e2d58eb3dd9b2b1a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 09:38:22 +0800
Subject: [PATCH] 代码合并
---
packageBookService/pages/bookServices/detail/index.js | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 94ce20c..07ab18a 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -418,9 +418,13 @@
selectedIds: res.datas[0].defaultSaleMethod.id,
bookBuy: res.datas[0].purchasedSaleMethodIdList.indexOf(res.datas[0].defaultSaleMethodId) > -1
});
+ console.log(res);
+ console.log(res.datas[0].defaultSaleMethod.endDate, 'res.datas[0].defaultSaleMethod.endDate');
+ console.log(res.datas[0].defaultSaleMethod.beginDate, 'res.datas[0].defaultSaleMethod.beginDate');
console.log(this.data.bookItemDetail, 'bookItemData.value');
let times = new Date(res.datas[0].defaultSaleMethod.endDate).getTime()
let startTime = new Date(res.datas[0].defaultSaleMethod.beginDate).getTime()
+
if (times < new Date().getTime() || new Date().getTime() < startTime) {
this.setData({
expire: true
@@ -821,15 +825,7 @@
// 鍥句功娣诲姞璐墿杞�
async addBookShopcCar() {
if (!this.data.expire) {
- const token = wx.getStorageSync('jsek-token')
- if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
- }
- })
- }
+
const shoppingCartGetId = []
@@ -1537,7 +1533,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 + '&bookBuy=' + this.data.bookBuy
+ 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 + '&bookId=' + this.data.bookDetail.id
})
},
--
Gitblit v1.9.1