From 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:36:56 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
apps/cMiniApp/src/pages/mine/index.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 167e50a..d92cf10 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -19,18 +19,34 @@
<div class="user-info-item">{{ userDetail?.name ?? '' }}</div>
<div class="user-info-auth">
<div class="user-info-auth-item">
- <div class="user-info-unCertified" v-if="!isCertified">
- <div class="user-info-unCertified-text">鏈璇�</div>
- <div class="user-info-unCertified-btn" @click.stop="goAuthentication">
+ <div class="user-info-unCertified">
+ <div
+ class="user-info-unCertified-text"
+ v-if="userDetail.realStatus === EnumPersonalUserRealStatus.UnReal"
+ >
+ 鏈璇�
+ </div>
+ <div class="user-info-unCertified-text" v-else>
+ {{ EnumUserRealMethodText[userDetail?.realMethod]
+ }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
+ </div>
+ <div
+ class="user-info-unCertified-btn"
+ @click.stop="goAuthentication"
+ v-if="
+ userDetail.realStatus === EnumPersonalUserRealStatus.UnReal ||
+ userDetail.realStatus === EnumPersonalUserRealStatus.Fail
+ "
+ >
绔嬪嵆璁よ瘉
</div>
</div>
- <div class="user-info-unCertified" v-else>
+ <!-- <div class="user-info-unCertified" v-else>
<img :src="IconAuth" class="user-info-unCertified-icon" />
<div class="user-info-unCertified-text">
- {{ EnumUserRealMethodText[userDetail?.realMethod] }}
+ {{ EnumUserRealMethodText[userDetail?.realMethod] }}{{ EnumPersonalUserRealStatusText[userDetail.realStatus] }}
</div>
- </div>
+ </div> -->
</div>
</div>
</div>
@@ -42,7 +58,7 @@
<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(0) }}</div>
+ <div class="mine-balance-money">锟{ toThousand(userDetail?.balance) }}</div>
<div class="mine-balance-btn" @click="goMineWallet">
杩涘叆鎴戠殑閽卞寘
<img :src="IconArrow" class="mine-balance-btn-icon" />
@@ -107,13 +123,15 @@
import { useUser, useIsLogin, useGoLogin } from '@/hooks';
import Taro from '@tarojs/taro';
import { RouterPath, OssAssets } from '@/constants';
-import { EnumUserRealMethodText } from '@12333/constants';
+import {
+ EnumUserRealMethodText,
+ EnumPersonalUserRealStatusText,
+ EnumPersonalUserRealStatus,
+} from '@12333/constants';
import { List, ListItem } from '@12333/components';
import { useSystemStore } from '@/stores/modules/system';
import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
import { toThousand } from '@12333/utils';
-import { useQuery } from '@tanstack/vue-query';
-import * as authServices from '@12333/services/apiV2/auth';
const { userDetail, isCertified, updateUserInfo } = useUser();
const isLogin = useIsLogin();
@@ -122,9 +140,11 @@
const { goLoginFn } = useGoLogin();
const bgHeight = computed(() => 133 + systemStore.navHeight);
-Taro.useDidShow(() => {
+Taro.useDidShow(({ scene }) => {
if (isLogin.value) {
- updateUserInfo();
+ setTimeout(() => {
+ updateUserInfo();
+ }, 300);
}
});
--
Gitblit v1.9.1