From 8a4f3722a74622f27e72c3b4daaa9263efa17aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AD=B1=E9=87=8E?= <hanxiufeng@xiaoye.lan>
Date: Sat, 23 Aug 2025 21:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Range/index.tsx  | 6 ------
 src/pages/list/index.tsx        | 2 +-
 src/pages/publishBall/index.tsx | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/Range/index.tsx b/src/components/Range/index.tsx
index 6656e9c..a4a9ff2 100644
--- a/src/components/Range/index.tsx
+++ b/src/components/Range/index.tsx
@@ -11,10 +11,7 @@ interface RangeProps {
   onChange?: (value: [number, number]) => void;
   disabled?: boolean;
   className?: string;
-<<<<<<< HEAD
   showTitle?: boolean;
-=======
->>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }
 
 const NtrpRange: React.FC<RangeProps> = ({
@@ -25,10 +22,7 @@ const NtrpRange: React.FC<RangeProps> = ({
   onChange,
   disabled = false,
   className,
-<<<<<<< HEAD
   showTitle = true,
-=======
->>>>>>> 2b7c9497c6d5b1f3edb2ddd937855570c0cc8eca
 }) => {
   const [currentValue, setCurrentValue] = useState<[number, number]>(value);
 
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 7587ed3..44d601d 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -6,7 +6,6 @@ import Menu from "../../components/Menu/example";
 import CityFilter from "../../components/CityFilter/example";
 import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
-import "./index.scss";
 import { useEffect } from "react";
 import Taro from "@tarojs/taro";
 import {
@@ -16,6 +15,7 @@ import {
   useTennisLastRefresh,
   useTennisActions,
 } from "../../store/listStore";
+import "./index.scss";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
diff --git a/src/pages/publishBall/index.tsx b/src/pages/publishBall/index.tsx
index dc7e88d..4deeda1 100644
--- a/src/pages/publishBall/index.tsx
+++ b/src/pages/publishBall/index.tsx
@@ -6,8 +6,8 @@ import PublishForm from './publishForm'
 import { publishBallFormSchema } from '../../config/formSchema/publishBallFormSchema';
 import { PublishBallFormData } from '../../../types/publishBall';
 import PublishService from '@/services/publishService';
-import styles from './index.module.scss'
 import images from '@/config/images'
+import styles from './index.module.scss'
 
 const PublishBall: React.FC = () => {
   const [activityType, setActivityType] = useState<ActivityType>('individual')