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
---
apps/cMiniApp/src/hooks/user.ts | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/apps/cMiniApp/src/hooks/user.ts b/apps/cMiniApp/src/hooks/user.ts
index 1f9b943..980d82f 100644
--- a/apps/cMiniApp/src/hooks/user.ts
+++ b/apps/cMiniApp/src/hooks/user.ts
@@ -2,47 +2,32 @@
import Taro from '@tarojs/taro';
import { object2query, LocationUtils } from '@12333/utils';
import { ParkOrHRStatus, UserCertificationFrontStatus } from '@12333/constants';
-import * as userServices from '@12333/services/api/User';
-import { useQuery } from '@tanstack/vue-query';
+import { useQuery, useQueryClient } from '@tanstack/vue-query';
import { MaybeRef } from 'vue';
import { useRefeshDidShow } from '@12333/hooks/infiniteLoading';
+import * as userResumeServices from '@12333/services/apiV2/userResume';
+import { useUserResume as useUserResumeHook } from '@12333/hooks';
export function useUser() {
const userStore = useUserStore();
- const { userDetail, userInfo, locationCity } = storeToRefs(userStore);
+ const { userDetail, userInfo, locationCity, userId } = storeToRefs(userStore);
function updateUserInfo() {
return userStore.getCurrentUserInfo();
}
- const isCompanyAudited = computed(() => {
- return userDetail.value?.openHRSiteStatus === ParkOrHRStatus.Running;
- });
-
- /**
- * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
- */
- const isCompletePersonalInfo = computed(() => {
- return (
- !!userDetail.value?.customerName &&
- !!userDetail.value?.contacter &&
- !!userDetail.value?.cityName
- );
- });
-
const isCertified = computed(() => {
- return userDetail.value?.frontStatus === UserCertificationFrontStatus.Certified;
+ return userDetail.value?.isReal;
});
return {
user: userInfo,
userDetail: userDetail,
updateUserInfo,
- isCompletePersonalInfo,
- isCompanyAudited,
isCertified,
locationCity,
+ userId,
};
}
@@ -93,3 +78,8 @@
goLoginFn,
};
}
+
+export function useUserResume() {
+ const { userId } = useUser();
+ return useUserResumeHook({ userId });
+}
--
Gitblit v1.9.1