From aec1b6ec73897b5e5f3a85f2985447726a399ed0 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期六, 19 四月 2025 15:56:48 +0800
Subject: [PATCH] 更新灌溉计划页面,添加灌溉计划列表刷新标记,优化项目选择器和时间选择器的逻辑;更新样式以提升用户体验,确保在切换标签时只加载必要的数据。

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

diff --git a/pages/irrigation/irrigation.wxml b/pages/irrigation/irrigation.wxml
index 93bcaaf..1864f3e 100644
--- a/pages/irrigation/irrigation.wxml
+++ b/pages/irrigation/irrigation.wxml
@@ -10,7 +10,17 @@
   </view>
 
   <!-- 涓棿鍒楄〃 - 浣跨敤scroll-view瀹炵幇涓嬫媺鍒锋柊 -->
-  <scroll-view class="scroll-view" scroll-x="false" scroll-y="true" refresher-enabled="{{isRefreshing==false?true:false}}" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}">
+  <scroll-view class="scroll-view" 
+               scroll-x="false" 
+               scroll-y="true" 
+               refresher-enabled="{{isRefreshing==false?true:false}}" 
+               refresher-threshold="50" 
+               bindrefresherrefresh="onPullDownRefresh" 
+               refresher-triggered="{{isWXRefreshing}}"
+               lower-threshold="100"
+               bindscrolltolower="{{currentTab === 1 ? 'onReachBottom' : ''}}"
+               enhanced="{{true}}"
+               id="scrollView">
     <view wx:if="{{isRefreshing}}" class="refresh-view">
       <view class="dot"></view>
       <view class="dot"></view>
@@ -60,7 +70,7 @@
             </view>
 
             <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-            <view class="action-section" catchtap="stopPropagation" wx:if="{{item.status !== '4'}}">
+            <view class="action-section" catchtap="stopPropagation" wx:if="{{item.status === '1'||item.status === '2'||item.status === '3'}}">
               <block wx:if="{{item.status === '1'}}">
                 <view class="action-buttons">
                   <button class="action-button delete-button" hover-class="delete-button-hover" bindtap="onDelete" data-id="{{item.id}}">
@@ -92,6 +102,19 @@
             </view>
           </view>
         </view>
+        
+        <!-- 鍔犺浇鏇村鎻愮ず - 浠呭湪鍘嗗彶璁″垝鏍囩椤垫樉绀� -->
+        <view wx:if="{{currentTab === 1}}" class="loading-more-container">
+          <view wx:if="{{loadingMore}}" class="loading-more">
+            <view class="loading-dot"></view>
+            <view class="loading-dot"></view>
+            <view class="loading-dot"></view>
+            <text>鍔犺浇涓�...</text>
+          </view>
+          <view wx:elif="{{!hasMoreData && completedList.length > 0}}" class="no-more-data">
+            <text>鈥� 宸插姞杞藉叏閮ㄦ暟鎹� 鈥�</text>
+          </view>
+        </view>
       </block>
 
       <block wx:else>

--
Gitblit v1.8.0