From 63df6a1a37539f3ab7aa0b176b2a782107a1dffa Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 20 八月 2025 15:28:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/pages/mine/index.vue | 62 +++++++++----------------------
1 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 0122195..167e50a 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -16,20 +16,8 @@
<div class="mine-avatar-wrapper" @click="goLogin">
<UserAvatar :size="52" class="mine-avatar" />
<div class="user-info" v-if="isLogin">
- <div class="user-info-item">{{ detail?.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>
- </div>
- <div class="user-info-unCertified" v-else>
- <img :src="IconAuth" class="user-info-unCertified-icon" />
- <div class="user-info-unCertified-text">宸插疄鍚�</div>
- </div>
- </div>
+ <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>
@@ -39,10 +27,12 @@
</div>
<div class="user-info-unCertified" v-else>
<img :src="IconAuth" class="user-info-unCertified-icon" />
- <div class="user-info-unCertified-text">宸茶璇�</div>
+ <div class="user-info-unCertified-text">
+ {{ EnumUserRealMethodText[userDetail?.realMethod] }}
+ </div>
</div>
</div>
- </div> -->
+ </div>
</div>
<div class="mine-go-login" v-else>鍘荤櫥褰�</div>
</div>
@@ -50,14 +40,14 @@
</UserHomeTopView>
</ContentView>
<ContentScrollView v-if="isLogin" class="mine-content-scroll-view">
- <!-- <List class="mine-list-wrapper mine-balance">
+ <List class="mine-list-wrapper mine-balance">
<div class="mine-balance-title">鎴戠殑浣欓</div>
- <div class="mine-balance-money">锟{ toThousand(100) }}</div>
+ <div class="mine-balance-money">锟{ toThousand(0) }}</div>
<div class="mine-balance-btn" @click="goMineWallet">
杩涘叆鎴戠殑閽卞寘
<img :src="IconArrow" class="mine-balance-btn-icon" />
</div>
- </List> -->
+ </List>
<List class="mine-list-wrapper mine-order-list">
<div class="mine-order-list-title">
<div class="mine-order-list-title-text">鎴戠殑璁㈠崟</div>
@@ -67,7 +57,7 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :value="detail?.taskCount ?? 0"
+ :value="userDetail?.taskCount ?? 0"
@click="goMineSign"
>
<img :src="IconOrderSign" class="mine-order-list-icon" />
@@ -76,7 +66,7 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :value="detail?.hirePassTaskCount ?? 0"
+ :value="userDetail?.hirePassTaskCount ?? 0"
@click="goMineHire"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
@@ -85,7 +75,7 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :value="detail?.hireRefuseTaskCount ?? 0"
+ :value="userDetail?.hireRefuseTaskCount ?? 0"
@click="goMineCancel"
>
<img :src="IconOrderCancel" class="mine-order-list-icon" />
@@ -95,7 +85,7 @@
</List>
<List class="mine-list-wrapper mine-setting-list">
<ListItem :icon="IconCollect" title="鎴戞敹钘忕殑浠诲姟" @click="goMineCollectTask"></ListItem>
- <!-- <ListItem :icon="IconAgreement" title="鍗忚绛剧害" @click="goMineAgreementSign"></ListItem> -->
+ <ListItem :icon="IconAgreement" title="鍗忚绛剧害" @click="goMineAgreementSign"></ListItem>
<ListItem :icon="IconSetting" title="璁剧疆" @click="goSetting"></ListItem>
<!-- <ListItem :icon="IconRecruit" title="鎴戣鎷涗汉/鐢ㄤ汉" @click="goSetting"></ListItem> -->
</List>
@@ -117,6 +107,7 @@
import { useUser, useIsLogin, useGoLogin } from '@/hooks';
import Taro from '@tarojs/taro';
import { RouterPath, OssAssets } from '@/constants';
+import { EnumUserRealMethodText } from '@12333/constants';
import { List, ListItem } from '@12333/components';
import { useSystemStore } from '@/stores/modules/system';
import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
@@ -124,34 +115,17 @@
import { useQuery } from '@tanstack/vue-query';
import * as authServices from '@12333/services/apiV2/auth';
-const { userDetail, isCertified } = useUser();
+const { userDetail, isCertified, updateUserInfo } = useUser();
const isLogin = useIsLogin();
const systemStore = useSystemStore();
const { goLoginFn } = useGoLogin();
const bgHeight = computed(() => 133 + systemStore.navHeight);
-const {
- isLoading,
- isError,
- data: detail,
- refetch,
-} = useQuery({
- queryKey: ['authServices/getPersonalLoginInfo'],
- queryFn: async () => {
- return await authServices.getPersonalLoginInfo(
- {},
- {
- showLoading: false,
- }
- );
- },
- placeholderData: () => ({} as API.GetPersonalLoginInfoQueryResult),
- enabled: isLogin,
-});
-
Taro.useDidShow(() => {
- refetch();
+ if (isLogin.value) {
+ updateUserInfo();
+ }
});
function goLogin() {
--
Gitblit v1.9.1