feats

src/layouts/AuthLayout/components/Menus.jsx

@@ -6,17 +6,19 @@ const menuStyle = { height: '100%' };
 export default (props) => {
   const { theme, items, location } = props;
 
-  const selectedKeys = React.useMemo(() => {
-    const parts = location.pathname.split('/').filter(Boolean);
-    const keys = parts.reduce((acc, it) => {
-      const parent = acc.pop();
-      const path = !parent ? `/${it}` : `${parent}/${it}`
+  // const selectedKeys = React.useMemo(() => {
+  //   const parts = location.pathname.split('/').filter(Boolean);
+  //   const keys = parts.reduce((acc, it) => {
+  //     const parent = acc.pop();
+  //     const path = !parent ? `/${it}` : `${parent}/${it}`
 
-      return acc.concat([parent, path].filter(Boolean));
-    }, []);
+  //     return acc.concat([parent, path].filter(Boolean));
+  //   }, []);
 
-    return keys;
-  }, [location.pathname]);
+  //   return keys;
+  // }, [location.pathname]);
+
+  const selectedKeys = [location.pathname];
 
   return (
     <Menu style={menuStyle} theme={theme} items={items} selectedKeys={selectedKeys} />

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Row, Col, Card, Button, notification } from 'antd';
 import EditableTag from '@/components/EditableTag';
 import { getDishList } from '@/services/dish';
@@ -17,6 +17,14 @@ export default (props) => {
   const [list, setList] = useState([]);
   const [loading, setLoading] = useState(false);
   const packageRef = useRef();
+  const dishRef = useRef();
+
+  const calorie = useMemo(() => {
+    return list.reduce((acc, it) => {
+      const dish = dishRef.current.filterItem(it.dishId) || {};
+      return acc + dish.calorie || 0;
+    }, 0);
+  }, [list]);
 
   const handlePackageSubmit = ({item, amount}) => {
     packageRef.current = item;
@@ -50,6 +58,7 @@ export default (props) => {
     const found = list.filter(x => x.dishId === item.id)[0]
     if (found) {
       found.dishAmount = amount;
+      found.calorie = item.calorie || 0;
     } else {
       list.push({
         guaranteeId: dataSource.id,
@@ -125,6 +134,7 @@ export default (props) => {
         <div style={{ marginTop: '48px' }}>
           <h3>选择菜肴</h3>
           <Selector
+            ref={dishRef}
             placeholder="请选择菜肴"
             disabled={!dataSource}
             fetch={getDishList}
@@ -134,7 +144,7 @@ export default (props) => {
       </Col>
       <Col span={16}>
         <Card
-          title="已选菜肴"
+          title={`已选菜肴 共计${calorie}卡`}
           loading={loading}
           extra={<Button disabled={!dataSource} type='primary' loading={loading} onClick={onSubmit}>保存</Button>}
         >

src/pages/guaranteeTask/Edit/components/Selector.jsx

@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { Button, Input, InputNumber, Select, notification } from 'antd';
 
 const { Group } = Input;
 const { Option } = Select;
 
-export default (props) => {
+export default forwardRef((props, ref) => {
   const { fetch, placeholder, disabled, onSubmit } = props;
 
   const [data, setData] = useState([]);
@@ -13,6 +13,10 @@ export default (props) => {
 
   const options = data.map(d => <Option key={d.id}>{d.name}</Option>);
 
+  useImperativeHandle(ref, () => ({
+    filterItem: id => data.filter(x => x.id === id)[0],
+  }));
+
   const handleSearch = (name) => {
     fetch({ pageNum: 1, pageSize: 20, name }).then(res => {
       setData(res.records || []);
@@ -74,4 +78,4 @@ export default (props) => {
       <Button type="primary" disabled={disabled} onClick={handleSubmit}>确定</Button>
     </Group>
   )
-}
+})

src/pages/rotationChart/introduction/edit/index.jsx

@@ -39,7 +39,6 @@ export default (props) => {
   }, [isEdit]);
 
   const onFinish = async (values) => {
-    console.log('---------values--------', values)
     //添加,修改
     addRegulation({ ...values, id: data?.id, type: "station" }).then((res) => {
       // message.success('成功');

src/utils/request.js

@@ -9,13 +9,18 @@ const instance = axios.create({
 
 // 添加请求拦截器
 instance.interceptors.request.use(function (config) {
-  const { headers = {}, responseType = 'json', download = false, successTip = true } = config;
+  const { headers = {}, method = 'get', responseType = 'json', download = false, successTip } = config;
   const token = localStorage.getItem('token') || '';
 
+  let tip = successTip;
+  if (tip === undefined) {
+    tip = method === 'get' ? false : true;
+  }
+
   // 在发送请求之前做些什么
   return {
     ...config,
-    successTip,
+    successTip : tip,
     headers: {
       ...headers,
       Authorization: token,