From fe3ce21a469f7e2584dbcb85cb75022d149f436c Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期二, 25 三月 2025 19:28:56 +0800
Subject: [PATCH] 更新灌溉计划页面，添加项目选择器和总灌溉时间计算功能；优化界面样式，增加SVG图标；修复项目列表和轮灌组显示逻辑；调整配置文件，添加libVersion字段。
---
pages/irrigationDetail/irrigationDetail.wxml | 72 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/pages/irrigationDetail/irrigationDetail.wxml b/pages/irrigationDetail/irrigationDetail.wxml
index eb682a5..cf8747a 100644
--- a/pages/irrigationDetail/irrigationDetail.wxml
+++ b/pages/irrigationDetail/irrigationDetail.wxml
@@ -8,64 +8,54 @@
</view>
<image class="status-icon" src="/images/progress.svg" mode="aspectFit"></image>
</view>
-
+ <!-- 椤圭洰淇℃伅 -->
+ <view class="project-info">
+ <text class="label">椤圭洰鍚嶇О锛�</text>
+ <text class="value">{{projects[0].name}}</text>
+ </view>
<!-- 鐏屾簤鏃堕棿淇℃伅 -->
<view class="time-info">
<text class="label">鐏屾簤寮�濮嬫椂闂达細</text>
<text class="value">{{startTime}}</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>
- </view>
+ <block wx:for="{{projects[0].groups}}" wx:key="id" wx:for-item="group">
+ <view class="group-item {{group.status}}" bindtap="navigateToGroupDetail" data-project-name="{{projects[0].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-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>
- <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>
+ <!-- 杞亴缁勪俊鎭� -->
+ <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>
- </block>
+ <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>
</view>
</block>
--
Gitblit v1.8.0