diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js index 5292d23..580299a 100644 --- a/src/components/Layout/Menu.js +++ b/src/components/Layout/Menu.js @@ -109,6 +109,7 @@ const Menus = ({ siderFold, darkTheme, handleClickNavMenu, navOpenKeys, changeOp mode={siderFold ? 'vertical' : 'inline'} theme={darkTheme ? 'dark' : 'light'} onClick={handleClickNavMenu} + selectedKeys={defaultSelectedKeys} defaultSelectedKeys={defaultSelectedKeys} > {menuItems} diff --git a/src/utils/request.js b/src/utils/request.js index c7d4af9..08ba153 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -95,13 +95,12 @@ export default function request (options) { list: data, } } - - return { + return Promise.resolve({ success: true, message: statusText, statusCode: status, ...data, - } + }) }).catch((error) => { const { response } = error let msg @@ -114,6 +113,6 @@ export default function request (options) { statusCode = 600 msg = error.message || 'Network Error' } - return { success: false, statusCode, message: msg } + return Promise.reject({ success: false, statusCode, message: msg }) }) }