From 1b944efc839c270699310def8d0781ce4497e43d Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期四, 07 八月 2025 10:10:05 +0800
Subject: [PATCH] Merge branch 'doing' of http://8.140.179.55:20000/r/wm/pipIrr into doing
---
pages/rechargeCard/rechargeCard.wxml | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/pages/rechargeCard/rechargeCard.wxml b/pages/rechargeCard/rechargeCard.wxml
index d3d1db7..cf37a96 100644
--- a/pages/rechargeCard/rechargeCard.wxml
+++ b/pages/rechargeCard/rechargeCard.wxml
@@ -13,44 +13,52 @@
</view>
<!-- 铏氭嫙鍗� -->
- <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false" style="width: 713rpx; height: 465rpx; display: block; box-sizing: border-box">
- <block wx:for="{{allCardPoints}}" wx:key="index">
- <view class="{{item.state===1?'item':'item-gray'}}">
+ <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false">
+ <block wx:if="{{allCardPoints.length > 0}}" wx:for="{{allCardPoints}}" wx:key="index">
+ <view class="{{item.inUse===0?'item':'item-gray'}}">
<view class="item-card">
- <text>鍗＄紪鍙凤細</text>
- <text>{{item.id}}</text>
- <text wx:if="{{item.state==0}}" class="item-card-state">浣跨敤涓�</text>
+ <text class="item-card-text">鍗＄紪鍙凤細</text>
+ <text class="item-card-text">{{item.vcNum}}</text>
+ <text wx:if="{{item.inUse==1}}" class="item-card-state">浣跨敤涓�</text>
</view>
<view class="item-bottom">
<image class="item-balance-img" src="/images/balance.svg" />
<view class="item-balance">
- <text class="item-balance-text">{{item.balance}}</text>
+ <text class="item-balance-text">{{item.money}}</text>
<text class="item-balance-text-yuan">鍏�</text>
</view>
<view class="button-view">
- <text wx:if="{{item.state==1}}" class="ruinCard" >閿�鍗�</text>
- <text wx:if="{{item.state==1}}" class="recharge">鍏呭��</text>
+ <text wx:if="{{item.inUse==0}}" class="ruinCard" bind:tap="ruinCard">閿�鍗�</text>
+ <text wx:if="{{item.inUse==0}}" class="recharge" bind:tap="rechargeCard">鍏呭��</text>
</view>
</view>
</view>
</block>
+
+ <view wx:if="{{allCardPoints.length === 0}}" class="noMore-View">
+ <image class="noMore-img" src="/images/no_more.svg" />
+ <text class="noMore-text">娌℃湁鏁版嵁</text>
+ </view>
+ <t-dialog visible="{{showDialog}}" content="鎮ㄨ繕鏈変綑棰濇湭浣跨敤锛屽闇�閿�鍗★紝璇峰厛浣跨敤瀹屾垨閫�娆惧悗鎵嶅彲鎿嶄綔銆�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" />
</scroll-view>
<!-- 姘村崱 -->
<view class="all-waterIntake" wx:else>
- <view>
- <scroll-view class="list-container" scroll-y="true" scroll-x="false">
- <block 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" />
- </view>
- <text class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text>
+ <scroll-view class="list-container" scroll-y="true" scroll-x="false">
+ <block wx:if="{{allWaterPoints.length > 0}}" wx:for="{{allWaterPoints}}" wx:key="index">
+ <view class="item">
+ <view class="item-card">
+ <text class="item-card-text">鍗＄紪鍙凤細</text>
+ <text class="item-card-text">{{item.vcNum}}</text>
+ <text class="waterIntake-recharge">鍏呭��</text>
</view>
- </block>
- </scroll-view>
- </view>
- </view>
+ </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>
\ No newline at end of file
--
Gitblit v1.8.0