From bd06057f03bc82fdbf4b75c3c810db6ff9da46b8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 14:10:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue | 2
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue | 5 +-
packages/services/apiV2/typings.d.ts | 73 ++++++++++++++++++++----------------
apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue | 2
packages/services/apiV2/auth.ts | 15 +++++++
5 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue
index cde4b75..e659738 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificate/InnerPage.vue
@@ -46,7 +46,7 @@
function handleAdOrEdit(id?: string) {
Taro.navigateTo({
- url: `${RouterPath.mineCertificateAddOrEdit}?id=${id}`,
+ url: `${RouterPath.mineCertificateAddOrEdit}?id=${id ?? ''}`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
index cf4db6e..123fc38 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -60,13 +60,14 @@
import { TaskStatusText, TaskStatus } from '@/constants';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { useQuery } from '@tanstack/vue-query';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
});
-const route = useRoute();
-const id = route.params?.id as string;
+const router = Taro.useRouter();
+const id = router.params?.id as string;
const isEdit = computed(() => !!id);
const form = reactive({
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue
index 4439660..87b07bf 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineJobIntention/InnerPage.vue
@@ -118,7 +118,7 @@
async function confirm() {
try {
let params: API.SaveUserResumeJobSeekingCommand = {
- userExpectJobsExpectJobCode: form.userExpectJobs,
+ userExpectJobs: form.userExpectJobs,
freeTime: form.freeTime,
jobSeekingStatus: form.jobSeekingStatus,
};
diff --git a/packages/services/apiV2/auth.ts b/packages/services/apiV2/auth.ts
index 6c5340a..38dc7f7 100644
--- a/packages/services/apiV2/auth.ts
+++ b/packages/services/apiV2/auth.ts
@@ -17,6 +17,21 @@
});
}
+/** 缁戝畾寰俊灏忕▼搴忕敤鎴蜂俊鎭� POST /api/user/auth/bindWxmpUserInfo */
+export async function bindWxmpUserInfo(
+ body: API.BindWxmpUserInfoCommand,
+ options?: API.RequestConfig
+) {
+ return request<API.LoginCommandCallback>('/api/user/auth/bindWxmpUserInfo', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇闃块噷浜慜SS鎺堟潈淇℃伅 GET /api/user/auth/getAliyunOSSAcs */
export async function getAliyunOSSAcs(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 8f283be..1d549f8 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -147,6 +147,15 @@
verifyCode?: string;
}
+ interface BindWxmpUserInfoCommand {
+ /** 鍖呮嫭鏁忔劅鏁版嵁鍦ㄥ唴鐨勫畬鏁寸敤鎴蜂俊鎭殑鍔犲瘑鏁版嵁 */
+ encryptedData: string;
+ /** 鍔犲瘑绠楁硶鐨勫垵濮嬪悜閲� */
+ iv: string;
+ /** 鑾峰彇浼氳瘽瀵嗛挜 */
+ sessionKey: string;
+ }
+
interface DeleteDictionaryCategoryCommand {
ids: string[];
}
@@ -944,9 +953,9 @@
type GetCurrentLogierMenusQuery = Record<string, any>;
interface GetDictionaryCategoriesQuery {
- pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛� */
keywords?: string;
+ pageModel?: PagedListQueryPageModel;
}
interface GetDictionaryCategoriesQueryResultItem {
@@ -965,7 +974,6 @@
type GetDictionaryCategorySelectQuery = Record<string, any>;
interface GetDictionaryDatasQuery {
- pageModel?: PagedListQueryPageModel;
/** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
categoryId?: string;
/** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */
@@ -974,6 +982,7 @@
parentId?: string;
/** 鍏抽敭瀛� */
keywords?: string;
+ pageModel?: PagedListQueryPageModel;
}
interface GetDictionaryDatasQueryResultItem {
@@ -1065,11 +1074,11 @@
}
interface GetEnterprisesQuery {
- pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛� */
keywords?: string;
/** 鏄惁宸查厤缃� */
isConfigured?: boolean;
+ pageModel?: PagedListQueryPageModel;
}
interface GetEnterprisesQueryResultItem {
@@ -1214,9 +1223,9 @@
}
interface GetOperationUserInfosQuery {
- pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛� */
keywords?: string;
+ pageModel?: PagedListQueryPageModel;
}
interface GetOperationUserInfosQueryResultItem {
@@ -1299,11 +1308,11 @@
}
interface GetRolesQuery {
- pageModel?: PagedListQueryPageModel;
userType?: EnumUserType;
clientType?: EnumClientType;
/** 鍏抽敭瀛� */
keywords?: string;
+ pageModel?: PagedListQueryPageModel;
}
interface GetRolesQueryResultItem {
@@ -1341,7 +1350,7 @@
/** 浼佷笟Id */
enterpriseId?: string;
/** 浼佷笟鍏ㄧО */
- enterpriseEnterpriseName?: string;
+ enterpriseName?: string;
/** 鍦ㄦ嫑宀椾綅鏁伴噺 */
taskCount?: number;
/** 浠诲姟鍚嶇О */
@@ -1404,7 +1413,6 @@
}
interface GetTaskInfosQuery {
- pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */
keywords?: string;
/** 浼佷笟Id */
@@ -1423,13 +1431,14 @@
releaseStatus?: EnumTaskReleaseStatus;
recommendStatus?: EnumTaskRecommendStatus;
checkReceiveStatus?: EnumTaskCheckReceiveStatus;
+ pageModel?: PagedListQueryPageModel;
}
interface GetTaskInfosQueryResult {
+ objectData?: GetTaskInfosQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetTaskInfosQueryResultItem[];
- objectData?: GetTaskInfosQueryResultObjectData;
}
interface GetTaskInfosQueryResultItem {
@@ -1543,7 +1552,7 @@
/** 浣撻噸 */
weight?: number;
/** 鐢熸椿鐓� */
- photoImgs?: string[];
+ photos?: string[];
}
type GetUserResumeJobSeekingQuery = Record<string, any>;
@@ -1644,7 +1653,7 @@
/** 浣撻噸 */
weight?: number;
/** 鐢熸椿鐓� */
- photoImgs?: string[];
+ photos?: string[];
}
interface GetUserResumeQueryResultCredential {
@@ -1741,16 +1750,16 @@
}
interface PagedListQueryResultPageModel {
+ /** 鎬绘暟 */
+ totalCount?: number;
+ /** 椤垫暟 */
+ totalPage?: number;
/** 琛屾暟 */
rows?: number;
/** 椤电爜 */
page?: number;
/** 鎺掑簭 */
orderInput?: PagedListQueryPageModelOrderInput[];
- /** 鎬绘暟 */
- totalCount?: number;
- /** 椤垫暟 */
- totalPage?: number;
}
interface PasswordLoginCommand {
@@ -1763,8 +1772,6 @@
}
interface SaveDictionaryCategoryCommand {
- /** Id */
- id?: string;
/** 缂栧彿 */
code: string;
/** 鍚嶇О */
@@ -1773,11 +1780,11 @@
fieldNames?: string;
/** 鎺掑簭 */
sort?: number;
+ /** Id */
+ id?: string;
}
interface SaveDictionaryDataCommand {
- /** Id */
- id?: string;
/** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
categoryId?: string;
/** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */
@@ -1802,11 +1809,11 @@
sort?: number;
/** 鏄惁绂佺敤 */
isDisabled?: boolean;
+ /** Id */
+ id?: string;
}
interface SaveEnterpriseCommand {
- /** Id */
- id?: string;
/** 浼佷笟鍏ㄧО */
enterpriseName: string;
/** 缁熶竴绀句細淇＄敤浠ｇ爜 */
@@ -1833,11 +1840,11 @@
userName?: string;
/** 瀵嗙爜 */
password?: string;
+ /** Id */
+ id?: string;
}
interface SaveMenuButtonCommand {
- /** Id */
- id?: string;
/** 鑿滃崟Id */
parentId?: string;
/** 缂栧彿 */
@@ -1856,11 +1863,11 @@
sort?: number;
/** 澶囨敞 */
remark?: string;
+ /** Id */
+ id?: string;
}
interface SaveMenuCommand {
- /** Id */
- id?: string;
userType?: EnumUserType;
clientType?: EnumClientType;
/** 涓婄骇Id */
@@ -1885,6 +1892,8 @@
remark?: string;
/** 鍒嗙粍 */
groups?: SaveMenuCommandGroup[];
+ /** Id */
+ id?: string;
}
interface SaveMenuCommandButton {
@@ -1936,8 +1945,6 @@
}
interface SaveMenuFieldCommand {
- /** Id */
- id?: string;
/** 鑿滃崟Id */
parentId?: string;
/** 缂栧彿 */
@@ -1956,6 +1963,8 @@
sort?: number;
/** 澶囨敞 */
remark?: string;
+ /** Id */
+ id?: string;
}
interface SaveRoleCommand {
@@ -1986,8 +1995,6 @@
}
interface SaveTaskInfoCommand {
- /** Id */
- id?: string;
/** 浠诲姟鍚嶇О */
name: string;
billingMethod: EnumBillingMethod;
@@ -2019,11 +2026,11 @@
beginTime: string;
/** 浠诲姟缁撴潫鏃堕棿 */
endTime: string;
+ /** Id */
+ id?: string;
}
interface SaveUserResumeCredentialCommand {
- /** Id */
- id?: string;
/** 璇佷功绫诲瀷缂栧彿 */
typeCode: string;
/** 璇佷功缂栧彿 */
@@ -2040,6 +2047,8 @@
img: string;
/** 璇佷功鍙嶉潰鐓х墖 */
backImg?: string;
+ /** Id */
+ id?: string;
}
interface SaveUserResumeDetailCommand {
@@ -2048,12 +2057,12 @@
/** 浣撻噸 */
weight?: number;
/** 鐢熸椿鐓� */
- photosImg?: string[];
+ photos?: string[];
}
interface SaveUserResumeJobSeekingCommand {
/** 鐢ㄦ埛淇℃伅鏈熸湜宀椾綅 */
- userExpectJobsExpectJobCode: string[];
+ userExpectJobs: string[];
freeTime: EnumPersonalFreeTime;
jobSeekingStatus: EnumPersonalJobSeekingStatus;
}
--
Gitblit v1.9.1