From 4c29b79d485d68d506e798f4fd381232ebc55a86 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 14 九月 2024 11:27:33 +0800
Subject: [PATCH] bug
---
pages/retrievalPage/index.js | 149 +++++++++++++++++++++++++++++++++----------------
1 files changed, 99 insertions(+), 50 deletions(-)
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 4346ab2..29f5b3d 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -38,48 +38,48 @@
page: 1,
total: 0,
},
- tabValue: 0,
+ tabValue: '0',
tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
// tab閫夐」
tabList: [{
title: "鍥句功",
index: "0",
- // bookTotal: this.data.bookTotal
+ bookTotal: 0
},
{
title: "璇剧▼",
index: "1",
- // bookTotal: this.data.courseTotal
+ bookTotal: 0
},
{
title: "鏁板瓧鏁欐潗",
index: "2",
- // bookTotal: this.data.digitalTextbooksTotal
+ bookTotal: 0
}, {
title: "涓撻",
index: "3",
- // bookTotal: this.data.seminarTotal
+ bookTotal: 0
},
{
title: "涔︾洰",
index: "4",
- // bookTotal: this.data.bookFairTotal
+ bookTotal: 0
},
{
title: "涔﹀睍",
index: "5",
- // bookTotal: this.data.biblioClassificationTotal
+ bookTotal: 0
},
],
tabsId: 0, //榛樿閫夊瀷涓鸿澶�
-
+ height: '',
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding: 0 0 0 16rpx;height:70rpx',
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(app.config.appId);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -96,8 +96,52 @@
}
}
this.onTabsChange(e)
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.getUserInfo()
+ }
+ })
+ } else {
+ this.getUserInfo()
+ }
+ var that = this;
+ // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+ wx.getSystemInfo({
+ success: (result) => {
+ that.setData({
+ height: result.windowHeight
+ });
+ },
+ })
},
-
+ // 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
+ getUserInfo() {
+ app.MG.identity.getCurrentAppUser().then(res => {
+ // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
+ if (res) {
+ //鑾峰彇鐢ㄦ埛绫诲瀷
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
+ let eMailData = res.secretList.find(i => i.type == 'EMail')
+ if (eMailData) {
+ this.setData({
+ input: eMailData.credential
+ })
+ } else if (teacherRole && teacherInfos) {
+ this.setData({
+ input: JSON.parse(teacherInfos.data).email
+ })
+ } else {
+ this.setData({
+ input: ''
+ })
+ }
+ }
+ });
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -143,9 +187,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
goBack() {
wx.navigateBack();
},
@@ -161,7 +204,6 @@
//鏍囩鐨勫垏鎹�
onTabsChange(event) {
const value = event.detail.value
- console.log(value);
this.setData({
tabValue: value,
isMore: false
@@ -193,7 +235,8 @@
'Name*': this.data.searchVal.trim(),
'||author*': this.data.searchVal.trim(),
'||isbn*': this.data.searchVal.trim(),
- '||seriesName*': this.data.searchVal.trim()
+ '||seriesName*': this.data.searchVal.trim(),
+ '||projectLeader*': this.data.searchVal.trim()
}
}
@@ -235,7 +278,8 @@
'Name*': this.data.searchVal.trim(),
'||author*': this.data.searchVal.trim(),
'||isbn*': this.data.searchVal.trim(),
- '||seriesName*': this.data.searchVal.trim()
+ '||seriesName*': this.data.searchVal.trim(),
+ '||projectLeader*': this.data.searchVal.trim()
}
}
//璇剧▼
@@ -418,7 +462,6 @@
method: 'post',
data: body
}).then((resp) => {
- console.log(resp, 'resp');
//鍥句功 0
const data1 = resp[0]
const datas1 = handleQueryResourceListData({
@@ -428,6 +471,7 @@
this.setData({
bookData: datas1,
bookTotal: data1.totalCount,
+ [`tabList[${0}].bookTotal`]: data1.totalCount
})
//鏁板瓧璇剧▼ 1
const data2 = resp[1]
@@ -437,7 +481,8 @@
})
this.setData({
courseData: datas2,
- courseTotal: data2.totalCount
+ courseTotal: data2.totalCount,
+ [`tabList[${1}].bookTotal`]: data2.totalCount
})
// 鏁板瓧鏁欐潗 2
const data3 = resp[2]
@@ -447,7 +492,8 @@
})
this.setData({
digitalTextbooksData: datas3,
- digitalTextbooksTotal: data3.totalCount
+ digitalTextbooksTotal: data3.totalCount,
+ [`tabList[${2}].bookTotal`]: data3.totalCount
})
// 涓撻鐮旇 3
const data4 = resp[3]
@@ -457,7 +503,8 @@
})
this.setData({
seminarData: datas4,
- seminarTotal: data4.totalCount
+ seminarTotal: data4.totalCount,
+ [`tabList[${3}].bookTotal`]: data4.totalCount
})
// 涔﹀睍 4
const data5 = resp[4]
@@ -468,10 +515,10 @@
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
})
- // console.log(datas5, 'sadasd');
this.setData({
biblioClassificationData: datas5,
- biblioClassificationTotal: data5.totalCount
+ biblioClassificationTotal: data5.totalCount,
+ [`tabList[${5}].bookTotal`]: data5.totalCount
})
this.setData({
loading: false,
@@ -515,7 +562,8 @@
this.setData({
bookFairData: res.datas,
- bookFairTotal: res.total
+ bookFairTotal: res.total,
+ [`tabList[${4}].bookTotal`]: res.total
})
})
@@ -525,7 +573,6 @@
const item = event.currentTarget.dataset.item;
const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
- console.log(URL, 'URL');
setTimeout(() => {
if (URL) {
item.determine = true
@@ -550,24 +597,48 @@
}
});
},
+ openBookFair(event) {
+ const item = event.currentTarget.dataset.item
+ if (item.fileType == "pdf") {
+ wx.navigateTo({
+ url: "/packageBookService/pages/components/webView/index?md5=" +
+ item.freeFile +
+ "&fileName=" +
+ item.name +
+ "&fileType=" +
+ item.fileType + "&bookBuy=true"
+ // "&freePage=" +
+ // this.data.fileInfo.freePage +
+
+ +
+ "&bookId=" +
+ item.id,
+ });
+ } else {
+ Toast({
+ context: this,
+ selector: '#t-toast',
+ message: '姝や功涓嶈兘鏌ョ湅',
+ theme: 'warning',
+ direction: 'column',
+ });
+ }
+ },
onSearchSubmit() {
this.setData({
loading: true,
hidden: true,
})
- console.log(this.data.searchVal);
this.retrievalPageGet()
this.bibliographyGet()
},
onBook(e) {
- console.log(e.currentTarget.dataset.item);
const item = e.currentTarget.dataset.item
wx.navigateTo({
url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
})
},
onBookExhibitionDetails(e) {
- console.log(e.currentTarget.dataset.item);
const item = e.currentTarget.dataset.item
wx.navigateTo({
@@ -583,9 +654,7 @@
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom(e) {
- console.log(this.data.tabValue);
if (this.data.tabValue == 0) {
- console.log(0);
if (this.data.bookData.length < this.data.bookTotal) {
this.setData({
isMore: true,
@@ -623,7 +692,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 2) {
if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
@@ -643,7 +711,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 3) {
if (this.data.seminarData.length < this.data.seminarTotal) {
this.setData({
@@ -661,7 +728,6 @@
})
}, 100)
}
- console.log(3);
} else if (this.data.tabValue == 4) {
if (this.data.bookFairData.length < this.data.bookFairTotal) {
this.setData({
@@ -679,7 +745,6 @@
})
}, 100)
}
- console.log(4);
} else if (this.data.tabValue == 5) {
if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
this.setData({
@@ -702,7 +767,6 @@
// 涓嬫媺鍑芥暟
onPullDownRefresh() {
- console.log(456);
if (this.data.tabValue == 4) {
this.setData({
"pageCount.page": 1
@@ -725,13 +789,11 @@
},
// 閭鐐瑰嚮
mailbox(e) {
- console.log(e);
const key = e.currentTarget.dataset.key;
const item = e.currentTarget.dataset.item;
this.setData({
[key]: true,
dialogKey: key,
- input: '',
Md5: item.datas.freeFile.FileList[0].Md5
});
},
@@ -752,8 +814,6 @@
this.setData({
[dialogKey]: false
});
- console.log(this.data.input);
- console.log(this.data.Md5);
if (this.data.input) {
let query = {
eMail: this.data.input,
@@ -779,11 +839,9 @@
this.setData({
[dialogKey]: false
});
- console.log(111);
},
onScrollToLower() {
if (this.data.tabValue == 0) {
- console.log(0);
if (this.data.bookData.length < this.data.bookTotal) {
this.setData({
isMore: true,
@@ -821,7 +879,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 2) {
if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
@@ -841,7 +898,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 3) {
if (this.data.seminarData.length < this.data.seminarTotal) {
this.setData({
@@ -859,7 +915,6 @@
})
}, 100)
}
- console.log(3);
} else if (this.data.tabValue == 4) {
if (this.data.bookFairData.length < this.data.bookFairTotal) {
this.setData({
@@ -877,7 +932,6 @@
})
}, 100)
}
- console.log(4);
} else if (this.data.tabValue == 5) {
if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
this.setData({
@@ -897,12 +951,7 @@
}
}
},
- onTabsClick(event) {
- console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
- },
- tabClick() {
- console.log(2323);
- },
+
// 婊戝姩鏃惰Е鍙戠殑浜嬩欢
slideOn(e) {
// 鎷垮埌褰撳墠绱㈠紩骞跺姩鎬佹敼鍙�
--
Gitblit v1.9.1