From f66a9a2c565966e98720be5e20604c6f75030f82 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 28 十月 2024 17:40:13 +0800
Subject: [PATCH] 1.首页添加使用说明。2.修改扫码开阀功能。3.问题反馈功能相关
---
pages/valveList/valveList.js | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/pages/valveList/valveList.js b/pages/valveList/valveList.js
index 59ff542..a55db5b 100644
--- a/pages/valveList/valveList.js
+++ b/pages/valveList/valveList.js
@@ -10,33 +10,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- listVirtualData: [{
- intakeNum: "1023356646612",
- watername: "娴嬭瘯",
- startTime: "2024.10.15 12:23",
- endTime: "2024.10.15 16:23"
-
- }, {
- intakeNum: "1023356646612",
- watername: "娴嬭瘯1",
- startTime: "2024.10.15 12:23",
- endTime: "2024.10.15 16:23"
- }, {
- intakeNum: "1023356646612",
- watername: "娴嬭瘯2",
- startTime: "2024.10.15 12:23",
- endTime: "2024.10.15 16:23"
- }, {
- intakeNum: "1023356646612",
- watername: "娴嬭瘯3",
- startTime: "2024.10.15 12:23",
- endTime: "2024.10.15 16:23"
- }, {
- intakeNum: "1023356646612",
- watername: "娴嬭瘯4",
- startTime: "2024.10.15 12:23",
- endTime: "2024.10.15 16:23"
- }],
+ listVirtualData: [],
listPhysicalData: [],
currentTab: 0,
isVirtualRefreshing: false, //铏氭嫙鍗″埛鏂颁腑
@@ -118,7 +92,7 @@
this.setData({
isVirtualRefreshing: true,
})
- this.getVirtualListData();
+ this.getVirtualListData(true);
},
//瀹炰綋鍗″埛鏂�
onPullPhysicalDownRefresh() {
@@ -128,7 +102,7 @@
this.getPhysicalListData();
},
//鑾峰彇瀹炰綋鍗″垪琛�
- getPhysicalListData() {
+ getPhysicalListData(isRefresh) {
get({
url: 'wx/intake/getCardOpenClose',
data: {
@@ -143,10 +117,10 @@
physicalIsLoding: false
});
if (data.success && data.code === "0001") {
+ const filteredData = data.content.obj.filter(item => item.openTime !== null && item.closeTime !== null);
this.setData({
- listPhysicalData: data.content.obj,
- physicalHasMore: !data.content.obj.pageTotal === this.data.physicalPageCurr,
-
+ listPhysicalData: isRefresh ? filteredData : this.data.listPhysicalData.concat(filteredData),
+ physicalHasMore: this.data.physicalPageCurr < data.content.pageTotal,
});
} else {
wx.showToast({
@@ -163,7 +137,7 @@
});
},
//鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍
- getVirtualListData() {
+ getVirtualListData(isRefresh) {
get({
url: 'wx/intake/getVcCardOpenClose',
data: {
@@ -178,10 +152,10 @@
virtualIsLoding: false
});
if (data.success && data.code === "0001") {
+ const filteredData = data.content.obj.filter(item => item.openTime !== null && item.closeTime !== null);
this.setData({
- listPhysicalData: data.content.obj,
- physicalHasMore: !data.content.obj.pageTotal === this.data.virtualPageCurr,
-
+ listVirtualData: isRefresh ?filteredData : this.data.listVirtualData.concat(filteredData),
+ virtualhasMore: this.data.virtualPageCurr < data.content.pageTotal,
});
} else {
wx.showToast({
--
Gitblit v1.8.0