From ab8b53407a4d2213b1b3cdaf3cf649ef6c457dae Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 15:52:19 +0800
Subject: [PATCH] 优化首页项目选择逻辑，添加临时选择变量以支持未确认的项目选择；更新登录页面逻辑，确保从登录页返回时正确刷新数据并处理项目选择确认，提升用户体验。

---
 pages/rechargeMoney/rechargMoney.wxml |  128 ++++++++++++++++++++++++------------------
 1 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/pages/rechargeMoney/rechargMoney.wxml b/pages/rechargeMoney/rechargMoney.wxml
index 72a4990..ae395e1 100644
--- a/pages/rechargeMoney/rechargMoney.wxml
+++ b/pages/rechargeMoney/rechargMoney.wxml
@@ -1,6 +1,7 @@
-<!--pages/recharge/recharge.wxml--> 
-<view class="base-wrapper"> 
-  <!-- <view class="user-wrapper"> 
+<!-- pages/recharge/recharge.wxml -->
+<view class="base-wrapper">
+  <!-- 
+  <view class="user-wrapper"> 
     <view> 
       <text>铏氭嫙鍗＄紪鍙凤細</text> 
       <text>{{userCode}}</text> 
@@ -9,58 +10,75 @@
       <text>浣欓锛�</text> 
       <text>{{balance}}</text> 
     </view> 
-  </view>  -->
- 
-  <view class="money-base-wrapper"> 
-    <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-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-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-label">鍏�</text> 
-        </view> 
-      </view> 
-    </view> 
-    <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-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-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-label">鍏�</text> 
-        </view> 
-      </view> 
-    </view> 
   </view> 
- 
-<view class="rechage-view"> 
-  <view class="rechage{{activeIndex === -1 ? 'active' : ''}}"> 
-  <text >鍏呭��</text> 
-  </view> 
+  -->
 
-</view> 
-<view class="rechageList-view"> 
-  </view> 
- 
+  <view class="money-base-wrapper">
+    <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-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-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-label">鍏�</text>
+        </view>
+      </view>
+    </view>
+    <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-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-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-label">鍏�</text>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view class="rechage-view">
+    <view class="rechage{{activeIndex === -1 ? 'active' : ''}}">
+      <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">
+      <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.type}}</text>
+          <text class="item-card-text">{{item.morny}}</text>
+        </view>
+      </block>
+      <view wx:if="{{allRechargeList.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