From fb243f3345c6f3ed7e7c8c2d98c39b5afc782b9a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 10:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/hooks/user.ts | 125 +++++------------------------------------
1 files changed, 16 insertions(+), 109 deletions(-)
diff --git a/apps/cMiniApp/src/hooks/user.ts b/apps/cMiniApp/src/hooks/user.ts
index cb81e5e..d6a9ac3 100644
--- a/apps/cMiniApp/src/hooks/user.ts
+++ b/apps/cMiniApp/src/hooks/user.ts
@@ -2,54 +2,41 @@
import Taro from '@tarojs/taro';
import { object2query, LocationUtils } from '@12333/utils';
import {
+ EnumUserBankCardAccess,
ParkOrHRStatus,
UserCertificationFrontStatus,
- MatchMakingIdentityEnum,
} 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, matchMakingIdentity, isSetMatchMakingIdentity, 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;
+ });
+
+ const isBindBank = computed(() => {
+ return userDetail.value?.bankCardAAccesses?.find(() => EnumUserBankCardAccess.Bank);
});
return {
user: userInfo,
userDetail: userDetail,
updateUserInfo,
- isCompletePersonalInfo,
- isCompanyAudited,
isCertified,
- matchMakingIdentity,
- isSetMatchMakingIdentity,
locationCity,
+ userId,
+ isBindBank,
};
}
@@ -74,20 +61,8 @@
const router = Taro.useRouter();
Taro.useReady(async () => {
- let res;
- try {
- res = await LocationUtils.getLocation();
- } catch (error) {}
if (isLogin.value && userStore.firstGetUserDetail) {
- userStore.firstGetUserDetail = false;
- if (LocationUtils.isProvinceChange(userStore.locationProvince)) {
- userStore.resetState();
- } else {
- userStore.getCurrentUserInfo();
- }
- }
- if (res?.result?.ad_info?.city && userStore.firstSetLocation) {
- userStore.setLocationCity(res.result.ad_info.city, res.result.ad_info.province);
+ userStore.getCurrentUserInfo();
}
if (needAuth && !isLogin.value) {
Taro.navigateTo({
@@ -113,75 +88,7 @@
};
}
-type UseUserTotalInfoOptions = {
- userId: MaybeRef<string>;
- enabled?: MaybeRef<boolean>;
-};
-
-export function useUserTotalInfo({ userId, enabled = true }: UseUserTotalInfoOptions) {
- const { data, refetch } = useQuery({
- queryKey: ['userServices/getUserTotalInfo', userId],
- queryFn: async () => {
- return await userServices.getUserTotalInfo(
- {
- userId: unref(userId),
- },
- { showLoading: false }
- );
- },
- placeholderData: () => ({} as API.GetUserTotalInfoOutput),
- enabled: computed(() => unref(enabled) && !!unref(userId)),
- });
-
- useRefeshDidShow({ queryKey: ['userServices/getUserTotalInfo', userId] });
-
- return {
- userTotalInfo: data,
- refetch,
- };
-}
-
-export function useUserSimpleInfo({ userId }: UseUserTotalInfoOptions) {
- const { data, refetch } = useQuery({
- queryKey: ['userServices/getUserSimpleInfo', userId],
- queryFn: async () => {
- return await userServices.getUserSimpleInfo(
- {
- userId: unref(userId),
- },
- { showLoading: false }
- );
- },
- placeholderData: () => ({} as API.UserSimpleInfo),
- enabled: computed(() => !!unref(userId)),
- });
-
- return {
- userSimpleInfo: data,
- };
-}
-
-type UseToggleMatchMakingIdentityOnLaunchOptions = {
- matchMakingIdentity: MatchMakingIdentityEnum;
-};
-
-export function useToggleMatchMakingIdentityOnLaunch({
- matchMakingIdentity,
-}: UseToggleMatchMakingIdentityOnLaunchOptions) {
- const launchOptions = Taro.getEnterOptionsSync();
- console.log('launchOptions: ', launchOptions);
-
- const userStore = useUserStore();
- const { userDetail } = useUser();
-
- onMounted(async () => {
- try {
- if (launchOptions.scene === 1037) {
- await userStore.setMatchMakingIdentity({
- matchMakingIdentity: matchMakingIdentity,
- userId: userDetail.value?.userId,
- });
- }
- } catch (error) {}
- });
+export function useUserResume() {
+ const { userId } = useUser();
+ return useUserResumeHook({ userId });
}
--
Gitblit v1.9.1