From 1e7b702373512f4f43168ded10d2aa889bf4209f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 15 八月 2025 14:23:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/store/modules/user.ts | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 85c8aae..02bc2ca 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -18,7 +18,7 @@
export interface UserState {
token: string;
- userInfo: API.PasswordLoginCommandCallback;
+ userInfo: API.LoginCommandCallback;
}
function getDefaultState() {
@@ -42,16 +42,17 @@
return state.userInfo;
},
- // userId(state) {
- // return state.accountInfo.sub;
- // },
+ userId(state) {
+ //TODO
+ return '';
+ },
},
actions: {
setToken(token: string) {
this.token = token;
setToken(token);
},
- setUserInfo(userInfo: API.PasswordLoginCommandCallback) {
+ setUserInfo(userInfo: API.LoginCommandCallback) {
this.userInfo = userInfo;
setUserInfo(userInfo);
},
@@ -62,8 +63,8 @@
{
...params,
password: md5Encrypt(params.password),
- type: EnumUserType.Operation,
- clientType: EnumClientType.PcWeb,
+ type: AppLocalConfig.userType,
+ clientType: AppLocalConfig.clientType,
},
{
showLoading: false,
--
Gitblit v1.9.1