From fb805f6ff1d167951e94198b6e9fc320649e8643 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期五, 11 四月 2025 17:57:20 +0800
Subject: [PATCH] Merge branch 'doing' of http://8.140.179.55:20000/r/wm/pipIrr into doing
---
pages/irrigation/irrigation.wxml | 134 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 42 deletions(-)
diff --git a/pages/irrigation/irrigation.wxml b/pages/irrigation/irrigation.wxml
index 067fe45..99ea2cc 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>
@@ -18,54 +28,91 @@
</view>
<view class="scroll-bg">
<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="item-header">
- <view class="info-row title-row">
- <view class="info-label">缂栧彿锛�</view>
- <view class="info-value">{{item.title}}</view>
+ <!-- 鐘舵�佹爣绛� -->
+ <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>
+
+ <!-- 涓昏鍐呭鍖� -->
+ <view class="item-content">
+ <!-- 鏍囬鍖哄煙 -->
+ <view class="item-header">
+ <view class="title-section">
+ <view class="plan-title">{{item.title}}</view>
+ <view class="project-name">{{item.projectName}}</view>
+ </view>
</view>
- <!-- 鏍规嵁鐘舵�佹樉绀轰笉鍚岀殑鍥炬爣 -->
- <view class="item-status">
- <block wx:if="{{item.status === '宸插彂甯�'}}">
- <image class="status-icon" src="/images/published-icon.svg" mode="aspectFit"></image>
+
+ <!-- 淇℃伅鍖哄煙 -->
+ <view class="info-section">
+ <!-- 鑽夌鐘舵��(1)鏃舵í鍚戞帓鍒楋紝鍏朵粬鐘舵�佺旱鍚戞帓鍒� -->
+ <view class="info-grid {{item.status === '1' ? '' : 'vertical-layout'}} {{currentTab === 1 ? 'history-grid' : ''}}">
+ <view class="info-item">
+ <view class="info-icon">
+ <image src="/images/time-icon.svg" mode="aspectFit"></image>
+ </view>
+ <view class="info-content">
+ <view class="info-label">鐏屾簤鏃堕棿</view>
+ <view class="info-value">{{(item.planStartTime ? item.planStartTime : '鎵嬪姩鍙戝竷') + (item.planStopTime ? ' - ' + item.planStopTime : '')}}</view>
+ </view>
+ </view>
+ <view class="info-item">
+ <view class="info-icon duration-icon">
+ <image src="/images/hourglass.svg" mode="aspectFit"></image>
+ </view>
+ <view class="info-content">
+ <view class="info-label">鐏屾簤鏃堕暱</view>
+ <view class="info-value">{{item.duration}}鍒嗛挓</view>
+ </view>
+ </view>
+ </view>
+ </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>
+ </button>
+ </view>
</block>
- <block wx:elif="{{item.status === '鎵ц涓�'}}">
- <image class="status-icon" src="/images/progress.svg" mode="aspectFit"></image>
+ <block wx:if="{{item.status === '2'}}">
+ <view class="action-buttons">
+ <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">
+ <image src="/images/stop-icon.svg" mode="aspectFit"></image>
+ <text>缁堟</text>
+ </button>
+ </view>
</block>
- <block wx:elif="{{item.status === '鏈彂甯�'}}">
- <text>{{item.status}}</text>
+ <block wx:if="{{item.status === '3'}}">
+ <view class="action-buttons">
+ <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">
+ <image src="/images/stop-icon.svg" mode="aspectFit"></image>
+ <text>缁堟</text>
+ </button>
+ </view>
</block>
</view>
</view>
- <view class="item-info">
- <view class="info-row">
- <view class="info-label">鐏屾簤鏃堕棿锛�</view>
- <view class="info-value">{{item.irrigationTime}}</view>
- </view>
- <!-- 浠呭湪鎵ц涓姸鎬佹樉绀洪澶栦俊鎭� -->
- <block wx:if="{{item.status === '鎵ц涓�'}}">
- <view class="info-row irrigated-row">
- <view class="info-label">宸茬亴婧夋椂闂达細</view>
- <view class="info-value-time">{{item.irrigatedTime}}</view>
- </view>
- <view class="info-row irrigated-row">
- <view class="info-label">宸茬亴婧夎疆缁勶細</view>
- <view class="info-value-time">{{item.irrigatedGroups}}</view>
- </view>
- </block>
+ </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 class="item-actions" catchtap="stopPropagation">
- <!-- 鏍规嵁鐘舵�佹樉绀轰笉鍚岀殑鎸夐挳 -->
- <block wx:if="{{item.status === '鏈彂甯�'}}">
- <button class="action-button publish-button" hover-class="publish-button-hover" bindtap="onPublish" data-id="{{item.id}}">鍙戝竷</button>
- </block>
- <block wx:if="{{item.status === '鎵ц涓�' || item.status === '宸插彂甯�'}}">
- <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">缁堟</button>
- </block>
- <block wx:if="{{item.status === '宸插彂甯�'}}">
- <button class="action-button execute-button" hover-class="execute-button-hover" bindtap="onExecute" data-id="{{item.id}}">绔嬪嵆鎵ц</button>
- </block>
+ <view wx:elif="{{!hasMoreData && completedList.length > 0}}" class="no-more-data">
+ <text>鈥� 宸插姞杞藉叏閮ㄦ暟鎹� 鈥�</text>
</view>
</view>
</block>
@@ -81,6 +128,9 @@
<!-- 搴曢儴鏂板缓鎸夐挳 -->
<view class="bottom-button">
- <button class="add-button" hover-class="add-button-hover" bindtap="onAddIrrigation">鍒涘缓鐏屾簤璁″垝</button>
+ <button class="add-button" hover-class="add-button-hover" bindtap="onAddIrrigation">
+ <image src="/images/add-icon.svg" mode="aspectFit"></image>
+ <text>鍒涘缓鐏屾簤璁″垝</text>
+ </button>
</view>
</view>
\ No newline at end of file
--
Gitblit v1.8.0