From 8cfcee32da030ab10c1f041ac1fa64638eca5e27 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Thu, 3 Apr 2025 09:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                     | 12 ++++++------
 src/index.tsx                   |  7 ++++++-
 src/pages/MeasurementList.tsx   |  4 ++--
 src/pages/MeasurementSearch.tsx | 17 +++++++++++++++++
 src/pages/Mine2.tsx             |  2 +-
 src/pages/Setting.tsx           |  9 ++++++---
 6 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/MeasurementSearch.tsx

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(
       <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>
   )
 );
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 }}
     >
-      {/* <UploadOutline  onClick={() => navigate("/measure/upload")} /> */}
+      <SearchOutline  onClick={() => navigate("/measure/search")} />
       <MoreOutline onClick={() => setEditMode(!editMode)}/>
     </div>
   );
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 (
+    <div>
+      <NavBar className="bg-white" onBack={back}>
+        搜索
+      </NavBar>
+      <div className="main-page-content overflow-x-hidden overflow-y-auto relative">
+
+      </div>
+    </div>
+  );
+}
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() {
             上传记录
           </List.Item>
 
-          <List.Item prefix={<SetOutline />} onClick={() => {}}>
+          <List.Item prefix={<SetOutline />} onClick={() => navigate('/profile/setting')}>
             设置
           </List.Item>
         </List>
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<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"