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 | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/pages/irrigation/irrigation.wxml b/pages/irrigation/irrigation.wxml
index 93bcaaf..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>
@@ -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