From 50433e86b718fab0d94ea1410724b29b5f53fa0a Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期三, 09 四月 2025 15:11:26 +0800
Subject: [PATCH] 更新SVG图标样式，优化灌溉计划和取水口页面逻辑，添加状态处理和信息提示功能；调整界面样式，提升用户体验。
---
pages/irrigationDetail/irrigationDetail.wxml | 96 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/pages/irrigationDetail/irrigationDetail.wxml b/pages/irrigationDetail/irrigationDetail.wxml
index eb682a5..991e17e 100644
--- a/pages/irrigationDetail/irrigationDetail.wxml
+++ b/pages/irrigationDetail/irrigationDetail.wxml
@@ -6,66 +6,82 @@
<text class="label">璁″垝缂栧彿锛�</text>
<text class="value">{{planCode}}</text>
</view>
- <image class="status-icon" src="/images/progress.svg" mode="aspectFit"></image>
+ <view class="plan-status {{planStatusClass}}">
+ <text>{{planStatusText}}</text>
+ </view>
</view>
-
+ <!-- 椤圭洰淇℃伅 -->
+ <view class="project-info">
+ <text class="label">椤圭洰鍚嶇О锛�</text>
+ <text class="value">{{projectName}}</text>
+ </view>
<!-- 鐏屾簤鏃堕棿淇℃伅 -->
<view class="time-info">
<text class="label">鐏屾簤寮�濮嬫椂闂达細</text>
<text class="value">{{startTime}}</text>
</view>
+
+ <!-- 鏂板缁撴潫鏃堕棿淇℃伅 -->
+ <view class="time-info">
+ <text class="label">鐏屾簤缁撴潫鏃堕棿锛�</text>
+ <text class="value">{{stopTime}}</text>
+ </view>
</view>
- <!-- 椤圭洰鍜岃疆鐏岀粍鍒楄〃 -->
+ <!-- 杞亴缁勫垪琛� -->
<scroll-view
scroll-y="true"
- class="project-list"
+ class="group-list"
refresher-enabled="{{true}}"
refresher-threshold="50"
refresher-triggered="{{isRefreshing}}"
bindrefresherrefresh="onPullDownRefresh">
<view class="scroll-content">
- <block wx:for="{{projects}}" wx:key="id" wx:for-item="project" wx:for-index="projectIndex">
- <!-- 椤圭洰淇℃伅 -->
- <view class="project-item {{project.expanded ? 'expanded' : 'collapsed'}}">
- <view class="project-header" bindtap="toggleProject" data-index="{{projectIndex}}">
- <image class="toggle-icon {{project.expanded ? 'expanded' : ''}}" src="/images/arrow-down.svg" mode="aspectFit"></image>
- <view class="project-info">
- <view class="project-name">{{project.name}}</view>
- <view class="project-duration">鎬荤亴婧夋椂闀�: {{project.totalDuration || 0}}鍒嗛挓</view>
+ <block wx:for="{{groupList}}" wx:key="id" wx:for-item="group">
+ <view class="group-item {{group.status}}" bindtap="navigateToGroupDetail" data-project-name="{{projectName}}" data-group-name="{{group.name}}" data-group-id="{{group.id}}" data-status="{{group.status}}">
+ <!-- 杞亴缁勪俊鎭� -->
+ <view class="group-info">
+ <view class="group-name-row">
+ <text class="group-label">杞亴缁勶細</text>
+ <text class="group-name">{{group.name}}</text>
+ <!-- 杞亴缁勭姸鎬佹爣璇� -->
+ <view class="group-status-indicator">
+ <view class="status-dot"></view>
+ <text class="status-text">{{group.statusText}}</text>
+ </view>
</view>
- </view>
-
- <!-- 杞亴缁勫垪琛� -->
- <view class="group-list {{project.expanded ? 'expanded' : 'collapsed'}}">
- <block wx:for="{{project.groups}}" wx:key="id" wx:for-item="group">
- <view class="group-item {{group.status}}" bindtap="navigateToGroupDetail" data-project-name="{{project.name}}" data-group-name="{{group.name}}" data-group-id="{{group.id}}" data-status="{{group.status}}">
- <!-- 杞亴缁勭姸鎬佹爣璇� -->
- <view class="group-status-indicator">
- <view class="status-dot"></view>
- <text class="status-text">{{group.statusText}}</text>
- </view>
-
- <!-- 杞亴缁勪俊鎭� -->
- <view class="group-info">
- <view class="group-name">{{group.name}}</view>
- <view class="group-time-info">
- <view class="time-row">
- <text class="time-label">寮�濮嬫椂闂达細</text>
- <text class="time-value">{{group.startTime}}</text>
+ <view class="group-time-info">
+ <view class="time-row">
+ <text class="time-label">寮�濮嬫椂闂达細</text>
+ <text class="time-value">{{group.startTime}}</text>
+ </view>
+ <view class="time-row">
+ <text class="time-label">缁撴潫鏃堕棿锛�</text>
+ <text class="time-value">{{group.endTime}}</text>
+ </view>
+ <view class="time-row">
+ <text class="time-label">鐏屾簤鏃堕暱锛�</text>
+ <text class="time-value">{{group.duration}}鍒嗛挓</text>
+ </view>
+ </view>
+
+ <!-- 鍙栨按鍙ｄ俊鎭� -->
+ <view class="intake-info" wx:if="{{group.publishResult && group.publishResult.length > 0}}">
+ <view class="intake-header">鍙栨按鍙ｄ俊鎭�</view>
+ <view class="intake-list">
+ <block wx:for="{{group.publishResult}}" wx:key="intakeName" wx:for-item="intake">
+ <view class="intake-item {{intake.code === 0 ? 'success' : 'error'}}">
+ <view class="intake-name">
+ <text class="intake-status-dot"></text>
+ <text>{{intake.intakeName}}</text>
</view>
- <view class="time-row">
- <text class="time-label">缁撴潫鏃堕棿锛�</text>
- <text class="time-value">{{group.endTime}}</text>
- </view>
- <view class="time-row">
- <text class="time-label">鐏屾簤鏃堕暱锛�</text>
- <text class="time-value">{{group.duration}}鍒嗛挓</text>
+ <view class="intake-result" wx:if="{{intake.result}}">
+ <text>{{intake.result}}</text>
</view>
</view>
- </view>
+ </block>
</view>
- </block>
+ </view>
</view>
</view>
</block>
--
Gitblit v1.8.0