From 4a9955330070cf8abd78d95aaa2067d9a06a88c3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 07 五月 2024 10:05:59 +0800
Subject: [PATCH] 各页面bug修改
---
pages/retrievalPage/index.js | 323 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 245 insertions(+), 78 deletions(-)
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 9039b9a..2ededee 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,54 +11,58 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
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'
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ console.log(app.config.appId);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
this.setData({
-
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
searchVal: options.searchVal
})
-
-
this.retrievalPageGet()
this.bibliographyGet()
let event = {
detail: {
-
value: "0"
}
}
- this.onTabsChange(event)
+ // this.onTabsChange(event)
},
/**
@@ -119,10 +125,10 @@
this.bibliographyGet()
},
-
//鏍囩鐨勫垏鎹�
onTabsChange(event) {
const value = event.detail.value
+ console.log(value);
if (value === '0') {
this.setData({
tabValue: value,
@@ -155,14 +161,9 @@
isMore: false
})
}
-
},
-
-
-
retrievalPageGet() {
-
let fields = {
liveTime: [],
lecturer: [],
@@ -190,7 +191,7 @@
let queryBook = {
AccessControl: {
Path: '*',
- StoreRefCode: 'defaultGoodsStore27',
+ StoreRefCode: `defaultGoodsStore${app.config.appId}`,
Type: '*',
LinkType: ''
},
@@ -198,11 +199,9 @@
Start: 0,
Size: this.data.pageCount.page * 9,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -219,8 +218,6 @@
...searchObj,
...fields
}
-
-
let courseObj = {}
if (this.data.searchVal) {
courseObj = {
@@ -229,7 +226,6 @@
'||isbn*': this.data.searchVal.trim(),
'||seriesName*': this.data.searchVal.trim()
}
-
}
//璇剧▼
let queryCourse = {
@@ -243,11 +239,9 @@
Start: 0,
Size: this.data.pageCount.page * 4
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -287,11 +281,9 @@
Start: 0,
Size: this.data.pageCount.page * 9,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -332,11 +324,9 @@
Start: 0,
Size: this.data.pageCount.page * 6,
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -376,11 +366,9 @@
Start: 0,
Size: this.data.pageCount.page * 10
},
- SortQuery: [
- {
- LinkOrder: 'Desc'
- }
- ],
+ SortQuery: [{
+ LinkOrder: 'Desc'
+ }],
CreateDate: [],
Description: [],
Name: [],
@@ -419,8 +407,7 @@
method: 'post',
data: body
}).then((resp) => {
- // console.log(resp);
-
+ console.log(resp, 'resp');
//鍥句功 0
const data1 = resp[0]
const datas1 = handleQueryResourceListData({
@@ -430,12 +417,7 @@
this.setData({
bookData: datas1,
bookTotal: data1.totalCount,
-
})
-
-
-
-
//鏁板瓧璇剧▼ 1
const data2 = resp[1]
const datas2 = handleQueryResourceListData({
@@ -446,9 +428,6 @@
courseData: datas2,
courseTotal: data2.totalCount
})
-
-
-
// 鏁板瓧鏁欐潗 2
const data3 = resp[2]
const datas3 = handleQueryResourceListData({
@@ -459,15 +438,12 @@
digitalTextbooksData: datas3,
digitalTextbooksTotal: data3.totalCount
})
-
// 涓撻鐮旇 3
-
const data4 = resp[3]
const datas4 = handleQueryResourceListData({
datas: data4.datas,
fields
})
-
this.setData({
seminarData: datas4,
seminarTotal: data4.totalCount
@@ -478,7 +454,6 @@
datas: data5.datas,
fields
})
-
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
})
@@ -487,12 +462,12 @@
biblioClassificationData: datas5,
biblioClassificationTotal: data5.totalCount
})
-
-
-
-
+ this.setData({
+ loading: false,
+ hidden: false,
+ })
})
-
+ wx.stopPullDownRefresh()
},
bibliographyGet() {
let bibliographyObj = {}
@@ -533,11 +508,10 @@
})
})
+ 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');
@@ -566,6 +540,10 @@
});
},
onSearchSubmit() {
+ this.setData({
+ loading: true,
+ hidden: true,
+ })
console.log(this.data.searchVal);
this.retrievalPageGet()
this.bibliographyGet()
@@ -585,17 +563,14 @@
url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
});
},
- //瑙﹀簳鍑芥暟
- onReachBottom() {
- console.log("涓婃媺鍔犺浇....");
- },
+
//涓婃媺鍑芥暟
onPullDownRefresh() {
console.log("涓嬫媺鍒锋柊...");
},
/**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
onReachBottom(e) {
if (this.data.tabValue == 0) {
console.log(0);
@@ -709,13 +684,205 @@
isMore: false
})
}, 100)
-
}
}
-
-
-
},
+ // 涓嬫媺鍑芥暟
+ onPullDownRefresh() {
+ console.log(456);
+ if (this.data.tabValue == 4) {
+ this.setData({
+ "pageCount.page": 1
+ })
+ this.bibliographyGet()
+ } else {
+ this.setData({
+ "pageCount.page": 1
+ })
+ 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)
+ }
+ }
+ },
})
\ No newline at end of file
--
Gitblit v1.9.1