From 4a9955330070cf8abd78d95aaa2067d9a06a88c3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 07 五月 2024 10:05:59 +0800
Subject: [PATCH] 各页面bug修改
---
pages/bibliographyList/index.js | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index b2588bb..9043fb8 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -33,6 +33,9 @@
emailError: false,
loading: true, //寮�鍚鏋跺睆鍔犺浇
hidden: true, //鏄惁灞曠ず鍐呭
+ height: '',
+ dialogBox: false,
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding: 0 0 0 16rpx;height:70rpx',
},
/**
@@ -55,6 +58,15 @@
}
}
this.onTabsChange(event)
+ var that = this;
+ // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+ wx.getSystemInfo({
+ success: (result) => {
+ that.setData({
+ height: result.windowHeight
+ });
+ },
+ })
},
/**
@@ -108,29 +120,20 @@
},
onTabsChange(event) {
const value = event.detail.value
- if (value === '0') {
- console.log(value);
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '1') {
- console.log(value);
- this.setData({
- tabValue: value,
- isMore: false
- })
- } else if (value === '2') {
- console.log(value);
- this.setData({
- tabValue: value,
- isMore: false
- })
+ this.setData({
+ isMore: null,
+ tabValue: value,
+ })
+ if (value == '0') {
+ this.higherGet()
+ } else if (value == '1') {
+ this.vocationalGet()
+ } else if (value == '2') {
+ this.teacherGet()
}
},
//楂樼瓑鏁欒偛
higherGet(keyword) {
- // console.log(keyword, 'keyword');
let searchObj = {
'Name*': keyword,
'||author*': keyword,
@@ -157,7 +160,6 @@
},
SysType: 'CmsItem'
}).then(res => {
-
res.datas.forEach(item => {
item.determine = true
})
@@ -169,6 +171,11 @@
loading: false, //寮�鍚鏋跺睆鍔犺浇
hidden: false, //鏄惁灞曠ず鍐呭
})
+ if (res.datas.length < 7 && res.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
})
wx.stopPullDownRefresh()
},
@@ -209,6 +216,11 @@
vocationalList: res.datas,
vocationalTotal: res.total
})
+ if (res.datas.length < 7 && this.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
})
wx.stopPullDownRefresh()
},
@@ -249,6 +261,11 @@
teacherList: res.datas,
teacherTotal: res.total
})
+ if (res.datas.length < 7 && this.datas.length > 0) {
+ this.setData({
+ isMore: false
+ })
+ }
})
wx.stopPullDownRefresh()
},
@@ -400,37 +417,37 @@
const key = e.currentTarget.dataset.key;
const item = e.currentTarget.dataset.item;
this.setData({
- Md5: item.datas.freeFile.FileList[0].Md5
+ Md5: item.datas.freeFile.FileList[0].Md5,
+ dialogBox: true
})
- wx.showModal({
- title: '璇疯緭鍏ラ偖绠�',
- content: '',
- confirmColor: '#ff6c00',
- cancelColor: '#949494',
- placeholderText: '璇疯緭鍏ラ偖绠卞彿',
- editable: true,
- complete: (res) => {
- if (res.cancel) {
- console.log('鍙栨秷');
- }
- if (res.confirm) {
- this.setData({
- input: res.content
- })
- this.confirmM()
- }
- }
+ // wx.scanCode({
+ // success: res => {
+ // console.log(res);
+ // }
+ // })
+ },
+ // 寮圭獥鍙栨秷
+ closeDialog() {
+ this.setData({
+ dialogBox: false
})
},
//鎻愪氦
confirmM(e) {
+ wx.showLoading({
+ title: '鍙戦�佷腑...',
+ })
const isEmailValid = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(this.data.input);
if (isEmailValid && this.data.input) {
+ this.setData({
+ dialogBox: false
+ })
let query = {
eMail: this.data.input,
md5s: [this.data.Md5]
}
app.MG.file.sendFileWithEmail(query).then(res => {
+ wx.hideLoading()
if (res) {
wx.showToast({
icon: 'success',
@@ -446,4 +463,9 @@
});
}
},
+ inputChange(e) {
+ this.setData({
+ input: e.detail.value
+ })
+ }
})
\ No newline at end of file
--
Gitblit v1.9.1