From f74851dbe0f83a052b635f7903fe6e58f3412c19 Mon Sep 17 00:00:00 2001
From: Ultrame <1019265060@qq.com>
Date: Mon, 27 Oct 2025 21:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/user_pages/wallet/index.tsx      | 26 ++++++++++++++++++++++---
 src/user_pages/withdrawal/index.scss |  4 ++++
 src/user_pages/withdrawal/index.tsx  | 29 ++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/user_pages/wallet/index.tsx b/src/user_pages/wallet/index.tsx
index 54a42e2..9c06dc9 100644
--- a/src/user_pages/wallet/index.tsx
+++ b/src/user_pages/wallet/index.tsx
@@ -28,7 +28,7 @@ interface Transaction {
 interface WalletInfo {
   balance: number;
   frozen_balance?: number;
-  total_balance: number;
+  total_balance?: number;
   total_income?: number;
   total_withdraw?: number;
 }
@@ -157,12 +157,32 @@ const WalletPage: React.FC = () => {
   useEffect(() => {
     load_transactions();
   }, [load_transactions_params]);
+
   // 页面显示时加载数据
   useDidShow(() => {
-    load_wallet_data();
-    check_password_status();
+    const currentPage = Taro.getCurrentInstance().page
+    const updateList = currentPage.data.updateList
+
+    if (updateList) {
+      set_transactions([])
+      // 直接使用新参数调用加载方法
+      const newParams = {
+        ...load_transactions_params,
+        page: 1
+      }
+      set_load_transactions_params(newParams)
+      load_transactions() // 立即调用
+
+      // 清除标记
+      currentPage.setData({ updateList: null })
+    }
+
+    load_wallet_data()
+    check_password_status()
   });
 
+
+
   const modify_load_transactions_params = () => {
     set_transactions([]);
     const { type, transaction_sub_type } = filterParams;
diff --git a/src/user_pages/withdrawal/index.scss b/src/user_pages/withdrawal/index.scss
index f8e8f6c..2d2880f 100644
--- a/src/user_pages/withdrawal/index.scss
+++ b/src/user_pages/withdrawal/index.scss
@@ -161,6 +161,10 @@
       font-size: 20px;
       line-height: 16px;
       margin: 20px 0;
+      font-style: italic;
+      .integer {
+        font-size: 36px;
+      }
     }
 
     .password_container {
diff --git a/src/user_pages/withdrawal/index.tsx b/src/user_pages/withdrawal/index.tsx
index e3666d2..a5bba61 100644
--- a/src/user_pages/withdrawal/index.tsx
+++ b/src/user_pages/withdrawal/index.tsx
@@ -57,6 +57,13 @@ const Withdrawal: React.FC = () => {
 
   const [mapErrorCodes, setMapErrorCodes] = useState({});
 
+  const [withdrawSuccess, setWithdrawSuccess] = useState(false);
+
+  const [inputValueObj, setInputValueObj] = useState({
+    integer: "0",
+    decimal: "00"
+  })
+
   useDidShow(() => {
     load_wallet_data();
     getWithdrawErrorCodes();
@@ -75,6 +82,13 @@ const Withdrawal: React.FC = () => {
     }
   }, [show_withdraw_popup]);
 
+  useEffect(() => {
+    const value = Number(inputValue).toFixed(2).split(".")
+    const integer = value[0]
+    const decimal = value[1]
+    setInputValueObj({ integer, decimal })
+  }, [inputValue])
+
   const validateWithdrawAmount = (amount: string) => {
     if (Number(amount) > Number(walletInfo.balance)) {
       setShowTips(true);
@@ -197,6 +211,7 @@ const Withdrawal: React.FC = () => {
           setInputValue("0.00");
           // 重新加载数据
           load_wallet_data();
+          setWithdrawSuccess(true);
         },
         fail: (res) => {
           console.log("微信转账失败:", res);
@@ -211,7 +226,7 @@ const Withdrawal: React.FC = () => {
           cancelText: "忘记密码",
           confirmText: "重试",
           cancelColor: "#000",
-          confirmColor: "#fff",
+          confirmColor: "#000",
         }).then((res) => {
           if (res.confirm) {
             set_show_withdraw_popup(true);
@@ -266,6 +281,11 @@ const Withdrawal: React.FC = () => {
           <View
             className="detail-navigator-back"
             onClick={() => {
+              const pages = Taro.getCurrentPages()
+              const prevPage = pages[pages.length - 2]
+              prevPage.setData({
+                updateList: withdrawSuccess
+              })
               Taro.navigateBack();
             }}
           >
@@ -363,7 +383,12 @@ const Withdrawal: React.FC = () => {
           onTouchMove={handlePopupClick}
           onTouchEnd={handlePopupClick}
         >
-          <View className="popup_text">{`¥${inputValue}`}</View>
+          <View className="popup_text">
+            <Text>¥</Text>
+            <Text className="integer">{inputValueObj.integer}</Text>
+            <Text>.</Text>
+            <Text>{inputValueObj.decimal}</Text>
+          </View>
           <View className="password_container">
             {password.map((item, index) => (
               <View key={index} className="password_item">