From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index 7bef3b4..b401c58 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -85,10 +85,21 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options);
this.setData({
digitalTextId: options.id
})
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.digitalTextbooksDetailsGet(this.data.digitalTextId)
+ this.getType()
+ this.getCertificateList()
+ } else {
+
+ }
+ })
+ }
this.digitalTextbooksDetailsGet(this.data.digitalTextId)
this.getType()
this.getCertificateList()
@@ -188,9 +199,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
digitalTextbooksDetailsGet(digitalId) {
@@ -238,7 +248,7 @@
isBuy: false
})
}
- res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈圖D鏃�')
+ res.datas.publicationDate = res.datas.publicationDate ? moment(res.datas.publicationDate).format('YYYY骞碝M鏈�') : ''
if (res.datas.icon == '') {
res.datas.icon = '/static/images/default-book-img.png'
}
@@ -266,7 +276,6 @@
}
this.getAboutBook(res.datas.productLinkInfo[res.datas.productLinkInfo.length - 1].LinkPath)
- console.log(this.data.isBuy);
this.setData({
loading: false,
type: 'basicInformation',
@@ -304,12 +313,8 @@
this.setData({
tabValue: event.detail.value,
})
- console.log(this.data.tabValue);
},
- onTabsClick(event) {
- // console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
- },
// 鑾峰彇鐩稿叧鏁欐潗
getAboutBook(path) {
let query = {
@@ -351,7 +356,6 @@
this.setData({
relatedBookData: bookArr
})
- console.log(this.data.relatedBookData);
} else {
this.setData({
relatedBookData: []
@@ -403,7 +407,7 @@
Toast({
context: this,
selector: "#t-toast",
- message: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞",
+ message: "璇ユ暀鏉愬凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
theme: "warning",
direction: "column",
});
@@ -441,7 +445,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -467,9 +470,7 @@
url,
});
}
- } else {
- console.log(222);
- }
+ } else {}
} else {
wx.showToast({
title: "鍟嗗搧涓嶅湪鏈夋晥鏈�",
@@ -479,8 +480,6 @@
}
},
- // console.log(item, app.config.textReaderUrl);
- // console.log(token);
goRead() {
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
@@ -516,8 +515,6 @@
},
onTabClick(e) {
- // debugger
- console.log(e);
let tab = e.currentTarget.dataset.tab;
this.setData({
@@ -553,7 +550,6 @@
onScroll(e) {
let scrollTop = e.detail.scrollTop
- console.log(scrollTop);
// this.setData({
// type: scrollTop
// })
@@ -588,10 +584,8 @@
let that = this;
var query = wx.createSelectorQuery()
- console.log(query, '12355');
//鑾峰彇鏉垮潡涓�绂籹croll-view椤堕儴鐨勮窛绂�,绗竴鏉垮潡瀹為檯璺濈涓�0锛屾澶勮幏鍙栧彧涓虹粰绗簩鍙婄涓夋澘鍧楀噺鍘荤涓�鏉垮潡璺濈scroll-view鐨勯《閮ㄨ窛绂�
wx.createSelectorQuery().select('#basicInformation').boundingClientRect(function (res) {
- console.log(res, '456882588');
that.basicInformation = res.top
}).exec()
//鑾峰彇鏉垮潡浜岀scroll-view椤堕儴鐨勮窛绂�
@@ -612,7 +606,6 @@
}).exec()
},
setCoolect() {
- console.log(456);
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
@@ -676,7 +669,6 @@
suggestBtn() {
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
- console.log(465);
const child = this.selectComponent("#suggest-component1");
if (token)
// child.showDialog();
@@ -720,14 +712,14 @@
},
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
// if (!this.data.isLearn) {
// wx.showToast({
// title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
@@ -736,14 +728,14 @@
// });
// return false
// }
- // if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
- // wx.showToast({
- // title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
+ wx.showToast({
+ title: this.data.isCertificate.state == 'WaitAudit' ? "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�" : this.data.isCertificate.state == 'Normal' ? '鎮ㄥ凡鐢宠璇佷功' : '',
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
var page = getCurrentPages().pop(); // 鑾峰彇褰撳墠椤甸潰瀹炰緥
page.setData({
@@ -827,6 +819,10 @@
},
confirmM() {
+ let currentDate = new Date()
+ let year = currentDate.getFullYear()
+ let month = currentDate.getMonth() + 1
+ let day = currentDate.getDate()
if (this.data.userInfo.fullName) {
if (this.data.pictureMd5 == '') {
wx.showToast({
@@ -844,8 +840,11 @@
author: this.data.digitalsData.author,
ISBN: this.data.digitalsData.isbn,
publicationDate: this.data.digitalsData.publicationDate,
+ publicationDate: this.data.digitalsData.publicationDate,
+ userName: this.data.userInfo.fullName,
userPicture: this.data.pictureMd5,
- certificate: this.data.rzzsImg
+ studyTime: this.data.digitalsData.beginDate + '-' + year + '-' + month + '-' + day,
+ website: this.data.website
}
data = {
topicIdOrRefCode: 'applyTextbookCertificate',
--
Gitblit v1.9.1