From 162803b10e1f99268533e40814380100c040e274 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 19 九月 2025 10:10:39 +0800
Subject: [PATCH] fix: bug
---
packages/services/apiV2/typings.d.ts | 52 +++++++++++++++++++-------
packages/constants/apiEnum.ts | 12 ++++++
packages/services/apiV2/auth.ts | 2
apps/cMiniApp/src/pages/mine/index.vue | 2
apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue | 10 ++++-
5 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index d4fb9ca..a7e13ec 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -137,12 +137,12 @@
const { userDetail, isCertified, updateUserInfo } = useUser();
const isLogin = useIsLogin();
const systemStore = useSystemStore();
-const { stop, start } = useIntervalFn(updateUserInfo, 1000);
const { goLoginFn } = useGoLogin();
const bgHeight = computed(() => 133 + systemStore.navHeight);
Taro.useDidShow(({ scene }) => {
if (isLogin.value) {
+ const { stop, start } = useIntervalFn(updateUserInfo, 1000);
setTimeout(() => {
updateUserInfo();
}, 300);
diff --git a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
index d30a855..2dbd899 100644
--- a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
+++ b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
@@ -63,10 +63,15 @@
import { ResponseCode } from '@12333/constants';
import * as authServices from '@12333/services/apiV2/auth';
import { APP_ENV } from '@/constants';
+import { useUserStore } from '@/stores/modules/user';
defineOptions({
name: 'registerForm',
});
+
+const userStore = useUserStore();
+
+const { jump } = useLoginedJump();
const state = reactive({
policyChecked: false,
@@ -128,8 +133,9 @@
let res = await authServices.registerPersonalUser(params);
if (res) {
Message.success('娉ㄥ唽鎴愬姛', {
- onClosed: () => {
- goLogin();
+ onClosed: async () => {
+ userStore.loginSuccess(res);
+ jump();
},
});
}
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 0688d08..df166c7 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -417,6 +417,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
/** 浠诲姟瀹夋帓鐘舵�� */
@@ -566,3 +570,11 @@
/**宸插畬鎴� */
Completed = 20,
}
+
+/** 缁撶畻鍒拌处鐘舵�� */
+export enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+}
diff --git a/packages/services/apiV2/auth.ts b/packages/services/apiV2/auth.ts
index 1a95129..29e4032 100644
--- a/packages/services/apiV2/auth.ts
+++ b/packages/services/apiV2/auth.ts
@@ -132,7 +132,7 @@
body: API.RegisterPersonalUserCommand,
options?: API.RequestConfig
) {
- return request<boolean>('/api/user/auth/registerPersonalUser', {
+ return request<API.LoginCommandCallback>('/api/user/auth/registerPersonalUser', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index f72be6c..46326ce 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -900,6 +900,10 @@
InProcess = 20,
/**宸茬粨绠� */
Completed = 30,
+ /**閮ㄥ垎缁撶畻 */
+ Part = 40,
+ /**缁撶畻澶辫触 */
+ Fail = 50,
}
enum EnumTaskStatus {
@@ -3286,6 +3290,7 @@
enterpriseSignContractTime?: string;
/** 鐢靛瓙鍚堝悓 */
contractUrl?: string;
+ createdTime?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -4123,6 +4128,8 @@
/** 鍒涘缓鏃堕棿-鎴 */
createdTimeEnd?: string;
type?: EnumUserWalletTransactionType;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
pageModel?: PagedListQueryPageModel;
}
@@ -4145,6 +4152,13 @@
balance?: number;
/** 浼佷笟鍚嶇О */
enterpriseName?: string;
+ /** 浠诲姟鍚嶇О */
+ taskName?: string;
+ /** 缁撶畻鍗曞悕绉� */
+ settlementOrderName?: string;
+ settlementStatus?: EnumTaskSettlementStatus;
+ /** 缁撶畻鏃堕棿 */
+ settlementTime?: string;
/** 浠樻浜鸿处鎴� */
payerAccount?: string;
/** 浠樻浜哄悕绉� */
@@ -4185,6 +4199,12 @@
}
interface GetPersonalUserWalletBalancesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetPersonalUserWalletBalancesQueryResultItem[];
+ }
+
+ interface GetPersonalUserWalletBalancesQueryResultItem {
/** 鐢ㄦ埛Id */
id?: string;
/** 濮撳悕 */
@@ -4195,12 +4215,7 @@
identity?: string;
/** 浣欓 */
balance?: number;
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetPersonalUserWalletBalancesQueryResultItem[];
}
-
- type GetPersonalUserWalletBalancesQueryResultItem = Record<string, any>;
interface GetResourceFieldsQueryResultItem {
/** 缂栧彿 */
@@ -4388,6 +4403,7 @@
keywords?: string;
settlementOrderStatus?: EnumTaskSettlementOrderStatus;
settlementStatus?: EnumTaskSettlementStatus;
+ checkReceiveStatus?: EnumTaskCheckReceiveStatus;
/** 缁撶畻鏃堕棿-璧峰 */
settlementTimeBegin?: string;
/** 缁撶畻鏃堕棿-鎴 */
@@ -4467,7 +4483,6 @@
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
- settlementStatus?: EnumTaskSettlementStatus;
/** 鎵�灞為摱琛� */
bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
@@ -4478,6 +4493,8 @@
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
+ settlementReceiveStatus?: SettlementReceiveStatus;
+ settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
}
@@ -5108,18 +5125,18 @@
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鎵�灞為摱琛� */
+ bank?: string;
+ /** 鎵�灞炴敮琛� */
+ bankBranch?: string;
+ /** 鏀舵璐︽埛 */
+ receiveAccount?: string;
/** 缁撶畻閲戦 */
settlementAmount?: number;
/** 瀹炲彂閲戦 */
actualSettlementAmount?: number;
- /** 鏀舵璐︽埛 */
- receiveAccount?: string;
- /** 鎵�灞為摱琛� */
- bank?: string;
- /** 寮�鎴锋敮琛屽悕绉� */
- bankBranch?: string;
- /** 浠诲姟鍚嶇О */
- taskName?: string;
}
interface InviteElectronSignCommand {
@@ -5816,6 +5833,13 @@
hireStatus?: EnumTaskUserHireStatus;
}
+ enum SettlementReceiveStatus {
+ /**宸插埌璐� */
+ Completed = 10,
+ /**宸查��娆� */
+ Refunded = 20,
+ }
+
interface SetUserInfoRolesCommand {
/** 鐢ㄦ埛Id */
userInfoId?: string;
--
Gitblit v1.9.1