diff --git a/src/App.tsx b/src/App.tsx index 3cb2ac2..2d5e42f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -33,12 +33,12 @@ const BottomBar = () => { icon_s: icon_1_s, icon_n: icon_1_u, }, - { - key: '/home/setting', - title: '设置', - icon_s: icon_2_s, - icon_n: icon_2_u, - }, + // { + // key: '/home/setting', + // title: '设置', + // icon_s: icon_2_s, + // icon_n: icon_2_u, + // }, { key: '/home/bluetooth', title: '蓝牙', diff --git a/src/index.tsx b/src/index.tsx index f95831d..33a82f3 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -21,6 +21,7 @@ import Mine2 from './pages/Mine2'; import MeasureSave from './pages/MeasureSave'; import MeasureRecord from './pages/MeasureRecord'; import MeasurementList from './pages/MeasurementList'; +import MeasurementSearch from './pages/MeasurementSearch'; import UploadList from './pages/UploadList'; const router = createHashRouter( @@ -29,7 +30,7 @@ const router = createHashRouter( } /> }> }> - }> + {/* }> */} }> }> @@ -37,8 +38,12 @@ const router = createHashRouter( }> } /> } /> + } /> }> + + } /> + ) ); diff --git a/src/pages/MeasurementList.tsx b/src/pages/MeasurementList.tsx index 1823753..1ca6860 100644 --- a/src/pages/MeasurementList.tsx +++ b/src/pages/MeasurementList.tsx @@ -4,7 +4,7 @@ import MeasureGroups from '../components/MeasureGroups'; import { useState } from 'react'; import { Measurement } from '../services/apiTypes'; import * as R from 'ramda'; -import { MoreOutline, UploadOutline } from 'antd-mobile-icons'; +import { MoreOutline, SearchOutline } from 'antd-mobile-icons'; import { dataList } from '../utils/constant'; @@ -43,7 +43,7 @@ export default function MeasurementList() { className="flex justify-end gap-x-2" style={{ fontSize: 24 }} > - {/* navigate("/measure/upload")} /> */} + navigate("/measure/search")} /> setEditMode(!editMode)}/> ); diff --git a/src/pages/MeasurementSearch.tsx b/src/pages/MeasurementSearch.tsx new file mode 100644 index 0000000..dc13a7c --- /dev/null +++ b/src/pages/MeasurementSearch.tsx @@ -0,0 +1,17 @@ +import { NavBar } from 'antd-mobile'; +import { useNavigate } from 'react-router'; + +export default function MeasurementSearch() { + const navigate = useNavigate(); + const back = () => navigate(-1); + return ( + + + 搜索 + + + + + + ); +} diff --git a/src/pages/Mine2.tsx b/src/pages/Mine2.tsx index c2ce651..aabc7a6 100644 --- a/src/pages/Mine2.tsx +++ b/src/pages/Mine2.tsx @@ -19,7 +19,7 @@ export default function Mine2() { 上传记录 - } onClick={() => {}}> + } onClick={() => navigate('/profile/setting')}> 设置 diff --git a/src/pages/Setting.tsx b/src/pages/Setting.tsx index a650c35..e868180 100644 --- a/src/pages/Setting.tsx +++ b/src/pages/Setting.tsx @@ -1,8 +1,10 @@ import { NavBar } from 'antd-mobile'; import icon_arr_r from '../assets/icon_arr_s_r.svg'; import { ChangeEvent, useState } from 'react'; +import { useNavigate } from 'react-router'; export default function Setting() { + const navigate = useNavigate(); const [addr, setAddr] = useState(''); // const [port, setPort] = useState(80); @@ -14,12 +16,13 @@ export default function Setting() { // setPort(+evt.target.value); // } // }; + const back = () => navigate(-1); return ( - + 设置 - + @@ -27,7 +30,7 @@ export default function Setting() { - + 服务地址