From efb7d8167c0293c463ca7b78aef09e261a5ec980 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 17:41:43 +0800 Subject: [PATCH] fix: 验收管理 --- apps/cMiniApp/src/hooks/user.ts | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/apps/cMiniApp/src/hooks/user.ts b/apps/cMiniApp/src/hooks/user.ts index f104353..a0d6025 100644 --- a/apps/cMiniApp/src/hooks/user.ts +++ b/apps/cMiniApp/src/hooks/user.ts @@ -2,15 +2,16 @@ 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(); @@ -32,7 +33,7 @@ }); const isCertified = computed(() => { - return userDetail.value?.frontStatus === UserCertificationFrontStatus.Certified; + return false; }); return { @@ -43,6 +44,7 @@ isCompanyAudited, isCertified, locationCity, + userId, }; } @@ -67,20 +69,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({ @@ -105,3 +95,8 @@ goLoginFn, }; } + +export function useUserResume() { + const { userId } = useUser(); + return useUserResumeHook({ userId }); +} -- Gitblit v1.9.1