From d18a0c9fe708dcf58253b54ef2938b5e864b24df Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 14:39:30 +0800
Subject: [PATCH] 优化水摄入页面的确认弹窗逻辑，调整showConfirm状态的设置位置，并移除不必要的代码注释，提升代码可读性和维护性。
---
pages/valveList/valveList.wxml | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/pages/valveList/valveList.wxml b/pages/valveList/valveList.wxml
index b48f7ae..3266c88 100644
--- a/pages/valveList/valveList.wxml
+++ b/pages/valveList/valveList.wxml
@@ -1,30 +1,79 @@
<!--pages/valveList/valveList.wxml 寮�鍏抽榾璁板綍-->
-<view>
- <scroll-view class="list-container" scroll-y="true" scroll-x="false">
- <block wx:if="{{listData.length > 0}}" wx:for="{{listData}}" wx:key="index">
- <view class="list-item" wx:for="{{listData}}" wx:for-item="item" wx:for-index="index">
+<view class="container">
+ <!-- 椤堕儴 Tabs -->
+ <view class="tabs">
+ <view class="tab" bindtap="switchTab" data-tab="0" id="tab0">
+ 铏氭嫙鍗�
+ <view class="indicator" wx:if="{{currentTab === 0}}"></view>
+ </view>
+ <view class="tab" bindtap="switchTab" data-tab="1" id="tab1">
+ 姘村崱
+ <view class="indicator" wx:if="{{currentTab === 1}}"></view>
+ </view>
+ </view>
+ <scroll-view class="list-container" enable-flex="true" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullVirtualDownRefresh" refresher-triggered="{{isVirtualRefreshing}}" bindscrolltolower="loadVirtualMore">
+ <block wx:if="{{listVirtualData.length > 0}}" wx:for="{{listVirtualData}}" wx:key="index">
+ <view class="list-item" >
<!-- <image class="item-img" src="/images/pipeline.svg" /> -->
<view class="item-time">
<text class="item-text">娑堣垂閲戦锛�</text>
<view>
- <text class="item-morny">50</text>
+ <text class="item-morny">{{item.expense}}</text>
<text class="item-text"> 鍏�</text>
</view>
</view>
- <text class="item-text">铏氭嫙鍗＄紪鍙凤細{{item.intakeNum}}</text>
- <text class="item-text">鍙栨按鍙ｇ紪鍙凤細</text>
- <text class="item-text">寮�闃�鏃堕棿锛�</text>
- <text class="item-text">鍏抽榾鏃堕棿锛�</text>
+ <text class="item-text">姘村崱缂栧彿锛歿{item.cardNum}}</text>
+ <text class="item-text">鍙栨按鍙ｇ紪鍙凤細{{item.intakeNum}}</text>
+ <text class="item-text">寮�闃�绫诲瀷锛歿{item.openType}}</text>
+ <text class="item-text">寮�闃�鏃堕棿锛歿{item.openTime}}</text>
+ <text class="item-text">鍏抽榾鏃堕棿锛歿{item.closeTime}}</text>
<view class="item-time">
- <text class="item-text">鐢ㄦ按鏃堕暱锛�120 鍒嗛挓</text>
- <text class="item-text">鐢ㄦ按閲忥細2 m鲁</text>
+ <text class="item-text">鐢ㄦ按鏃堕暱锛歿{item.duration}}鍒嗛挓</text>
+ <text class="item-text">鐢ㄦ按閲忥細{{item.amount}} m鲁</text>
</view>
</view>
</block>
- <view wx:if="{{listData.length === 0}}" class="noMore-View">
+ <view wx:if="{{listVirtualData.length === 0}}" class="noMore-View">
<image class="noMore-img" src="/images/no_more.svg" />
<text class="noMore-text">娌℃湁鏁版嵁</text>
</view>
+ <view wx:if="{{virtualIsLoding}}" class="loading">鍔犺浇涓�...</view> <!-- 鍔犺浇鎸囩ず鍣� -->
+ <view wx:if="{{ !virtualhasMore && listVirtualData.length > 0}}" class="no-more-data">
+ <text>鈥� 宸插姞杞藉叏閮ㄦ暟鎹� 鈥�</text>
+ </view>
+ </scroll-view>
+
+ <scroll-view class="list-container" wx:else enable-flex="true" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullPhysicalDownRefresh" scroll-x="false" refresher-triggered="{{isPhysicalRefreshing}}" bindscrolltolower="loadPhysicalMore">
+ <block wx:if="{{listPhysicalData.length > 0}}" wx:for="{{listPhysicalData}}" wx:key="index">
+ <view class="list-item" >
+ <!-- <image class="item-img" src="/images/pipeline.svg" /> -->
+ <view class="item-time">
+ <text class="item-text">娑堣垂閲戦锛�</text>
+ <view>
+ <text class="item-morny">{{item.expense}}</text>
+ <text class="item-text"> 鍏�</text>
+ </view>
+ </view>
+ <text class="item-text">姘村崱缂栧彿锛歿{item.cardNum}}</text>
+ <text class="item-text">鍙栨按鍙ｇ紪鍙凤細{{item.intakeNum}}</text>
+ <text class="item-text">寮�闃�绫诲瀷锛歿{item.openType}}</text>
+ <text class="item-text">寮�闃�鏃堕棿锛歿{item.openTime}}</text>
+ <text class="item-text">鍏抽榾鏃堕棿锛歿{item.closeTime}}</text>
+ <view class="item-time">
+ <text class="item-text">鐢ㄦ按鏃堕暱锛歿{item.duration}}鍒嗛挓</text>
+ <text class="item-text">鐢ㄦ按閲忥細{{item.amount}} m鲁</text>
+ </view>
+
+ </view>
+ </block>
+ <view wx:if="{{listPhysicalData.length === 0}}" class="noMore-View">
+ <image class="noMore-img" src="/images/no_more.svg" />
+ <text class="noMore-text">娌℃湁鏁版嵁</text>
+ </view>
+ <view wx:if="{{physicalIsLoding}}" class="loading">鍔犺浇涓�...</view> <!-- 鍔犺浇鎸囩ず鍣� -->
+ <view wx:if="{{!physicalHasMore && listPhysicalData.length > 0}}" class="no-more-data">
+ <text>鈥� 宸插姞杞藉叏閮ㄦ暟鎹� 鈥�</text>
+ </view>
</scroll-view>
</view>
\ No newline at end of file
--
Gitblit v1.8.0