From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:41:50 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
packages/constants/authenticationV2.ts | 15 +++++++++++----
apps/cMiniApp/src/pages/mine/index.vue | 34 +++++++++++++++++++++++++++-------
2 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index c578ff5..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>
@@ -107,7 +123,11 @@
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';
diff --git a/packages/constants/authenticationV2.ts b/packages/constants/authenticationV2.ts
index 0e6065f..7c84f7a 100644
--- a/packages/constants/authenticationV2.ts
+++ b/packages/constants/authenticationV2.ts
@@ -1,7 +1,14 @@
-import { EnumUserRealMethod } from './apiEnum';
+import { EnumUserRealMethod, EnumPersonalUserRealStatus } from './apiEnum';
export const EnumUserRealMethodText = {
- [EnumUserRealMethod.Face]: '瀹炰汉宸茶璇�',
- [EnumUserRealMethod.Identity3]: '宸插疄鍚�',
- [EnumUserRealMethod.Identity4]: '宸插疄鍚�',
+ [EnumUserRealMethod.Face]: '瀹炰汉',
+ [EnumUserRealMethod.Identity3]: '瀹炲悕',
+ [EnumUserRealMethod.Identity4]: '瀹炲悕',
+};
+
+export const EnumPersonalUserRealStatusText = {
+ [EnumPersonalUserRealStatus.UnReal]: '鏈璇�',
+ [EnumPersonalUserRealStatus.Checking]: '璁よ瘉涓�',
+ [EnumPersonalUserRealStatus.Fail]: '璁よ瘉澶辫触',
+ [EnumPersonalUserRealStatus.Real]: '宸茶璇�',
};
--
Gitblit v1.9.1