From f3058f900e3143c0245c9b1686397b6e6e561422 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十一月 2024 10:09:48 +0800
Subject: [PATCH] 1.解绑添加二次确认。2.接口返回的金额都是元

---
 pages/rechargeMoney/rechargMoney.wxml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pages/rechargeMoney/rechargMoney.wxml b/pages/rechargeMoney/rechargMoney.wxml
index ae395e1..904084a 100644
--- a/pages/rechargeMoney/rechargMoney.wxml
+++ b/pages/rechargeMoney/rechargMoney.wxml
@@ -17,19 +17,19 @@
     <view class="row">
       <view class="item{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="0">
         <view class="money-wrapper">
-          <text class="money-number">100</text>
+          <text class="money-number">{{moneyList[0].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
       <view class="item{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="1">
         <view class="money-wrapper">
-          <text class="money-number">200</text>
+          <text class="money-number">{{moneyList[1].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
       <view class="item{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="2">
         <view class="money-wrapper">
-          <text class="money-number">300</text>
+          <text class="money-number">{{moneyList[2].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
@@ -37,19 +37,19 @@
     <view class="row">
       <view class="item{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="3">
         <view class="money-wrapper">
-          <text class="money-number">400</text>
+          <text class="money-number">{{moneyList[3].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
       <view class="item{{activeIndex === 4 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="4">
         <view class="money-wrapper">
-          <text class="money-number">500</text>
+          <text class="money-number">{{moneyList[4].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
       <view class="item{{activeIndex === 5 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="5">
         <view class="money-wrapper">
-          <text class="money-number">600</text>
+          <text class="money-number">{{moneyList[5].rechargeAmount}}</text>
           <text class="money-label">鍏�</text>
         </view>
       </view>
@@ -57,17 +57,17 @@
   </view>
 
   <view class="rechage-view">
-    <view class="rechage{{activeIndex === -1 ? 'active' : ''}}">
+    <view class="rechage{{activeIndex === -1 ? 'active' : ''}}" disabled="{{isClickable}}" bind:tap="creatOrder">
       <text class="rechage-text">鍏呭��</text>
     </view>
   </view>
 
   <view class="rechageList-view">
     <text class="rechageList-view-head">鍏呭�艰褰�</text>
-    <scroll-view class="list-container" scroll-y="true" scroll-x="false" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh">
+    <scroll-view class="list-container" scroll-y="true" scroll-x="false" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}" bindscrolltolower="loadMore">
       <block wx:if="{{allRechargeList.length > 0}}" wx:for="{{allRechargeList}}" wx:key="index">
         <view class="itemList">
-          <text class="item-card-text">{{item.time}}</text>
+          <text class="item-card-text">{{item.rechargeTime}}</text>
           <text class="item-card-text">{{item.type}}</text>
           <text class="item-card-text">{{item.morny}}</text>
         </view>
@@ -76,6 +76,8 @@
         <image class="noMore-img" src="/images/no_more.svg" />
         <text class="noMore-text">娌℃湁鏁版嵁</text>
       </view>
+      <view wx:if="{{loading}}" class="loading">鍔犺浇涓�...</view> <!-- 鍔犺浇鎸囩ず鍣� -->
+      <view wx:if="{{!hasMore&&allRechargeList.length>0}}" class="loading">娌℃湁鏇村鏁版嵁</view>
     </scroll-view>
 
 

--
Gitblit v1.8.0