From 4ef86d8a1f494caa1e136ff78f9ea258d01164b1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 16 十月 2025 09:28:44 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.1.2

---
 apps/cMiniApp/src/pages/mine/index.vue |   60 +++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index ec2ea79..fde6502 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -22,20 +22,20 @@
                   <div class="user-info-unCertified">
                     <div
                       class="user-info-unCertified-text"
-                      v-if="userDetail.realStatus === EnumPersonalUserRealStatus.UnReal"
+                      v-if="userDetail?.realStatus === EnumPersonalUserRealStatus.UnReal"
                     >
                       鏈璇�
                     </div>
                     <div class="user-info-unCertified-text" v-else>
                       {{ EnumUserRealMethodText[userDetail?.realMethod]
-                      }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
+                      }}{{ EnumPersonalUserRealStatusText[userDetail?.realStatus] }}
                     </div>
                     <div
                       class="user-info-unCertified-btn"
                       @click.stop="goAuthentication"
                       v-if="
-                        userDetail.realStatus === EnumPersonalUserRealStatus.UnReal ||
-                        userDetail.realStatus === EnumPersonalUserRealStatus.Fail
+                        userDetail?.realStatus === EnumPersonalUserRealStatus.UnReal ||
+                        userDetail?.realStatus === EnumPersonalUserRealStatus.Fail
                       "
                     >
                       绔嬪嵆璁よ瘉
@@ -44,7 +44,7 @@
                   <!-- <div class="user-info-unCertified" v-else>
                     <img :src="IconAuth" class="user-info-unCertified-icon" />
                     <div class="user-info-unCertified-text">
-                      {{ EnumUserRealMethodText[userDetail?.realMethod] }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
+                      {{ EnumUserRealMethodText[userDetail?.realMethod] }}{{ EnumPersonalUserRealStatusText[userDetail?.realStatus] }}
                     </div>
                   </div> -->
                 </div>
@@ -57,8 +57,26 @@
     </ContentView>
     <ContentScrollView v-if="isLogin" class="mine-content-scroll-view">
       <List class="mine-list-wrapper mine-balance">
-        <div class="mine-balance-title">鎴戠殑浣欓</div>
-        <div class="mine-balance-money">锟{ toThousand(userDetail?.balance) }}</div>
+        <div class="mine-balance-content">
+          <div class="mine-balance-content-item">
+            <div class="mine-balance-content-item-title">鎴戠殑鏀剁泭</div>
+            <div class="mine-balance-content-item-money income">
+              锟{ toThousand(userDetail?.balance ?? 0) }}
+            </div>
+          </div>
+          <div class="mine-balance-content-item">
+            <div class="mine-balance-content-item-title">寰呯粨绠�</div>
+            <div class="mine-balance-content-item-money settlement">
+              锟{ toThousand(userDetail?.balance ?? 0) }}
+            </div>
+          </div>
+          <div class="mine-balance-content-item">
+            <div class="mine-balance-content-item-title">鍙彁鐜�</div>
+            <div class="mine-balance-content-item-money withdraw">
+              锟{ toThousand(userDetail?.balance ?? 0) }}
+            </div>
+          </div>
+        </div>
         <div class="mine-balance-btn" @click="goMineWallet">
           杩涘叆鎴戠殑閽卞寘
           <img :src="IconArrow" class="mine-balance-btn-icon" />
@@ -133,6 +151,7 @@
 import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
 import { toThousand } from '@12333/utils';
 import { useIntervalFn } from 'senin-mini/hooks';
+import { useQuery } from '@tanstack/vue-query';
 
 const { userDetail, isCertified, updateUserInfo } = useUser();
 const isLogin = useIsLogin();
@@ -140,24 +159,19 @@
 const { goLoginFn } = useGoLogin();
 const bgHeight = computed(() => 133 + systemStore.navHeight);
 
-const { stop, start } = useIntervalFn(updateUserInfo, 5000, {
-  immediate: false,
-});
-Taro.useDidShow(({ scene }) => {
-  if (isLogin.value) {
-    updateUserInfo();
-    if (userDetail.value?.realStatus === EnumPersonalUserRealStatus.Checking) {
-      start();
-    } else {
-      stop();
-    }
-  } else {
-    stop();
-  }
+useQuery({
+  queryKey: ['updateUserInfo'],
+  queryFn: () => {},
+  enabled: computed(
+    () => isLogin.value && userDetail.value?.realStatus === EnumPersonalUserRealStatus.Checking
+  ),
+  refetchInterval: 5000,
 });
 
-Taro.useDidHide(() => {
-  stop();
+Taro.useDidShow(() => {
+  if (isLogin.value) {
+    updateUserInfo();
+  }
 });
 
 function goLogin() {

--
Gitblit v1.9.1