From de48f37384615aad3587f297dee9e9d64716d61f Mon Sep 17 00:00:00 2001 From: ch Date: Thu, 28 Jul 2022 10:24:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pref:=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/auth.js b/src/api/auth.js index 1816ae7..923f79e 100644 --- a/src/api/auth.js +++ b/src/api/auth.js @@ -11,7 +11,7 @@ export function sendSmsCode(params) { // 登录 export async function login(data) { return request({ - url: '/uc/user/loginByPasswordToB', + url: '/uc/user/login/employee/password', method: 'post', data, }); From 7be911c29bfef8b2e7740340b8fdde10131f2e0b Mon Sep 17 00:00:00 2001 From: ch Date: Thu, 28 Jul 2022 10:30:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/permission/employee/employee.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/store/modules/permission/employee/employee.js b/src/store/modules/permission/employee/employee.js index 4ea24e6..68b8bff 100644 --- a/src/store/modules/permission/employee/employee.js +++ b/src/store/modules/permission/employee/employee.js @@ -60,17 +60,18 @@ const actions = { let res = await save(data); if (res) { if (!data.id) { - data.id = res; + data = res; } - if (!data.roleIds) { - return false; - } - res = await api.savePermission(data.id, { roleIds: data.roleIds }); - if (res) { - ElMessage.success('保存成功'); - dispatch('search'); + if (data.roleIds) { + res = await api.savePermission(data.id, { roleIds: data.roleIds }); + if (res) { + ElMessage.success('保存成功'); + dispatch('search'); + } else { + ElMessage.error('保存角色失败'); + } } else { - ElMessage.error('保存角色失败'); + ElMessage.success('保存成功'); } } else { ElMessage.error('保存失败');