From d18a0c9fe708dcf58253b54ef2938b5e864b24df Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 14:39:30 +0800
Subject: [PATCH] 优化水摄入页面的确认弹窗逻辑，调整showConfirm状态的设置位置，并移除不必要的代码注释，提升代码可读性和维护性。
---
pages/groupDetail/groupDetail.wxml | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/pages/groupDetail/groupDetail.wxml b/pages/groupDetail/groupDetail.wxml
index a024557..cfe3f99 100644
--- a/pages/groupDetail/groupDetail.wxml
+++ b/pages/groupDetail/groupDetail.wxml
@@ -3,46 +3,62 @@
<view class="page-header">
<view class="header-content">
<view class="project-info">
- <view class="project-name">{{projectName}}</view>
<view class="group-name">{{groupName}}</view>
+ <view class="project-name">
+ <text class="project-label">鎵�灞為」鐩細</text>
+ <text>{{projectName}}</text>
+ </view>
+
</view>
</view>
</view>
- <!-- 闃�鎺у櫒鍒楄〃 -->
+ <!-- 鍙栨按鍙ｅ垪琛� -->
<view class="valve-list-container">
- <view class="section-title">鍙栨按鍙ｉ榾鎺у櫒鍒楄〃</view>
-
- <!-- 鍔犺浇涓� -->
+
+ <!-- 鍔犺浇涓�
<view class="loading-container" wx:if="{{loading}}">
<view class="loading-icon"></view>
<view class="loading-text">鍔犺浇涓�...</view>
- </view>
+ </view> -->
- <!-- 闃�鎺у櫒鍒楄〃 -->
- <view class="valve-list" wx:else>
- <block wx:for="{{valveList}}" wx:key="id">
+ <!-- 鍙栨按鍙ｅ垪琛� - 鍙笅鎷夊埛鏂扮殑scroll-view -->
+ <scroll-view
+ class="valve-list"
+ scroll-y="true"
+ refresher-enabled="{{true}}"
+ refresher-threshold="50"
+ refresher-default-style="black"
+ refresher-background="#f2f2f2"
+ refresher-triggered="{{refreshing}}"
+ bindrefresherrefresh="onRefresh"
+ >
+ <block wx:for="{{waterOutletList}}" wx:key="id">
<view class="valve-item">
<view class="valve-info">
- <view class="valve-name">{{item.name}}</view>
- <view class="valve-location">{{item.location}}</view>
+ <view class="valve-name-container">
+ <text class="name-text">{{item.name}}</text>
+ </view>
+ <view class="valve-rtu-addr">
+ <text class="rtu-label">璁惧鍦板潃: </text>
+ <text class="rtu-value">{{item.rtuAddr}}</text>
+ </view>
</view>
- <view class="valve-status {{item.status === 'online' ? 'online' : 'offline'}}">
- {{item.status === 'online' ? '鍦ㄧ嚎' : '绂荤嚎'}}
+ <view class="valve-status-container">
+ <view class="valve-status-inline {{item.status === 'online' ? 'online' : 'offline'}}">
+ {{item.status === 'online' ? '鍦ㄧ嚎' : '绂荤嚎'}}
+ </view>
</view>
</view>
</block>
- </view>
-
- <!-- 绌虹姸鎬� -->
- <view class="empty-state" wx:if="{{!loading && valveList.length === 0}}">
- <image class="empty-icon" src="/images/empty.svg" mode="aspectFit"></image>
- <view class="empty-text">鏆傛棤闃�鎺у櫒鏁版嵁</view>
- </view>
+
+ <!-- 绌虹姸鎬� -->
+ <view class="empty-state" wx:if="{{waterOutletList.length === 0}}">
+ <image class="empty-icon" src="/images/empty.svg" mode="aspectFit"></image>
+ <view class="empty-text">鏆傛棤鍙栨按鍙ｆ暟鎹�</view>
+ </view>
+ </scroll-view>
</view>
- <!-- 搴曢儴鎸夐挳 -->
- <view class="bottom-button">
- <button class="back-button" hover-class="back-button-hover" bindtap="goBack">杩斿洖</button>
- </view>
+
</view>
\ No newline at end of file
--
Gitblit v1.8.0