From e7f0a81e522574957b754623996553cb43ad58a5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 18:44:18 +0800
Subject: [PATCH] fix: 修改登录

---
 packages/services/apiV2/dictionary.ts                               |   15 +++
 apps/cMiniApp/src/subpackages/mine/setting/setting.vue              |    4 
 packages/services/apiV2/index.ts                                    |    4 
 apps/bMiniApp/src/stores/modules/user.ts                            |    1 
 packages/hooks/area.ts                                              |   18 +++
 apps/bMiniApp/src/subpackages/mine/setting/setting.vue              |    4 
 apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue        |   10 +
 apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue |    6 
 packages/services/apiV2/typings.d.ts                                |  193 +++++++++++++++++++++++++++++++++++++
 packages/services/apiV2/taskUser.ts                                 |   15 +++
 packages/services/apiV2/userResume.ts                               |   12 ++
 apps/cMiniApp/src/stores/modules/user.ts                            |    1 
 12 files changed, 265 insertions(+), 18 deletions(-)

diff --git a/apps/bMiniApp/src/stores/modules/user.ts b/apps/bMiniApp/src/stores/modules/user.ts
index 405d027..e95ef68 100644
--- a/apps/bMiniApp/src/stores/modules/user.ts
+++ b/apps/bMiniApp/src/stores/modules/user.ts
@@ -102,6 +102,7 @@
             encryptedData: detail.encryptedData,
             iv: detail.iv,
             sessionKey: wxMiniAppUserLoginRes.sessionKey,
+            accessToken: wxMiniAppUserLoginRes.accessToken,
           });
           res.accessToken = bindRes.accessToken;
           this.loginSuccess(res);
diff --git a/apps/bMiniApp/src/subpackages/mine/setting/setting.vue b/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
index 22725e2..11b99e2 100644
--- a/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/bMiniApp/src/subpackages/mine/setting/setting.vue
@@ -1,13 +1,13 @@
 <template>
   <PageLayout title="璁剧疆" class="setting-page-wrapper" hasBorder>
     <List>
-      <ListItem title="鐧诲綍璐﹀彿">
+      <!-- <ListItem title="鐧诲綍璐﹀彿">
         <template #extra>
           <div class="user-account">
             {{ userAccount }}
           </div>
         </template>
-      </ListItem>
+      </ListItem> -->
       <ListItem title="鐢ㄦ埛鍗忚" @click="goMineUserPolicy"></ListItem>
       <ListItem title="闅愮鏀跨瓥" @click="goPrivacyPolicy"></ListItem>
       <ListItem title="閫�鍑虹櫥褰�" @click="handleLoginout"></ListItem>
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 9d19582..07fc40d 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -125,12 +125,14 @@
         <ChooseInputWithDatePicker
           v-model="form.beginTime"
           :minDate="nowDate"
+          placeholder="璇烽�夋嫨浠诲姟寮�濮嬫棩鏈�"
         ></ChooseInputWithDatePicker>
       </nut-form-item>
       <nut-form-item label="浠诲姟缁撴潫鏃ユ湡:" class="bole-form-item" prop="endTime" label-width="90px">
         <ChooseInputWithDatePicker
           v-model="form.endTime"
           :minDate="nowDate"
+          placeholder="璇烽�夋嫨浠诲姟缁撴潫鏃ユ湡"
         ></ChooseInputWithDatePicker>
       </nut-form-item>
     </nut-form>
@@ -200,8 +202,8 @@
   serviceFee: '' as any as number,
   settlementCycle: EnumSettlementCycle.Month,
   benefits: [] as string[],
-  ageMinLimit: 0,
-  ageMaxLimit: 0,
+  ageMinLimit: '' as any as number,
+  ageMaxLimit: '' as any as number,
   genderLimit: 0 as any as EnumUserGender,
   credentialLimits: [] as string[],
   // address: '',
@@ -244,10 +246,10 @@
       required: true,
       message: '璇疯緭鍏ュ勾榫勮姹�',
       validator: () => {
-        if (!form.ageMinLimit) {
+        if (!form.ageMinLimit && form.ageMinLimit > 0) {
           return Promise.reject('璇疯緭鍏ュ勾榫勮姹�');
         }
-        if (!form.ageMaxLimit) {
+        if (!form.ageMaxLimit && form.ageMaxLimit > 0) {
           return Promise.reject('璇疯緭鍏ュ勾榫勮姹�');
         }
         if (Number(form.ageMaxLimit) <= Number(form.ageMinLimit)) {
diff --git a/apps/cMiniApp/src/stores/modules/user.ts b/apps/cMiniApp/src/stores/modules/user.ts
index 512ca6b..c678128 100644
--- a/apps/cMiniApp/src/stores/modules/user.ts
+++ b/apps/cMiniApp/src/stores/modules/user.ts
@@ -102,6 +102,7 @@
             encryptedData: detail.encryptedData,
             iv: detail.iv,
             sessionKey: wxMiniAppUserLoginRes.sessionKey,
+            accessToken: wxMiniAppUserLoginRes.accessToken,
           });
           res.accessToken = bindRes.accessToken;
           this.loginSuccess(res);
diff --git a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
index fb29bf4..58944b8 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
@@ -43,7 +43,7 @@
 import { ChooseInputWithPicker, ChooseInputWithAreaPicker } from '@12333/components';
 import { convertApi2FormUrlOnlyOne, Message, setOSSLink } from '@12333/utils';
 import { useAreaTree, useDictionaryDataSelect } from '@12333/hooks';
-import { CategoryCode } from '@12333/constants';
+import { AreaType, CategoryCode } from '@12333/constants';
 import * as userResumeServices from '@12333/services/apiV2/userResume';
 import Taro from '@tarojs/taro';
 import { useQuery } from '@tanstack/vue-query';
@@ -60,7 +60,9 @@
   categoryCode: CategoryCode.Education,
 });
 
-const { areaTree } = useAreaTree();
+const { areaTree } = useAreaTree({
+  maxLayer: AreaType.City,
+});
 
 const form = reactive({
   avatar: [],
diff --git a/apps/cMiniApp/src/subpackages/mine/setting/setting.vue b/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
index 22725e2..11b99e2 100644
--- a/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
@@ -1,13 +1,13 @@
 <template>
   <PageLayout title="璁剧疆" class="setting-page-wrapper" hasBorder>
     <List>
-      <ListItem title="鐧诲綍璐﹀彿">
+      <!-- <ListItem title="鐧诲綍璐﹀彿">
         <template #extra>
           <div class="user-account">
             {{ userAccount }}
           </div>
         </template>
-      </ListItem>
+      </ListItem> -->
       <ListItem title="鐢ㄦ埛鍗忚" @click="goMineUserPolicy"></ListItem>
       <ListItem title="闅愮鏀跨瓥" @click="goPrivacyPolicy"></ListItem>
       <ListItem title="閫�鍑虹櫥褰�" @click="handleLoginout"></ListItem>
diff --git a/packages/hooks/area.ts b/packages/hooks/area.ts
index 7cca58c..c8dd413 100644
--- a/packages/hooks/area.ts
+++ b/packages/hooks/area.ts
@@ -5,6 +5,7 @@
 import Taro, { EventChannel } from '@tarojs/taro';
 import { useDictionaryDataSelect } from './dic';
 import axios from 'axios';
+import * as dictionaryServices from '@12333/services/apiV2/dictionary';
 
 export function useArea() {
   const queryClient = useQueryClient();
@@ -38,9 +39,22 @@
 export function useAreaTree(options = {} as UseAreaTreeOptions) {
   const { maxLayer = AreaType.Area } = options;
 
-  const { areaList } = useAllAreaList();
+  // const { areaList } = useAllAreaList();
 
-  const areaTree = computed(() => formatAreaListToTree(areaList.value, null, unref(maxLayer)));
+  const { data: areaTree } = useQuery({
+    queryKey: ['dictionaryServices/getAreaSelect', maxLayer],
+    queryFn: () => {
+      return dictionaryServices.getAreaSelect(
+        {
+          maxDeep: unref(maxLayer),
+        },
+        { showLoading: false }
+      );
+    },
+  });
+
+  // const areaTree = computed(() => formatAreaListToTree(areaList.value, null, unref(maxLayer)));
+  console.log('areaTree: ', areaTree);
 
   return { areaTree: areaTree };
 }
diff --git a/packages/services/apiV2/dictionary.ts b/packages/services/apiV2/dictionary.ts
index 4c74b85..eacd853 100644
--- a/packages/services/apiV2/dictionary.ts
+++ b/packages/services/apiV2/dictionary.ts
@@ -17,6 +17,21 @@
   });
 }
 
+/** 鏌ヨ鍦板尯閫夋嫨鍣� GET /api/flexjob/dictionary/getAreaSelect */
+export async function getAreaSelect(
+  // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+  params: API.APIgetAreaSelectParams,
+  options?: API.RequestConfig
+) {
+  return request<API.GetAreaSelectQueryResultOption[]>('/api/flexjob/dictionary/getAreaSelect', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
 /** 鑾峰彇鏁版嵁瀛楀吀绫诲埆鍒嗛〉鍒楄〃鏁版嵁 POST /api/flexjob/dictionary/getDictionaryCategories */
 export async function getDictionaryCategories(
   body: API.GetDictionaryCategoriesQuery,
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index a1555c0..110baef 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -7,10 +7,10 @@
 import * as user from './user';
 import * as dictionary from './dictionary';
 import * as auth from './auth';
+import * as taskUser from './taskUser';
 import * as task from './task';
 import * as enterprise from './enterprise';
 import * as role from './role';
-import * as taskUser from './taskUser';
 import * as menu from './menu';
 export default {
   userResume,
@@ -18,9 +18,9 @@
   user,
   dictionary,
   auth,
+  taskUser,
   task,
   enterprise,
   role,
-  taskUser,
   menu,
 };
diff --git a/packages/services/apiV2/taskUser.ts b/packages/services/apiV2/taskUser.ts
index 694be3e..33930c4 100644
--- a/packages/services/apiV2/taskUser.ts
+++ b/packages/services/apiV2/taskUser.ts
@@ -25,3 +25,18 @@
     ...(options || {}),
   });
 }
+
+/** 浠诲姟褰曠敤 PUT /api/flexjob/taskUser/setTaskUserHire */
+export async function setTaskUserHire(
+  body: API.SetTaskUserHireCommand,
+  options?: API.RequestConfig
+) {
+  return request<number>('/api/flexjob/taskUser/setTaskUserHire', {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 8638b22..79f945a 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -8,6 +8,11 @@
     request?: GetAliyunOSSAcsQuery;
   }
 
+  interface APIgetAreaSelectParams {
+    /** 鏈�澶ф繁搴� */
+    maxDeep?: number;
+  }
+
   interface APIgetCurrentLogierMenuParams {
     /** Id */
     id?: string;
@@ -36,6 +41,8 @@
     all?: boolean;
     /** 鏈�澶ф繁搴� */
     maxDeep?: number;
+    /** 鎼哄甫涓嬬骇 */
+    withChildren?: boolean;
   }
 
   interface APIgetEnterpriseElectronSignSettingParams {
@@ -151,6 +158,8 @@
   }
 
   interface BindWxmpUserInfoCommand {
+    /** 璁块棶浠ょ墝 */
+    accessToken: string;
     /** 鍖呮嫭鏁忔劅鏁版嵁鍦ㄥ唴鐨勫畬鏁寸敤鎴蜂俊鎭殑鍔犲瘑鏁版嵁 */
     encryptedData: string;
     /** 鍔犲瘑绠楁硶鐨勫垵濮嬪悜閲� */
@@ -679,6 +688,24 @@
     timestamp?: number;
   }
 
+  interface FriendlyResultGetUserResumesQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetUserResumesQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
   interface FriendlyResultGetUserResumeWorkExperienceQueryResult {
     /** 璺熻釜Id */
     traceId?: string;
@@ -725,6 +752,25 @@
     errorCode?: string;
     /** 鏁版嵁 */
     data?: number;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultListGetAreaSelectQueryResultOption {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    /** 鏁版嵁 */
+    data?: GetAreaSelectQueryResultOption[];
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -1005,6 +1051,25 @@
     requestId?: string;
   }
 
+  interface GetAreaSelectQueryResultOption {
+    /** Id */
+    areaCode?: string;
+    /** 鍦板尯鍚嶇О */
+    areaName?: string;
+    /** 瀛愮骇 */
+    children?: GetAreaSelectQueryResultOption[];
+    /** Id */
+    id?: string;
+    /** 涓婄骇缂栧彿 */
+    parentCode?: string;
+    /** 灞傜骇 */
+    leyer?: number;
+    /** 鎺掑簭 */
+    sort?: number;
+    /** 蹇�熸煡璇� */
+    quickQuery?: string;
+  }
+
   type GetCurrentLogierMenusQuery = Record<string, any>;
 
   interface GetDictionaryCategoriesQuery {
@@ -1027,6 +1092,50 @@
   }
 
   type GetDictionaryCategorySelectQuery = Record<string, any>;
+
+  interface GetDictionaryCategorySelectQueryOption {
+    /** Id */
+    id?: string;
+    /** 缂栧彿 */
+    code?: string;
+    /** 鍚嶇О */
+    name?: string;
+    /** 瀛楁鍚嶏紙閫楀彿闅斿紑锛� */
+    fieldNames?: string;
+    /** 澶囨敞 */
+    remark?: string;
+  }
+
+  interface GetDictionaryDataSelectQueryResultOption {
+    /** Id */
+    id?: string;
+    /** 涓婄骇Id */
+    parentId?: string;
+    /** 涓婄骇缂栧彿 */
+    parentCode?: string;
+    /** 瀛愮骇 */
+    children?: SelectOptionStringGetDictionaryDataSelectQueryResultOption[];
+    /** 瀛楀吀璺緞 */
+    path?: string;
+    /** 娣卞害 */
+    deep?: number;
+    /** 鎺掑簭 */
+    sort?: number;
+    /** 缂栧彿 */
+    code?: string;
+    /** 鏄剧ず鍐呭 */
+    content: string;
+    /** 瀛楁1 */
+    field1?: string;
+    /** 瀛楁2 */
+    field2?: string;
+    /** 瀛楁3 */
+    field3?: string;
+    /** 瀛楁4 */
+    field4?: string;
+    /** 瀛楁5 */
+    field5?: string;
+  }
 
   interface GetDictionaryDatasQuery {
     /** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
@@ -1424,8 +1533,12 @@
     enterpriseId?: string;
     /** 浼佷笟鍏ㄧО */
     enterpriseName?: string;
+    /** 鑱旂郴鐢佃瘽 */
+    contactPhoneNumber?: string;
     /** 鍦ㄦ嫑宀椾綅鏁伴噺 */
     taskCount?: number;
+    /** 鎶ュ悕浜烘暟 */
+    applyCount?: number;
     /** 浠诲姟鍚嶇О */
     name?: string;
     billingMethod?: EnumBillingMethod;
@@ -1467,6 +1580,7 @@
     isCollected?: boolean;
     status?: EnumTaskStatus;
     releaseStatus?: EnumTaskReleaseStatus;
+    hireStatus?: EnumTaskUserHireStatus;
   }
 
   interface GetTaskInfoQueryResultBenefit {
@@ -1730,6 +1844,8 @@
     weight?: number;
     /** 鐢熸椿鐓� */
     photos?: string[];
+    /** 缁忓巻 */
+    taskInfoUsers?: GetUserResumeQueryResultExperience[];
   }
 
   interface GetUserResumeQueryResultCredential {
@@ -1760,6 +1876,69 @@
     expectJobCode?: string;
     /** 鏈熸湜宀椾綅 */
     expectJobContent?: string;
+  }
+
+  interface GetUserResumeQueryResultExperience {
+    /** 绛剧害鏃堕棿 */
+    signContractTime?: string;
+    /** 浼佷笟鍏ㄧО */
+    enterpriseName?: string;
+    /** 浠诲姟鍚嶇О */
+    name?: string;
+  }
+
+  interface GetUserResumesQuery {
+    /** 浠诲姟Id */
+    taskInfoId?: string;
+    /** 鏈熸湜宀椾綅缂栧彿 */
+    userExpectJobs?: string[];
+    gender?: EnumUserGender;
+    /** 韬唤缂栧彿 */
+    personalIdentityCode?: string;
+    /** 骞撮緞鑼冨洿鏈�灏� */
+    ageMin?: number;
+    /** 骞撮緞鑼冨洿澶� */
+    ageMax?: number;
+    /** 璧勬牸璇佷功缂栧彿 */
+    userCredentials?: string[];
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetUserResumesQueryResult {
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetUserResumesQueryResultItem[];
+  }
+
+  interface GetUserResumesQueryResultItem {
+    /** 鐢ㄦ埛Id */
+    id?: string;
+    /** 澶村儚 */
+    avatar?: string;
+    /** 濮撳悕 */
+    name?: string;
+    /** 鎵嬫満鍙� */
+    contactPhoneNumber?: string;
+    gender?: EnumUserGender;
+    /** 鏄惁瀹炲悕 */
+    isReal?: boolean;
+    /** 骞撮緞 */
+    age?: number;
+    /** 韬唤缂栧彿 */
+    personalIdentityCode?: string;
+    /** 韬唤 */
+    personalIdentityContent?: string;
+    /** 瀛﹀巻缂栧彿 */
+    educationalBackgroundCode?: string;
+    /** 瀛﹀巻 */
+    educationalBackgroundContent?: string;
+    /** 涓婂矖娆℃暟 */
+    taskCount?: number;
+    /** 宸ヤ綔璧勫巻 */
+    workSeniority?: string;
+    /** 宸ヤ綔缁忛獙 */
+    workExperience?: string;
+    hireStatus?: EnumTaskUserHireStatus;
   }
 
   type GetUserResumeWorkExperienceQuery = Record<string, any>;
@@ -2185,8 +2364,7 @@
     value?: string;
     /** 鏍囩 */
     label?: string;
-    /** 鏁版嵁 */
-    data?: any;
+    data?: GetDictionaryCategorySelectQueryOption;
   }
 
   interface SelectOptionStringGetDictionaryDataSelectQueryResultOption {
@@ -2194,8 +2372,7 @@
     value?: string;
     /** 鏍囩 */
     label?: string;
-    /** 鏁版嵁 */
-    data?: any;
+    data?: GetDictionaryDataSelectQueryResultOption;
   }
 
   interface SendLoginOrRegisterVerifyCodeCommand {
@@ -2264,6 +2441,14 @@
     releaseStatus?: EnumTaskReleaseStatus;
   }
 
+  interface SetTaskUserHireCommand {
+    /** 浠诲姟Id */
+    id?: string;
+    /** 浜哄憳Id */
+    userIds?: string[];
+    hireStatus?: EnumTaskUserHireStatus;
+  }
+
   interface SetUserInfoRolesCommand {
     /** 鐢ㄦ埛Id */
     userInfoId?: string;
diff --git a/packages/services/apiV2/userResume.ts b/packages/services/apiV2/userResume.ts
index 6ab9057..e708586 100644
--- a/packages/services/apiV2/userResume.ts
+++ b/packages/services/apiV2/userResume.ts
@@ -127,6 +127,18 @@
   );
 }
 
+/** 鏌ヨ鐏靛伐鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/userResume/getUserResumes */
+export async function getUserResumes(body: API.GetUserResumesQuery, options?: API.RequestConfig) {
+  return request<API.GetUserResumesQueryResult>('/api/user/userResume/getUserResumes', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 鏌ヨ鐢ㄦ埛绠�鍘�-宸ヤ綔缁忛獙 GET /api/user/userResume/getUserResumeWorkExperience */
 export async function getUserResumeWorkExperience(
   // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)

--
Gitblit v1.9.1