Merge branch 'doing' of http://8.140.179.55:20000/r/wm/pipIrr into doing

zuoxiao

2025-04-11 fb805f6ff1d167951e94198b6e9fc320649e8643

 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>
@@ -20,8 +30,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,36 +67,16 @@
                  </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>

            <!-- 操作按钮区域 -->
            <view class="action-section" catchtap="stopPropagation" wx:if="{{item.status !== '4'}}">
              <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}}">
                    <image src="/images/delete_bt.svg" mode="aspectFit"></image>
                    <text>删除</text>
                  </button>
                  <button class="action-button publish-button" hover-class="publish-button-hover" bindtap="onPublish" data-id="{{item.id}}">
                    <image src="/images/publish-icon.svg" mode="aspectFit"></image>
                    <text>发布</text>
@@ -112,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>