From c6c73b7d709322052b9cd6777b3d6657e0d43d30 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期六, 07 九月 2024 14:37:32 +0800
Subject: [PATCH] bug
---
pages/retrievalPage/index.js | 464 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 341 insertions(+), 123 deletions(-)
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 663142c..6886b17 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -1,7 +1,9 @@
// pages/retrievalPage/index.js
import request from '../../assets/request/index'
-import { handleQueryResourceListData } from '../../assets/js/middleGround/tool'
+import {
+ handleQueryResourceListData
+} from '../../assets/js/middleGround/tool'
const app = getApp()
Page({
@@ -9,34 +11,75 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ loading: true,
+ hidden: true,
+ input: '',
+ dialogKey: '',
+ showWithInput: false,
+ showTextAndTitleWithInput: false,
+ downloadLoadin: false,
isMore: null,
- tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
navBarHeight: '',
barHeight: '',
searchVal: '',
- bookData: [], //鍥句功
+ bookData: [], //鍥句功
bookTotal: 0,
- courseData: [], //璇剧▼
+ courseData: [], //璇剧▼
courseTotal: 0,
- digitalTextbooksData: [], //鏁板瓧鏁欐潗
+ digitalTextbooksData: [], //鏁板瓧鏁欐潗
digitalTextbooksTotal: 0,
seminarData: [], //涓撻鐮旇
seminarTotal: 0,
- biblioClassificationData: [],//涔﹀睍
+ biblioClassificationData: [], //涔﹀睍
biblioClassificationTotal: 0,
- bookFairData: [],//涔︾洰
+ bookFairData: [], //涔︾洰
bookFairTotal: 0,
pageCount: {
page: 1,
total: 0,
},
- tabValue: ''
+ tabValue: '0',
+ tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
+ // tab閫夐」
+ tabList: [{
+ title: "鍥句功",
+ index: "0",
+ bookTotal: 0
+ },
+ {
+ title: "璇剧▼",
+ index: "1",
+ bookTotal: 0
+ },
+ {
+ title: "鏁板瓧鏁欐潗",
+ index: "2",
+ bookTotal: 0
+ }, {
+ title: "涓撻",
+ index: "3",
+ bookTotal: 0
+ },
+ {
+ title: "涔︾洰",
+ index: "4",
+ bookTotal: 0
+ },
+ {
+ title: "涔﹀睍",
+ index: "5",
+ bookTotal: 0
+ },
+ ],
+ tabsId: 0, //榛樿閫夊瀷涓鸿澶�
+
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ console.log(app.config.appId);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -45,17 +88,14 @@
barHeight: systInfo.statusBarHeight,
searchVal: options.searchVal
})
-
-
this.retrievalPageGet()
this.bibliographyGet()
- let event = {
+ let e = {
detail: {
-
value: "0"
}
}
- this.onTabsChange(event)
+ this.onTabsChange(e)
},
/**
@@ -118,56 +158,23 @@
this.bibliographyGet()
},
-
//鏍囩鐨勫垏鎹�
onTabsChange(event) {
const value = event.detail.value
- // if (this.data.bookData <= 0 || this.data.courseData <= 0 || this.data.digitalTextbooksData <= 0 || this.data.seminarData <= 0 || this.data.biblioClassificationData <= 0 || this.data.bookFairData <= 0) {
- // this.setData({
- // isMore: true
- // })
- // }
- if (value === '0') {
- this.setData({
- tabValue: value,
- isMore: false
- })
+ console.log(value);
+ this.setData({
+ tabValue: value,
+ isMore: false
+ })
- } else if (value === '1') {
- console.log(value, 'tab');
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '2') {
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '3') {
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '4') {
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '5') {
- this.setData({
- tabValue: value,
- isMore: false
- })
+ if (value === '4') {
+ this.bibliographyGet()
+ } else {
+ this.retrievalPageGet()
}
-
},
-
-
-
retrievalPageGet() {
-
let fields = {
liveTime: [],
lecturer: [],
@@ -186,7 +193,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()
}
}
@@ -195,7 +203,7 @@
let queryBook = {
AccessControl: {
Path: '*',
- StoreRefCode: 'defaultGoodsStore27',
+ StoreRefCode: `defaultGoodsStore${app.config.appId}`,
Type: '*',
LinkType: ''
},
@@ -203,11 +211,9 @@
Start: 0,
Size: this.data.pageCount.page * 9,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -224,17 +230,15 @@
...searchObj,
...fields
}
-
-
let courseObj = {}
if (this.data.searchVal) {
courseObj = {
'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()
}
-
}
//璇剧▼
let queryCourse = {
@@ -248,11 +252,9 @@
Start: 0,
Size: this.data.pageCount.page * 4
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -292,11 +294,9 @@
Start: 0,
Size: this.data.pageCount.page * 9,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -337,11 +337,9 @@
Start: 0,
Size: this.data.pageCount.page * 6,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -381,11 +379,9 @@
Start: 0,
Size: this.data.pageCount.page * 10
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -425,7 +421,6 @@
data: body
}).then((resp) => {
console.log(resp, 'resp');
-
//鍥句功 0
const data1 = resp[0]
const datas1 = handleQueryResourceListData({
@@ -435,12 +430,9 @@
this.setData({
bookData: datas1,
bookTotal: data1.totalCount,
-
+ [`tabList[${0}].bookTotal`]: data1.totalCount
})
-
-
-
-
+ console.log(this.data.tabList, 7777)
//鏁板瓧璇剧▼ 1
const data2 = resp[1]
const datas2 = handleQueryResourceListData({
@@ -449,11 +441,9 @@
})
this.setData({
courseData: datas2,
- courseTotal: data2.totalCount
+ courseTotal: data2.totalCount,
+ [`tabList[${1}].bookTotal`]: data2.totalCount
})
-
-
-
// 鏁板瓧鏁欐潗 2
const data3 = resp[2]
const datas3 = handleQueryResourceListData({
@@ -462,20 +452,19 @@
})
this.setData({
digitalTextbooksData: datas3,
- digitalTextbooksTotal: data3.totalCount
+ digitalTextbooksTotal: data3.totalCount,
+ [`tabList[${2}].bookTotal`]: data3.totalCount
})
-
// 涓撻鐮旇 3
-
const data4 = resp[3]
const datas4 = handleQueryResourceListData({
datas: data4.datas,
fields
})
-
this.setData({
seminarData: datas4,
- seminarTotal: data4.totalCount
+ seminarTotal: data4.totalCount,
+ [`tabList[${3}].bookTotal`]: data4.totalCount
})
// 涔﹀睍 4
const data5 = resp[4]
@@ -483,24 +472,21 @@
datas: data5.datas,
fields
})
-
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,
+ hidden: false,
+ })
})
wx.stopPullDownRefresh()
-
-
-
},
bibliographyGet() {
let bibliographyObj = {}
@@ -537,16 +523,15 @@
this.setData({
bookFairData: res.datas,
- bookFairTotal: res.total
+ bookFairTotal: res.total,
+ [`tabList[${4}].bookTotal`]: res.total
})
})
wx.stopPullDownRefresh()
},
downloadData(event) {
- console.log(111);
const item = event.currentTarget.dataset.item;
- // console.log(item.datas.freeFile.Value);
const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
console.log(URL, 'URL');
@@ -574,7 +559,38 @@
}
});
},
+ 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()
@@ -600,9 +616,10 @@
console.log("涓嬫媺鍒锋柊...");
},
/**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
onReachBottom(e) {
+ console.log(this.data.tabValue);
if (this.data.tabValue == 0) {
console.log(0);
if (this.data.bookData.length < this.data.bookTotal) {
@@ -715,17 +732,13 @@
isMore: false
})
}, 100)
-
}
}
-
-
-
},
// 涓嬫媺鍑芥暟
onPullDownRefresh() {
-
+ console.log(456);
if (this.data.tabValue == 4) {
this.setData({
"pageCount.page": 1
@@ -737,8 +750,213 @@
})
this.retrievalPageGet()
}
-
-
-
},
+
+ underConstruction() {
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 1000
+ })
+ },
+ // 閭鐐瑰嚮
+ 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
+ });
+ },
+ //閭鐨勬牎楠�
+ onEmailInput(e) {
+ const isEmailValid = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ this.setData({
+ emailError: !isEmailValid,
+ "input": e.detail.value,
+ });
+ },
+ //寮圭獥纭
+ onConfirm() {
+ if (!this.data.emailError && this.data.input) {
+ const {
+ dialogKey
+ } = this.data;
+ this.setData({
+ [dialogKey]: false
+ });
+ console.log(this.data.input);
+ console.log(this.data.Md5);
+ if (this.data.input) {
+ let query = {
+ eMail: this.data.input,
+ md5s: [this.data.Md5]
+ }
+ app.MG.file.sendFileWithEmail(query).then(res => {
+ console.log(res);
+ })
+ }
+ } else {
+ // 鏍￠獙涓嶉�氳繃锛岀粰鍑洪敊璇彁绀�
+ wx.showToast({
+ title: '閭鏍煎紡涓嶆纭�',
+ icon: 'none',
+ });
+ }
+ },
+ // 寮圭獥鍙栨秷
+ closeDialog() {
+ const {
+ dialogKey
+ } = this.data;
+ 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,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+
+ } else if (this.data.tabValue == 1) {
+
+ if (this.data.courseData.length < this.data.courseTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+ console.log(2);
+ } else if (this.data.tabValue == 2) {
+
+ if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+
+ }
+ console.log(2);
+ } else if (this.data.tabValue == 3) {
+ if (this.data.seminarData.length < this.data.seminarTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ console.log(3);
+ } else if (this.data.tabValue == 4) {
+ if (this.data.bookFairData.length < this.data.bookFairTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.bibliographyGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ console.log(4);
+ } else if (this.data.tabValue == 5) {
+ if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
+ this.setData({
+ isMore: true,
+ "pageCount.page": this.data.pageCount.page + 1
+ })
+ this.retrievalPageGet()
+ } else {
+ this.setData({
+ isMore: true,
+ })
+ setTimeout(() => {
+ this.setData({
+ isMore: false
+ })
+ }, 100)
+ }
+ }
+ },
+ onTabsClick(event) {
+ console.log(`
+ Click tab, tab - panel value is $ {
+ event.detail.value
+ }.
+ `);
+ },
+ tabClick() {
+ console.log(2323);
+ },
+ // 婊戝姩鏃惰Е鍙戠殑浜嬩欢
+ slideOn(e) {
+ // 鎷垮埌褰撳墠绱㈠紩骞跺姩鎬佹敼鍙�
+ this.setData({
+ tabsId: e.detail.current
+ })
+ },
+
+ //鐐瑰嚮tab鏃惰Е鍙�
+ tabsOn(e) {
+ this.setData({
+ //鎷垮埌褰撳墠绱㈠紩骞跺姩鎬佹敼鍙�
+ tabsId: e.currentTarget.dataset.idx
+ })
+ },
+
})
\ No newline at end of file
--
Gitblit v1.9.1