From 50433e86b718fab0d94ea1410724b29b5f53fa0a Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期三, 09 四月 2025 15:11:26 +0800
Subject: [PATCH] 更新SVG图标样式,优化灌溉计划和取水口页面逻辑,添加状态处理和信息提示功能;调整界面样式,提升用户体验。

---
 pages/irrigation/irrigation.wxml |   28 ++--------------------------
 1 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/pages/irrigation/irrigation.wxml b/pages/irrigation/irrigation.wxml
index b5af43c..6f42faa 100644
--- a/pages/irrigation/irrigation.wxml
+++ b/pages/irrigation/irrigation.wxml
@@ -20,8 +20,8 @@
       <block wx:if="{{currentList.length > 0}}">
         <view class="list-item" wx:for="{{currentList}}" wx:key="id" bindtap="onItemTap" data-id="{{item.id}}" data-status="{{item.status}}">
           <!-- 鐘舵�佹爣绛� -->
-          <view class="status-tag {{item.status === '1' ? 'draft' : item.status === '2' ? 'published' : item.status === '3' ? 'executing' : 'completed'}}">
-            {{item.status === '1' ? '鑽夌' : item.status === '2' ? '鏈墽琛�' : item.status === '3' ? '鎵ц涓�' : '宸插畬鎴�'}}
+          <view class="status-tag {{item.status === '1' ? 'draft' : item.status === '2' ? 'published' : item.status === '3' ? 'executing' : item.status === '5' ? 'terminated' : 'completed'}}">
+            {{item.status === '1' ? '鑽夌' : item.status === '2' ? '鏈墽琛�' : item.status === '3' ? '鎵ц涓�' : item.status === '5' ? '宸茬粓姝�' : '宸插畬鎴�'}}
           </view>
           
           <!-- 涓昏鍐呭鍖� -->
@@ -57,30 +57,6 @@
                   </view>
                 </view>
               </view>
-
-              <!-- 鎵ц涓姸鎬侀澶栦俊鎭� -->
-              <block wx:if="{{item.status === '3'}}">
-                <view class="executing-info">
-                  <view class="info-item">
-                    <view class="info-icon">
-                      <image src="/images/progress-icon.svg" mode="aspectFit"></image>
-                    </view>
-                    <view class="info-content">
-                      <view class="info-label">宸茬亴婧夋椂闂�</view>
-                      <view class="info-value">{{item.irrigatedTime}}</view>
-                    </view>
-                  </view>
-                  <view class="info-item">
-                    <view class="info-icon">
-                      <image src="/images/group-icon.svg" mode="aspectFit"></image>
-                    </view>
-                    <view class="info-content">
-                      <view class="info-label">宸茬亴婧夎疆缁�</view>
-                      <view class="info-value">{{item.irrigatedGroups}}</view>
-                    </view>
-                  </view>
-                </view>
-              </block>
             </view>
 
             <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->

--
Gitblit v1.8.0