From fe3ce21a469f7e2584dbcb85cb75022d149f436c Mon Sep 17 00:00:00 2001 From: zuoxiao <zuoxiao> Date: 星期二, 25 三月 2025 19:28:56 +0800 Subject: [PATCH] 更新灌溉计划页面,添加项目选择器和总灌溉时间计算功能;优化界面样式,增加SVG图标;修复项目列表和轮灌组显示逻辑;调整配置文件,添加libVersion字段。 --- pages/createIrrigation/createIrrigation.wxml | 85 ++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 36 deletions(-) diff --git a/pages/createIrrigation/createIrrigation.wxml b/pages/createIrrigation/createIrrigation.wxml index 5ba5323..d4cac7e 100644 --- a/pages/createIrrigation/createIrrigation.wxml +++ b/pages/createIrrigation/createIrrigation.wxml @@ -16,43 +16,43 @@ </view> </view> - <!-- 椤圭洰鍜岃疆鐏岀粍宓屽鍒楄〃 --> - <view class="list-container"> - <!-- 椤圭洰鍒楄〃 --> - <scroll-view scroll-y="true" class="project-list"> - <block wx:for="{{projectList}}" wx:key="id"> - <view class="project-item"> - <!-- 椤圭洰鍚嶇О --> - <view class="project-header" bindtap="toggleProject" data-index="{{index}}"> - <view class="project-title"> - <image class="toggle-icon {{item.expanded ? 'expanded' : ''}}" src="/images/arrow-down.svg" mode="aspectFit"></image> - <view class="project-name">{{item.name}}</view> - </view> - <view class="project-duration">鎬绘椂闀�: {{item.totalDuration || 0}}鍒嗛挓</view> + <!-- 閫夋嫨椤圭洰 --> + <view class="form-item" bindtap="showProjectPicker"> + <view class="form-label">閫夋嫨椤圭洰</view> + <view class="form-input"> + <view class="picker-text {{selectedProject ? '' : 'placeholder'}}">{{selectedProject ? selectedProject.name : '璇烽�夋嫨椤圭洰'}}</view> + <image class="arrow-icon" src="/images/arrow-right.svg" mode="aspectFit"></image> + </view> + </view> + + <!-- 杞亴缁勫垪琛� --> + <view class="list-container" wx:if="{{selectedProject}}"> + <view class="list-header"> + <view class="list-title-container"> + <view class="list-title">杞亴缁勫垪琛�</view> + <view class="total-duration"> + <text class="total-duration-label">鎬荤亴婧夋椂闂达細</text> + <text class="total-duration-value">{{totalDuration}}鍒嗛挓</text> + </view> + </view> + </view> + <scroll-view scroll-y="true" class="group-list"> + <block wx:for="{{selectedProject.groups}}" wx:key="id" wx:for-item="group" wx:for-index="groupIndex"> + <view class="group-item {{group.selected ? 'selected' : ''}}" bindtap="navigateToGroupDetail" data-group-index="{{groupIndex}}"> + <view class="group-info"> + <view class="group-name">{{group.name}}</view> </view> - - <!-- 杞亴缁勫垪琛� --> - <view class="group-list {{item.expanded ? 'expanded' : ''}}"> - <block wx:for="{{item.groups}}" wx:for-item="group" wx:for-index="groupIndex" wx:key="id"> - <view class="group-item {{group.selected ? 'selected' : ''}}" bindtap="navigateToGroupDetail" data-project-index="{{index}}" data-group-index="{{groupIndex}}"> - <view class="group-info" > - <view class="group-name">{{group.name}}</view> - </view> - <view class="group-duration"> - <input - class="duration-input" - type="number" - value="{{group.duration}}" - bindinput="onDurationInput" - data-project-index="{{index}}" - data-group-index="{{groupIndex}}" - placeholder="0" - catchtap="stopPropagation" - /> - <text class="duration-unit">鍒嗛挓</text> - </view> - </view> - </block> + <view class="group-duration"> + <input + class="duration-input" + type="number" + value="{{group.duration}}" + bindinput="onDurationInput" + data-group-index="{{groupIndex}}" + placeholder="0" + catchtap="stopPropagation" + /> + <text class="duration-unit">鍒嗛挓</text> </view> </view> </block> @@ -74,4 +74,17 @@ bindconfirm="onTimePickerConfirm" bindcancel="onTimePickerCancel" /> + + <!-- 椤圭洰閫夋嫨鍣ㄥ脊绐� --> + <t-picker + title="閫夋嫨椤圭洰" + visible="{{projectPickerVisible}}" + value="{{projectPickerValue}}" + cancelBtn="鍙栨秷" + confirmBtn="纭" + bindconfirm="onProjectPickerConfirm" + bindcancel="onProjectPickerCancel" + > + <t-picker-item options="{{projectOptions}}" /> + </t-picker> </view> \ No newline at end of file -- Gitblit v1.8.0