diff --git a/config/proxy.js b/config/proxy.js index 1ba865a..c61822d 100644 --- a/config/proxy.js +++ b/config/proxy.js @@ -8,12 +8,12 @@ */ export default { dev: { - '/kitchen/api/': { - target: 'https://localhost:5001', + '/kitchen/': { + target: 'https://localhost:5001/', changeOrigin: true, secure: false, //关闭证书验证 pathRewrite: { - '/kitchen/api/': '/api/', + '/kitchen/': '', }, }, // Nginx发布的时候需要配置 diff --git a/src/app.jsx b/src/app.jsx index 261dbe3..24a1d72 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -746,8 +746,10 @@ const codeMessage = { }; export const request = { + errorHandler: (error) => { const { response } = error; + console.log('response',response); if (response && response.status !== 200 && response.status !== 422) { const errorText = codeMessage[response.status] || response.statusText; const { status, url } = response; @@ -762,7 +764,8 @@ export const request = { history.push(loginPath); } } else { - notification.error({ + console.log('11111111111111111111111111111111111111111111111111'); + notification.error({ description: '网络发生异常,无法连接服务器', message: '网络异常', }); diff --git a/src/pages/device/deviceType/index.jsx b/src/pages/device/deviceType/index.jsx index 7cae47f..f316995 100644 --- a/src/pages/device/deviceType/index.jsx +++ b/src/pages/device/deviceType/index.jsx @@ -65,7 +65,7 @@ const handleRemove = async (selectedRows) => { message.success('删除成功'); return true; } else { - message.success('删除失败'); + message.error(r.errors); return false; } }); diff --git a/src/pages/foodMenu/storeFoodMenu/index.jsx b/src/pages/foodMenu/storeFoodMenu/index.jsx index 5d1a5c2..e156c90 100644 --- a/src/pages/foodMenu/storeFoodMenu/index.jsx +++ b/src/pages/foodMenu/storeFoodMenu/index.jsx @@ -42,14 +42,20 @@ const handleAdd = async (fields) => { * * @param selectedRows */ -const handleRemove = async (selectedRows) => { +const handleRemove = async (selectedRows,FoodMenuId) => { + debugger try { - message.loading('正在删除'); + const hide = message.loading('正在删除'); let ids = []; selectedRows.forEach((item) => { ids.push(item.id); }); - await DelStoreFoodMenu(ids).then((r) => { + debugger + await DelStoreFoodMenu({ + "storeIds": ids, + "foodMenuId": FoodMenuId + }).then((r) => { + hide(); if (r.data) { message.success('删除成功'); return true; @@ -169,7 +175,7 @@ const TableList = () => { >