Browse Source

转移设置页面,添加搜索页面

master
zhangjiming 4 months ago
parent
commit
8cfcee32da
  1. 12
      src/App.tsx
  2. 7
      src/index.tsx
  3. 4
      src/pages/MeasurementList.tsx
  4. 17
      src/pages/MeasurementSearch.tsx
  5. 2
      src/pages/Mine2.tsx
  6. 9
      src/pages/Setting.tsx

12
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: '蓝牙',

7
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(
<Route index element={<Navigate to="home/measure" replace />} />
<Route path="home" element={<App />}>
<Route path="measure" element={<Measure />}></Route>
<Route path="setting" element={<Setting />}></Route>
{/* <Route path="setting" element={<Setting />}></Route> */}
<Route path="bluetooth" element={<Bluetooth />}></Route>
<Route path="mine" element={<Mine2 />}></Route>
</Route>
@ -37,8 +38,12 @@ const router = createHashRouter(
<Route path="save" element={<MeasureSave />}></Route>
<Route path="records" element={<MeasurementList />} />
<Route path="upload" element={<UploadList />} />
<Route path="search" element={<MeasurementSearch />} />
<Route path="record/:recordId" element={<MeasureRecord />}></Route>
</Route>
<Route path="profile">
<Route path="setting" element={<Setting />} />
</Route>
</Route>
)
);

4
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 }}
>
{/* <UploadOutline onClick={() => navigate("/measure/upload")} /> */}
<SearchOutline onClick={() => navigate("/measure/search")} />
<MoreOutline onClick={() => setEditMode(!editMode)}/>
</div>
);

17
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 (
<div>
<NavBar className="bg-white" onBack={back}>
</NavBar>
<div className="main-page-content overflow-x-hidden overflow-y-auto relative">
</div>
</div>
);
}

2
src/pages/Mine2.tsx

@ -19,7 +19,7 @@ export default function Mine2() {
</List.Item>
<List.Item prefix={<SetOutline />} onClick={() => {}}>
<List.Item prefix={<SetOutline />} onClick={() => navigate('/profile/setting')}>
</List.Item>
</List>

9
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<number>(80);
@ -14,12 +16,13 @@ export default function Setting() {
// setPort(+evt.target.value);
// }
// };
const back = () => navigate(-1);
return (
<div>
<NavBar className="bg-white" back={null}>
<NavBar className="bg-white" onBack={back}>
</NavBar>
<div className="home-page-content overflow-x-hidden overflow-y-auto">
<div className="main-page-content overflow-x-hidden overflow-y-auto">
<section>
<div className="h-[42px] px-5">
<h1 className="h-[42px] leading-[42px] text-base text-text font-medium">
@ -27,7 +30,7 @@ export default function Setting() {
</h1>
</div>
<div className="bg-white px-5 text-sm text-text">
<div className="h-12 flex items-center border-b border-[#eee]">
<div className="h-12 flex items-center">
<span></span>
<input
type="text"

Loading…
Cancel
Save