diff --git a/src/api/platform/core/controller/user.ts b/src/api/platform/core/controller/user.ts index 4e78da6..470bf47 100644 --- a/src/api/platform/core/controller/user.ts +++ b/src/api/platform/core/controller/user.ts @@ -27,22 +27,19 @@ export const login = (params: LoginParams) => { param: ['password'] }); - const username = user.username.trim(); - const password = user.password; - const code = user.code; - const realKey = user.realKey; + const { username, password, options, ...exOauthParams} = user; const grant_type = 'password'; const scope = 'server'; - const data = qs.stringify({'username': username, 'password': password}); + const data = qs.stringify({ 'username': username.trim(), 'password': password }); return defHttp.post({ url: Api.login, headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' }, - params: { code, realKey, grant_type, scope }, + params: { ...exOauthParams, grant_type, scope }, data: data - }, params?.options); + }, options); }; /** 获取当前用户信息 */ diff --git a/src/api/platform/system/controller/dictdata.ts b/src/api/platform/system/controller/dictdata.ts index e4ebb88..fc4c8ac 100644 --- a/src/api/platform/system/controller/dictdata.ts +++ b/src/api/platform/system/controller/dictdata.ts @@ -31,4 +31,4 @@ export const getDictData = (id: string) => defHttp.get({ url: `${Api.g export const delDictData = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 根据字典类型查询字典数据 */ -export const getDataByDictType = (dictType: string) => defHttp.get({ url: `${Api.getByDictType}/${dictType}` }); +export const getDataByDictType = (params: DictData) => defHttp.get({ url: Api.getByDictType, params }); diff --git a/src/assets/loginmini/icon/icon-role.png b/src/assets/loginmini/icon/icon-role.png new file mode 100644 index 0000000..eb51013 Binary files /dev/null and b/src/assets/loginmini/icon/icon-role.png differ diff --git a/src/assets/loginmini/icon/icon-tenant.png b/src/assets/loginmini/icon/icon-tenant.png new file mode 100644 index 0000000..e7dde9f Binary files /dev/null and b/src/assets/loginmini/icon/icon-tenant.png differ diff --git a/src/assets/loginmini/style/home.less b/src/assets/loginmini/style/home.less index bc31b3e..0002309 100644 --- a/src/assets/loginmini/style/home.less +++ b/src/assets/loginmini/style/home.less @@ -350,6 +350,14 @@ background-image: url(../icon/icon-code.png); } +.icon-tenant { + background-image: url(../icon/icon-tenant.png); +} + +.icon-role { + background-image: url(../icon/icon-role.png); +} + .aui-inputClear:focus { border-bottom: 1px solid #1b90ff; }