Merge branch 'master' of http://git.ycjcjy.com/jgz/admin

config/proxy.js

@@ -11,7 +11,8 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.147:8087',
+      //http://192.168.89.147:8087
+      target: 'http://localhost:8087',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,

config/routes.js

@@ -62,6 +62,13 @@
     hideInMenu: true,
     component: './dish/edit',
   },
+  {
+    path: '/dish/edit',
+    name: '菜肴修改',
+    hideInMenu: true,
+    icon: 'VideoCameraOutlined',
+    component: './dish/edit',
+  },
   {
     path: '/package/list',
     name: '套餐管理',

src/pages/dish/edit/index.jsx

@@ -1,7 +1,9 @@
-import { addDish, updataDish } from '@/services/api/dish';
+import { addDish, updataDish, getDishById, getDishList } from '@/services/api/dish';
+import { queryTable } from '@/utils/request';
 import { PageContainer, ProForm, ProFormDigit, ProFormText, ModalForm, Select, Option } from '@ant-design/pro-components';
 import { history, useSearchParams } from '@umijs/max';
 import { Card, Col, message, Row, Space, Image } from 'antd';
+import { values } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 
 export default (props) => {
@@ -11,7 +13,7 @@ export default (props) => {
   const formRef = useRef();
   useEffect(() => {
     if (id) {
-      getBannerdById(id).then((res) => {
+      getDishById(id).then((res) => {
         setData(res);
 
         formRef.current.setFieldsValue(res);
@@ -20,6 +22,8 @@ export default (props) => {
   }, [id]);
 
   const onFinish = async (values) => {
+    console.log(values)
+
     if (id) {
       // 修改
       updataDish(id, { ...values }).then((res) => {
@@ -57,6 +61,7 @@ export default (props) => {
                 <Row>
                   <Col span={8} offset={8}>
                     <Space>{doms}</Space>
+
                   </Col>
                 </Row>
               );
@@ -65,9 +70,14 @@ export default (props) => {
         >
           <ProFormText name="name" label="菜肴名称" placeholder="请输入菜肴名称" width={460} />
           <ProFormText name="unit" label="菜肴单位" placeholder="请输入菜肴单位" width={460} />
-          {/* <Select label="包含食材" mode="multiple"></Select> */}
+          {/* <Select label="包含食材" mode="multiple" >
+            <Option></Option>
+            <Option></Option>
+          </Select> */}
+
         </ProForm>
       </Card>
     </PageContainer>
+
   );
 };

src/pages/dish/list/index.jsx

@@ -1,4 +1,4 @@
-import { getDishList, addDish, updataDish } from '@/services/api/dish';
+import { getDishList, addDish, updataDish, deleteDish } from '@/services/api/dish';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
 import { history } from '@umijs/max';
@@ -22,7 +22,7 @@ const DishList = (props) => {
 
   const handleDelete = (id) => {
     if (id) {
-      deleteBanner(id).then((res) => {
+      deleteDish(id).then((res) => {
         message.success('删除成功');
         actionRef.current.reload();
       });
@@ -39,10 +39,10 @@ const DishList = (props) => {
       title: '菜肴单位',
       dataIndex: 'unit',
     },
-    {
-      title: '包含食材(种)',
-      dataIndex: 'itemId.amount',
-    },
+    // {
+    //   title: '包含食材(种)',
+    //   dataIndex: 'status',
+    // },
     {
       title: '操作',
       valueType: 'option',
@@ -56,18 +56,17 @@ const DishList = (props) => {
             updata(record);
           }}
         >
-          {record.state === '1' ? '下架' : '上架'}
+          {/* {record.state === '1' ? '下架' : '上架'} */}
         </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            console.log(record, ']]');
-            history.push(`/rotationChart/add?id=${record.id}`);
+            history.push(`/dish/add?id=${record.id}`);
           }}
         >
-          编辑
+          修改
         </Button>,
 
         <Popconfirm
@@ -96,7 +95,6 @@ const DishList = (props) => {
           <Button
             key="2"
             type="primary"
-            // onClick={() => { setCurrent({}); setVisible(true); }}
             onClick={() => {
               history.push('/dish/add');
             }}
@@ -104,7 +102,7 @@ const DishList = (props) => {
             新增
           </Button>,
         ]}
-        // request={queryTable(getDishList)}
+        request={queryTable(getDishList)}
         columns={columns}
       />
     </PageContainer>

src/pages/monitor/edit.jsx

@@ -6,7 +6,7 @@ import { Button, Form, message } from 'antd';
 import { useEffect } from 'react';
 
 export default (props) => {
-  const {onSubmit, onCancel, dataSource = {}, visible} = props;
+  const { onSubmit, onCancel, dataSource = {}, visible } = props;
   const [form] = Form.useForm();
 
   const handleSubmit = (values) => {
@@ -15,6 +15,7 @@ export default (props) => {
         status: '1',
         ...(dataSource || {}),
         ...values
+
       })
     }
   }

src/pages/monitor/index.jsx

@@ -135,7 +135,7 @@ const List = (props) => {
           <Button
             key="2"
             type="primary"
-            onClick={() => { setCurrent({}); setVisible(true);  }}
+            onClick={() => { setCurrent({}); setVisible(true); }}
           >
             新增
           </Button>,

src/services/api/dish.js

@@ -7,13 +7,19 @@ import { request } from '@umijs/max';
  */
 export const getDishList = (params) => request('/dishes', { params });
 
+/**
+ * 详情
+ * @param {*} id
+ * @returns
+ */
+export const getDishById = (id) => request(`/dishes/${id}`);
 
 /**
  * 新增
  * @param {*} data
  * @returns
  */
-export const addDish = (data) => request('/dish', { method: 'post', data });
+export const addDish = (data) => request('/dishes', { method: 'post', data });
 
 /**
  * 新增
@@ -21,4 +27,11 @@ export const addDish = (data) => request('/dish', { method: 'post', data });
  * @param {*} data
  * @returns
  */
-export const updataDish = (id, data) => request(`/dish/${id}`, { method: 'put', data });
+export const updataDish = (id, data) => request(`/dishes/${id}`, { method: 'put', data });
+
+/**
+ * 删除
+ * @param {*} id
+ * @returns
+ */
+export const deleteDish = (id) => request(`/dishes/${id}`, { method: 'delete' });