From 910c37c43eceb27888b90631c868caa08f7eafcc Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期四, 30 五月 2024 15:36:59 +0800 Subject: [PATCH] 开泵流程相关界面优化 --- pages/waterIntake/waterIntake.wxml | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pages/waterIntake/waterIntake.wxml b/pages/waterIntake/waterIntake.wxml index acb457c..5b19ea4 100644 --- a/pages/waterIntake/waterIntake.wxml +++ b/pages/waterIntake/waterIntake.wxml @@ -14,16 +14,20 @@ <!-- 甯哥敤鍙栨按鍙� --> <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false"> - <block wx:for="{{commonWaterPoints}}" wx:key="index"> + <block wx:if="{{commonWaterPoints.length > 0}}" wx:for="{{commonWaterPoints}}" wx:key="index"> <view class="item"> <view class="item-left"> <!-- <image class="item-img" src="/images/pipeline.svg" /> --> - <text>{{item}}</text> - <image class="item-img" src="/images/wifi_no.svg" /> + <text>{{item.intakeNum}}</text> + <image class="item-img" src="{{item.isOnLine ? '/images/wifi_no.svg' : '/images/wifi_off.svg'}}" /> </view> - <text class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text> + <text wx:if="{{item.isOnLine}}" class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text> </view> </block> + <view wx:if="{{commonWaterPoints.length === 0}}" class="noMore-View"> + <image class="noMore-img" src="/images/no_more.svg" /> + <text class="noMore-text">娌℃湁鏁版嵁</text> + </view> </scroll-view> <!-- 鎵�鏈夊彇姘村彛 --> @@ -31,20 +35,24 @@ <view class="search-container"> <input class="search-input" placeholder="璇疯緭鍏ュ彇姘村彛缂栫爜鍚庣偣鍑绘悳绱�" bindinput="onInput" /> <!-- <text class="search-button" >鎼滅储</text> --> - <t-button class="search-button" theme="primary" size="large" icon="search" shape="square" aria-label="鎼滅储" bindtap="onSearch" style="background-color: #1890FF; border: none; height: 80rpx;"></t-button> + <t-button class="search-button" theme="primary" size="large" icon="search" shape="square" aria-label="鎼滅储" bindtap="onSearch" style="background-color: #1890FF; border: none; height: 80rpx;"></t-button> </view> <view> <scroll-view class="list-container" scroll-y="true" scroll-x="false"> - <block wx:for="{{allWaterPoints}}" wx:key="index"> + <block wx:if="{{allWaterPoints.length > 0}}" wx:for="{{allWaterPoints}}" wx:key="index"> <view class="item"> <view class="item-left"> <!-- <image class="item-img" src="/images/pipeline.svg" /> --> - <text>{{item}}</text> - <image class="item-img" src="/images/wifi_no.svg" /> + <text>{{item.intakeNum}}</text> + <image class="item-img" src="{{item.isOnLine ? '/images/wifi_no.svg' : '/images/wifi_off.svg'}}" /> </view> - <text class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text> + <text wx:if="{{item.isOnLine}}" class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text> </view> </block> + <view wx:if="{{allWaterPoints.length === 0}}" class="noMore-View"> + <image class="noMore-img" src="/images/no_more.svg" /> + <text class="noMore-text">娌℃湁鏁版嵁</text> + </view> </scroll-view> </view> </view> -- Gitblit v1.8.0