From bceca4f1fa7651919023e57786352fb318b0de66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Mon, 18 Aug 2025 14:21:15 +0800
Subject: [PATCH 01/22] feat: carousel and set text color according to bg color

---
 project.private.config.json      |  23 ++++++
 src/app.config.ts                |   3 +-
 src/pages/detail/index.config.ts |   4 ++
 src/pages/detail/index.scss      |  90 ++++++++++++++++++++++++
 src/pages/detail/index.tsx       | 117 +++++++++++++++++++++++++++++++
 src/pages/index/index.tsx        |  79 +++++++++++----------
 src/utils/processImage.ts        |  33 +++++++++
 7 files changed, 312 insertions(+), 37 deletions(-)
 create mode 100644 project.private.config.json
 create mode 100644 src/pages/detail/index.config.ts
 create mode 100644 src/pages/detail/index.scss
 create mode 100644 src/pages/detail/index.tsx
 create mode 100644 src/utils/processImage.ts

diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..2c19aa8
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,23 @@
+{
+  "libVersion": "3.9.0",
+  "projectname": "playBallTogether",
+  "condition": {},
+  "setting": {
+    "urlCheck": true,
+    "coverView": true,
+    "lazyloadPlaceholderEnable": false,
+    "skylineRenderEnable": false,
+    "preloadBackgroundData": false,
+    "autoAudits": false,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": false,
+    "useStaticServer": false,
+    "useLanDebug": false,
+    "showES6CompileOption": false,
+    "compileHotReLoad": true,
+    "checkInvalidKey": true,
+    "ignoreDevUnusedFiles": true,
+    "bigPackageSizeSupport": false
+  }
+}
\ No newline at end of file
diff --git a/src/app.config.ts b/src/app.config.ts
index 15c683b..2096fcf 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -1,6 +1,7 @@
 export default defineAppConfig({
   pages: [
-    'pages/index/index'
+    'pages/index/index',
+    'pages/detail/index',
   ],
   window: {
     backgroundTextStyle: 'light',
diff --git a/src/pages/detail/index.config.ts b/src/pages/detail/index.config.ts
new file mode 100644
index 0000000..eaeff9d
--- /dev/null
+++ b/src/pages/detail/index.config.ts
@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '球局详情',
+  navigationStyle: 'custom',
+})
diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
new file mode 100644
index 0000000..ce17fc4
--- /dev/null
+++ b/src/pages/detail/index.scss
@@ -0,0 +1,90 @@
+.detail-page {
+  width: 100%;
+  height: 100%;
+
+  .custom-navbar {
+    height: 56px; /* 通常与原生导航栏高度一致 */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    // background-color: #fff;
+    color: #000;
+    padding-top: 36px; /* 适配状态栏 */
+  }
+
+  .detail-navigator {
+    height: 30px;
+    width: 80px;
+    border-radius: 15px;
+    position: absolute;
+    left: 12px;
+    border: 1px solid #888;
+    box-sizing: border-box;
+    color: #fff;
+    display: flex;
+    align-items: center;
+
+    .detail-navigator-back, .detail-navigator-icon {
+      height: 20px;
+      width: 50%;
+
+      display: flex;
+      justify-content: center;
+
+      & > svg {
+        width: 20px;
+        height: 20px;
+        color: #fff;
+      }
+    }
+  }
+
+  .detail-page-bg {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    background-size: cover;
+    filter: blur(40px);
+    transform: scale(1.5);
+    z-index: -2;
+    width: calc(100% + 20px);
+    height: calc(100% + 20px);
+    margin: -10px;
+  }
+
+  .detail-page-bg-text {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: -1;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+
+  .detail-swiper {
+    height: 240px;
+    margin-top: 15px;
+    margin-left: 15px;
+  }
+
+  .detail-swiper-item {
+    overflow: visible;
+    height: 100%;
+
+    .detail-swiper-item-image {
+      width: 100%;
+      height: 100%;
+      border-radius: 12px;
+      transition: transform 0.5s;
+    }
+  }
+
+  .detail-text {
+      font-size: 40rpx;
+      margin-top: 20px;
+      transition: color 0.3s ease-in;
+    }
+}
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
new file mode 100644
index 0000000..7c94d32
--- /dev/null
+++ b/src/pages/detail/index.tsx
@@ -0,0 +1,117 @@
+import React, { useState, useEffect } from 'react'
+import { View, Text, Button, Swiper, SwiperItem, Image } from '@tarojs/components'
+import { Cell, Avatar, Progress } from '@nutui/nutui-react-taro'
+import Taro from '@tarojs/taro'
+// 导入API服务
+import demoApi from '../../services/demoApi'
+import commonApi from '../../services/commonApi'
+import {
+  useUserStats,
+  useUserActions
+} from '../../store/userStore'
+import { getTextColorOnImage } from '../../utils/processImage'
+import './index.scss'
+
+const images = [
+  'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/1a35ebbf-2361-44da-b338-7608561d0b31.png',
+  'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/cf5a82ba-90af-4138-a1b3-9119adcde9e0.png',
+  'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/49d7cdf0-b03c-4a0f-91c6-e7778080cfcd.png'
+]
+
+
+
+function Index() {
+  // 使用Zustand store
+  // const userStats = useUserStats()
+  // const { incrementRequestCount, resetUserStats } = useUserActions()
+
+  const [current, setCurrent] = useState(0)
+  const [colors, setColors] = useState<string []>([])
+
+  // 本地状态管理
+  const [loading, setLoading] = useState(false)
+  const [userProfile, setUserProfile] = useState<any>(null)
+  const [interests, setInterests] = useState<string[]>([])
+
+  // 页面加载时获取数据
+  useEffect(() => {
+    initializeData()
+    calcBgMainColors()
+  }, [])
+
+  // 初始化数据
+  const initializeData = async () => {
+    try {
+      // 获取推荐的兴趣爱好
+      const interestsRes = await demoApi.getRecommendedInterests()
+      if (interestsRes.success) {
+        setInterests(interestsRes.data || [])
+      }
+    } catch (error) {
+      console.log('获取初始数据失败:', error)
+    }
+  }
+
+  const calcBgMainColors = async () => {
+    const textcolors: string[] = []
+    for (const index in images) {
+      const { textColor } = await getTextColorOnImage(images[index])
+      textcolors[index] = textColor
+    }
+    setColors(textcolors)
+  }
+
+  return (
+    <View className='detail-page'>
+      <view className="custom-navbar">
+        <View className='detail-navigator'>
+          <View className='detail-navigator-back'>
+            <svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 1L1 7L7 13" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
+
+          </View>
+          <View className='detail-navigator-icon'>
+            <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.9106 10.4998L16.7487 6.92161C16.7208 6.30199 17.1953 5.79401 17.8708 5.79401C18.5462 5.79401 19.0319 6.30199 18.9984 6.92161L18.8197 10.4998C18.7862 11.0413 18.3787 11.3985 17.8652 11.3985C17.3404 11.3985 16.9329 11.019 16.9106 10.4998ZM16.7599 12.822C16.7599 12.2135 17.2623 11.8395 17.8763 11.8395C18.4848 11.8395 18.9816 12.2135 18.9816 12.822C18.9816 13.4361 18.4848 13.8101 17.8763 13.8101C17.2623 13.8101 16.7599 13.4361 16.7599 12.822Z" fill="white"/>
+<path d="M8.65674 10.3268V9.50059C8.65674 7.27329 9.93506 5.93914 12.1512 5.93914C14.3673 5.93914 15.6401 7.27887 15.6401 9.50059V10.3268C15.6401 12.5373 14.3673 13.8603 12.1512 13.8603C9.93506 13.8603 8.65674 12.5317 8.65674 10.3268ZM10.8617 9.48384V10.3212C10.8617 11.4432 11.3362 12.0907 12.1512 12.0907C12.9662 12.0907 13.4351 11.4432 13.4351 10.3212V9.48384C13.4351 8.36182 12.9662 7.7087 12.1512 7.7087C11.3362 7.7087 10.8617 8.36182 10.8617 9.48384Z" fill="white"/>
+<path d="M1 10.3323V9.41127C1 7.29562 2.32857 5.93914 4.45539 5.93914C5.2983 5.93914 6.07981 6.16243 6.6492 6.52527C7.20742 6.87137 7.56468 7.34586 7.56468 7.83151C7.56468 8.34507 7.20184 8.70233 6.68269 8.70233C6.4594 8.70233 6.27519 8.63535 6.1133 8.5237C5.66115 8.22226 5.30388 7.78127 4.62844 7.78127C3.67388 7.78127 3.20497 8.36182 3.20497 9.5285V10.3268C3.20497 11.4767 3.67388 12.0852 4.57261 12.0852C5.24248 12.0852 5.69464 11.6944 5.69464 11.1306V10.9743H5.35412C4.80148 10.9743 4.50005 10.7063 4.50005 10.2207C4.50005 9.73504 4.7959 9.48384 5.35412 9.48384H6.56546C7.40279 9.48384 7.76564 9.83552 7.76564 10.6338V10.9352C7.76564 12.7048 6.47057 13.8603 4.47772 13.8603C2.28949 13.8603 1 12.5373 1 10.3323Z" fill="white"/>
+</svg>
+
+          </View>
+        </View>
+        {/* <view className="navbar-title">我的自定义标题</view> */}
+      </view>
+      <View className='detail-page-bg' style={{ backgroundImage: `url(${images[current]})` }} />
+      <View className='detail-page-bg-text' />
+      <Swiper
+        className='detail-swiper'
+        indicatorDots={false}
+        circular
+        nextMargin="20px"
+        onChange={(e) => { setCurrent(e.detail.current) }}
+      >
+        {images.map((imageUrl, index) => (
+          <SwiperItem
+            key={index}
+            className='detail-swiper-item'
+          >
+            <Image
+              src={imageUrl}
+              mode="aspectFill"
+              className='detail-swiper-item-image'
+              style={{
+                transform: index !== current ? 'scale(0.8) translateX(-12%)' : 'scale(0.95)', // 前后图缩小
+              }}
+            />
+          </SwiperItem>
+        ))}
+      </Swiper>
+      <Text className='detail-text' style={{ color: colors[current] }}>
+        Five feet from the bed was an earthen wall that had suffered from numerous cracks due to the passage of time. From the other side of the wall came the nagging voice of his mother and the occasional deep breathing of his father who was smoking his pipe.
+      </Text>
+    </View>
+  )
+}
+
+export default Index
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index bf32306..8c59767 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -5,8 +5,8 @@ import Taro from '@tarojs/taro'
 // 导入API服务
 import demoApi from '../../services/demoApi'
 import commonApi from '../../services/commonApi'
-import { 
-  useUserStats, 
+import {
+  useUserStats,
   useUserActions
 } from '../../store/userStore'
 import './index.scss'
@@ -15,7 +15,7 @@ function Index() {
   // 使用Zustand store
   const userStats = useUserStats()
   const { incrementRequestCount, resetUserStats } = useUserActions()
-  
+
   // 本地状态管理
   const [loading, setLoading] = useState(false)
   const [userProfile, setUserProfile] = useState<any>(null)
@@ -43,19 +43,19 @@ function Index() {
   const handleGetUserProfile = async () => {
     console.log('获取用户信息...');
     setLoading(true)
-    
+
     try {
       const response = await demoApi.getUserProfile()
-      
+
       if (response.success) {
         setUserProfile(response.data)
         incrementRequestCount()
-        
+
         Taro.showToast({
           title: '获取用户信息成功',
           icon: 'success'
         })
-        
+
         console.log('用户信息:', response.data)
       }
     } catch (error) {
@@ -64,7 +64,7 @@ function Index() {
         title: '获取失败，使用模拟数据',
         icon: 'none'
       })
-      
+
       // 模拟数据
       setUserProfile({
         id: '123',
@@ -83,7 +83,7 @@ function Index() {
   const handleSubmitStats = async () => {
     console.log('提交统计数据...');
     setLoading(true)
-    
+
     try {
       const response = await commonApi.submitForm('userStats', [
         {
@@ -97,21 +97,21 @@ function Index() {
           }
         }
       ])
-      
+
       if (response.success) {
         incrementRequestCount()
-        
+
         Taro.showToast({
           title: '统计数据提交成功',
           icon: 'success'
         })
-        
+
         console.log('提交结果:', response.data)
       }
     } catch (error) {
       console.error('提交统计数据失败:', error)
       incrementRequestCount() // 即使失败也计数，用于演示
-      
+
       Taro.showToast({
         title: '网络模拟提交成功',
         icon: 'success'
@@ -125,7 +125,7 @@ function Index() {
   const handleSubmitFeedback = async () => {
     console.log('提交用户反馈...');
     setLoading(true)
-    
+
     try {
       const response = await demoApi.submitFeedback({
         matchId: 'demo_match_' + Date.now(),
@@ -134,21 +134,21 @@ function Index() {
         aspects: ['场地环境', '服务质量', '价格合理'],
         comments: `用户反馈 - 请求次数: ${userStats.requestCount + 1}，体验良好！`
       })
-      
+
       if (response.success) {
         incrementRequestCount()
-        
+
         Taro.showToast({
           title: '反馈提交成功',
           icon: 'success'
         })
-        
+
         console.log('反馈结果:', response.data)
       }
     } catch (error) {
       console.error('提交反馈失败:', error)
       incrementRequestCount() // 即使失败也计数，用于演示
-      
+
       Taro.showToast({
         title: '网络模拟提交成功',
         icon: 'success'
@@ -163,15 +163,22 @@ function Index() {
     console.log('重置所有数据...');
     resetUserStats()
     setUserProfile(null)
-    
+
     Taro.showToast({
       title: '数据已重置',
       icon: 'success'
     })
   }
 
+  const handleDetail = () => {
+    Taro.navigateTo({
+      url: '/pages/detail/index'
+    })
+  }
+
   return (
     <View className='index-page'>
+      <Button onClick={handleDetail}>球局详情</Button>
       {/* 页面标题 */}
       <View className='page-header'>
         <Text className='page-title'>API 请求演示</Text>
@@ -181,9 +188,9 @@ function Index() {
       {/* 用户信息卡片 */}
       <View className='user-card'>
         <View className='user-header'>
-          <Avatar 
-            size="large" 
-            src={userProfile?.avatar || ''} 
+          <Avatar
+            size="large"
+            src={userProfile?.avatar || ''}
             style={{ backgroundColor: '#fa2c19' }}
           >
             {userProfile?.nickname?.charAt(0) || 'U'}
@@ -205,17 +212,17 @@ function Index() {
       {/* 统计数据 */}
       <View className='stats-section'>
         <Text className='section-title'>📊 API 请求统计</Text>
-        
+
         <Cell title="API 请求次数" extra={userStats.requestCount} />
         <Cell title="创建的比赛" extra={userStats.matchesCreated} />
         <Cell title="参加的比赛" extra={userStats.matchesJoined} />
-        <Cell 
-          title="最后活跃时间" 
+        <Cell
+          title="最后活跃时间"
           extra={new Date(userStats.lastActiveTime).toLocaleTimeString()}
         />
         {interests.length > 0 && (
-          <Cell 
-            title="推荐兴趣" 
+          <Cell
+            title="推荐兴趣"
             extra={interests.slice(0, 2).join(', ')}
           />
         )}
@@ -224,10 +231,10 @@ function Index() {
       {/* API 请求按钮区域 */}
       <View className='action-section'>
         <Text className='section-title'>🚀 API 请求功能</Text>
-        
+
         <View className='button-group'>
-          <Button 
-            type="primary" 
+          <Button
+            type="primary"
             loading={loading}
             onClick={handleGetUserProfile}
             disabled={loading}
@@ -236,8 +243,8 @@ function Index() {
             {loading ? '请求中...' : '获取用户信息'}
           </Button>
 
-          <Button 
-            type="default" 
+          <Button
+            type="default"
             loading={loading}
             onClick={handleSubmitStats}
             disabled={loading}
@@ -246,8 +253,8 @@ function Index() {
             {loading ? '提交中...' : '提交统计数据'}
           </Button>
 
-          <Button 
-            type="default" 
+          <Button
+            type="default"
             loading={loading}
             onClick={handleSubmitFeedback}
             disabled={loading}
@@ -256,8 +263,8 @@ function Index() {
             {loading ? '提交中...' : '提交用户反馈'}
           </Button>
 
-          <Button 
-            type="warn" 
+          <Button
+            type="warn"
             onClick={handleResetAllData}
             disabled={loading}
             className="custom-button warning-btn"
diff --git a/src/utils/processImage.ts b/src/utils/processImage.ts
new file mode 100644
index 0000000..1143085
--- /dev/null
+++ b/src/utils/processImage.ts
@@ -0,0 +1,33 @@
+export async function getTextColorOnImage(url) {
+  let canvas
+  const width = 100
+  const height = 50
+  try {
+    // 1. 创建离屏Canvas
+    canvas = wx.createOffscreenCanvas({ type: '2d', width, height })
+    const ctx = canvas.getContext('2d')
+
+    // 2. 加载图片
+    const img = canvas.createImage()
+    await new Promise((resolve) => {
+      img.onload = resolve
+      img.src = url
+    })
+
+    // 3. 绘制并分析图像
+    ctx.drawImage(img, 0, 0, width, height)
+
+    // TODO: 增加取样，提高精确性
+    const pixelData = ctx.getImageData(10, 10, 1, 1).data
+
+    // 4. 计算文字颜色
+    const brightness = (pixelData[0] * 2126 + pixelData[1] * 7152 + pixelData[2] * 722) / 10000
+    return { textColor: brightness > 128 ? 'black' : 'white' }
+  } finally {
+    // 释放资源
+    if (canvas) {
+      canvas.width = 0;
+      canvas.height = 0;
+    }
+  }
+}

From 14dc351c324a9fbd292a5ffd9f4368f05cbad944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Mon, 18 Aug 2025 14:22:33 +0800
Subject: [PATCH 02/22] feat: add color-thief-react dependence

---
 package.json |   1 +
 yarn.lock    | 403 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 392 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 2ac1636..32344a8 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "@tarojs/runtime": "4.1.5",
     "@tarojs/shared": "4.1.5",
     "@tarojs/taro": "4.1.5",
+    "color-thief-react": "^2.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "zustand": "^4.4.7"
diff --git a/yarn.lock b/yarn.lock
index c0a99a4..54ae1ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2885,7 +2885,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3085,6 +3085,18 @@ arrify@^1.0.1:
   resolved "https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -3124,6 +3136,16 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
+  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
+
 axios@^1.6.8:
   version "1.11.0"
   resolved "https://registry.npmmirror.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
@@ -3254,6 +3276,13 @@ batch@0.6.1:
   resolved "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3496,6 +3525,11 @@ capital-case@^1.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+
 caw@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
@@ -3679,6 +3713,17 @@ color-name@~1.1.4:
   resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-thief-react@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/color-thief-react/-/color-thief-react-2.1.0.tgz#7edcf91663d76fc58fee8c9887621d56786672d6"
+  integrity sha512-2Vr8XnxzoSEz2nUswROWIrxI6joMom4S9TZ5RC69/FR2K87BuXUZk5C4qn6g/rq5bYKx9m+HNjwlCOWIYMAv2A==
+  dependencies:
+    color-convert "^2.0.1"
+    colorthief "2.3.2"
+    prop-types "15.7.2"
+    tslib "2.3.0"
+    use-current-effect "2.1.0"
+
 colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -3689,7 +3734,15 @@ colorette@^2.0.10:
   resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.8:
+colorthief@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/colorthief/-/colorthief-2.3.2.tgz#00b984f421abe5a2af71c4d464c9d80d407fd53d"
+  integrity sha512-1r4nPW553JviRcFRvN3fS2V9nUSQGjRIws8UfEeFLIxk8j1tvtaX+AAYTkH3A4B5Muiys8SA1WJxf+00xVTXyg==
+  dependencies:
+    get-pixels "^3.3.2"
+    quantize "github:lokesh/quantize"
+
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -3841,6 +3894,11 @@ core-js@^3.36.1:
   resolved "https://registry.npmmirror.com/core-js/-/core-js-3.45.0.tgz#556c2af44a2d9c73ea7b49504392474a9f7c947e"
   integrity sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==
 
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -4059,6 +4117,25 @@ cuint@^0.2.2:
   resolved "https://registry.npmmirror.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
   integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==
 
+cwise-compiler@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
+  integrity sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==
+  dependencies:
+    uniq "^1.0.0"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-uri-to-buffer@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
+  integrity sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw==
+
 data-urls@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmmirror.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
@@ -4479,6 +4556,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5121,6 +5206,21 @@ ext-name@^5.0.0:
     ext-list "^2.0.0"
     sort-keys-length "^1.0.0"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+extsprintf@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -5334,6 +5434,11 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^4.0.0, form-data@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
@@ -5345,6 +5450,15 @@ form-data@^4.0.0, form-data@^4.0.4:
     hasown "^2.0.2"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -5454,6 +5568,23 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
+get-pixels@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.3.tgz#71e2dfd4befb810b5478a61c6354800976ce01c7"
+  integrity sha512-5kyGBn90i9tSMUVHTqkgCHsoWoR+/lGbl4yC83Gefyr0HLIhgSWEx/2F/3YgsZ7UpYNuM6pDhDK7zebrUJ5nXg==
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+    jpeg-js "^0.4.1"
+    mime-types "^2.0.1"
+    ndarray "^1.0.13"
+    ndarray-pack "^1.1.1"
+    node-bitmap "0.0.1"
+    omggif "^1.0.5"
+    parse-data-uri "^0.2.0"
+    pngjs "^3.3.3"
+    request "^2.44.0"
+    through "^2.3.4"
+
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
@@ -5517,6 +5648,13 @@ get-tsconfig@^4.7.0:
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 git-clone@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmmirror.com/git-clone/-/git-clone-0.1.0.tgz#0d76163778093aef7f1c30238f2a9ef3f07a2eb9"
@@ -5696,6 +5834,19 @@ handle-thing@^2.0.0:
   resolved "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -5951,6 +6102,15 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 https-proxy-agent@^7.0.5:
   version "7.0.6"
   resolved "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
@@ -6108,6 +6268,11 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
+iota-array@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
+  integrity sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -6165,7 +6330,7 @@ is-boolean-object@^1.2.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-buffer@~1.1.6:
+is-buffer@^1.0.2, is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -6379,6 +6544,11 @@ is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
   dependencies:
     which-typed-array "^1.1.16"
 
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@@ -6436,6 +6606,11 @@ isobject@^3.0.1:
   resolved "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -6526,6 +6701,11 @@ joi@^17.12.3:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
+jpeg-js@^0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
+  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6538,6 +6718,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsdom@^24.0.0:
   version "24.1.3"
   resolved "https://registry.npmmirror.com/jsdom/-/jsdom-24.1.3.tgz#88e4a07cb9dd21067514a619e9f17b090a394a9f"
@@ -6600,11 +6785,21 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json5@^1.0.1, json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
@@ -6640,6 +6835,16 @@ jsonp-retry@^1.0.3:
   dependencies:
     object-assign "^4.1.1"
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.3.5"
   resolved "https://registry.npmmirror.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
@@ -7118,7 +7323,7 @@ mime-db@1.52.0:
   resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
   integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.0.1, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -7304,6 +7509,22 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+ndarray-pack@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
+  integrity sha512-51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==
+  dependencies:
+    cwise-compiler "^1.1.2"
+    ndarray "^1.0.13"
+
+ndarray@^1.0.13:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
+  integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
+  dependencies:
+    iota-array "^1.0.0"
+    is-buffer "^1.0.2"
+
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -7339,6 +7560,11 @@ node-addon-api@^7.0.0:
   resolved "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
   integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
 
+node-bitmap@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
+  integrity sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==
+
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -7420,6 +7646,11 @@ nwsapi@^2.2.12:
   resolved "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.21.tgz#8df7797079350adda208910d8c33fc4c2d7520c3"
   integrity sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -7491,6 +7722,11 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
+omggif@^1.0.5:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"
+  integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -7676,6 +7912,13 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-data-uri@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
+  integrity sha512-uOtts8NqDcaCt1rIsO3VFDRsAfgE4c6osG4d9z3l4dCBlxYFzni6Di/oNU270SDrjkfZuUvLZx1rxMyqh46Y9w==
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -7789,6 +8032,11 @@ pend@~1.2.0:
   resolved "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -7853,6 +8101,11 @@ platform@^1.3.6:
   resolved "https://registry.npmmirror.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
+pngjs@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
 possible-typed-array-names@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -8226,6 +8479,15 @@ promise-polyfill@^7.1.0:
   resolved "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
   integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
 
+prop-types@15.7.2:
+  version "15.7.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.8.1"
+
 prop-types@^15.6.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -8263,7 +8525,7 @@ prr@~1.0.1:
   resolved "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.15.0"
   resolved "https://registry.npmmirror.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
   integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==
@@ -8290,6 +8552,15 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
+"quantize@github:lokesh/quantize":
+  version "1.4.0"
+  resolved "https://codeload.github.com/lokesh/quantize/tar.gz/270c6f81623c3247eed50ba37b9d74d79af7a267"
+
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.npmmirror.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -8363,7 +8634,7 @@ react-dom@^18.0.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
-react-is@^16.13.1:
+react-is@^16.13.1, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8573,6 +8844,32 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
+request@^2.44.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -8721,7 +9018,7 @@ safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8748,7 +9045,7 @@ safe-regex-test@^1.1.0:
     es-errors "^1.3.0"
     is-regex "^1.2.1"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -9194,6 +9491,21 @@ split-on-first@^3.0.0:
   resolved "https://registry.npmmirror.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7"
   integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==
 
+sshpk@^1.7.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
 stackframe@^1.3.4:
   version "1.3.4"
   resolved "https://registry.npmmirror.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
@@ -9227,7 +9539,16 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9323,7 +9644,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -9580,7 +9908,7 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-through@^2.3.6, through@^2.3.8:
+through@^2.3.4, through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -9641,6 +9969,14 @@ tough-cookie@^4.1.4:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^5.1.0:
   version "5.1.1"
   resolved "https://registry.npmmirror.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
@@ -9713,6 +10049,11 @@ tsconfig-paths@^4.1.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tslib@^1.10.0:
   version "1.14.1"
   resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -9730,6 +10071,11 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -9893,6 +10239,11 @@ unicorn-magic@^0.3.0:
   resolved "https://registry.npmmirror.com/unicorn-magic/-/unicorn-magic-0.3.0.tgz#4efd45c85a69e0dd576d25532fbfa22aa5c8a104"
   integrity sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==
 
+uniq@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
+
 universal-router@^9.2.0:
   version "9.2.1"
   resolved "https://registry.npmmirror.com/universal-router/-/universal-router-9.2.1.tgz#38e267770f75655c853123b81bcdd6be1bfc31a5"
@@ -9974,6 +10325,11 @@ url-to-options@^1.0.1:
   resolved "https://registry.npmmirror.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
   integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==
 
+use-current-effect@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/use-current-effect/-/use-current-effect-2.1.0.tgz#8b0074da370cbc3b756cedbd041806fd53d870af"
+  integrity sha512-yxSWZsBfohTulb+HyLdSIcUoG5UnSbgNl5SAEtFhzq1yqTeJAa32dZhhO5ACYn7Lc2IGt03pUOkUZZQQX/ReXg==
+
 use-sync-external-store@^1.2.2:
   version "1.5.0"
   resolved "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0"
@@ -9994,6 +10350,11 @@ utils-merge@1.0.1:
   resolved "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -10032,6 +10393,15 @@ vary@~1.1.2:
   resolved "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm2@^3.9.19:
   version "3.9.19"
   resolved "https://registry.npmmirror.com/vm2/-/vm2-3.9.19.tgz#be1e1d7a106122c6c492b4d51c2e8b93d3ed6a4a"
@@ -10319,7 +10689,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10337,6 +10707,15 @@ wrap-ansi@^6.0.1:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From b48455d42f3c5803822292da1454bebb13f31bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Mon, 18 Aug 2025 14:22:58 +0800
Subject: [PATCH 03/22] feat: none

---
 project.config.json | 68 ++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/project.config.json b/project.config.json
index 46dc372..a99eb2f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,25 +1,49 @@
 {
-	"miniprogramRoot": "dist/",
-	"projectname": "playBallTogether",
-	"description": "playBallTogether",
-	"appid": "touristappid",
-	"setting": {
-		"urlCheck": true,
-		"es6": false,
+  "miniprogramRoot": "dist/",
+  "projectname": "playBallTogether",
+  "description": "playBallTogether",
+  "appid": "wx815b533167eb7b53",
+  "setting": {
+    "urlCheck": true,
+    "es6": false,
     "enhance": false,
     "compileHotReLoad": false,
-		"postcss": false,
-		"preloadBackgroundData": false,
-		"minified": false,
-		"newFeature": true,
-		"autoAudits": false,
-		"coverView": true,
-		"showShadowRootInWxmlPanel": false,
-		"scopeDataCheck": false,
-		"useCompilerModule": false
-	},
-	"compileType": "miniprogram",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {}
-}
+    "postcss": false,
+    "preloadBackgroundData": false,
+    "minified": false,
+    "newFeature": true,
+    "autoAudits": false,
+    "coverView": true,
+    "showShadowRootInWxmlPanel": false,
+    "scopeDataCheck": false,
+    "useCompilerModule": false,
+    "compileWorklet": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "compileType": "miniprogram",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {},
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {},
+  "libVersion": "3.9.0"
+}
\ No newline at end of file

From fc3d7cf6cb7926c3281c0c66de7a213e702eca1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Mon, 18 Aug 2025 14:27:48 +0800
Subject: [PATCH 04/22] feat: remove useless dependence

---
 package.json              |   1 -
 src/pages/index/index.tsx |   7 -
 yarn.lock                 | 372 +-------------------------------------
 3 files changed, 9 insertions(+), 371 deletions(-)

diff --git a/package.json b/package.json
index 32344a8..2ac1636 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "@tarojs/runtime": "4.1.5",
     "@tarojs/shared": "4.1.5",
     "@tarojs/taro": "4.1.5",
-    "color-thief-react": "^2.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "zustand": "^4.4.7"
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 8c59767..7c4e67b 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -170,15 +170,8 @@ function Index() {
     })
   }
 
-  const handleDetail = () => {
-    Taro.navigateTo({
-      url: '/pages/detail/index'
-    })
-  }
-
   return (
     <View className='index-page'>
-      <Button onClick={handleDetail}>球局详情</Button>
       {/* 页面标题 */}
       <View className='page-header'>
         <Text className='page-title'>API 请求演示</Text>
diff --git a/yarn.lock b/yarn.lock
index 54ae1ea..e25d73d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2885,7 +2885,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3085,18 +3085,6 @@ arrify@^1.0.1:
   resolved "https://registry.npmmirror.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -3136,16 +3124,6 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
-  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
-
 axios@^1.6.8:
   version "1.11.0"
   resolved "https://registry.npmmirror.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
@@ -3276,13 +3254,6 @@ batch@0.6.1:
   resolved "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3525,11 +3496,6 @@ capital-case@^1.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
-
 caw@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
@@ -3713,17 +3679,6 @@ color-name@~1.1.4:
   resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-thief-react@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/color-thief-react/-/color-thief-react-2.1.0.tgz#7edcf91663d76fc58fee8c9887621d56786672d6"
-  integrity sha512-2Vr8XnxzoSEz2nUswROWIrxI6joMom4S9TZ5RC69/FR2K87BuXUZk5C4qn6g/rq5bYKx9m+HNjwlCOWIYMAv2A==
-  dependencies:
-    color-convert "^2.0.1"
-    colorthief "2.3.2"
-    prop-types "15.7.2"
-    tslib "2.3.0"
-    use-current-effect "2.1.0"
-
 colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -3734,15 +3689,7 @@ colorette@^2.0.10:
   resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-colorthief@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/colorthief/-/colorthief-2.3.2.tgz#00b984f421abe5a2af71c4d464c9d80d407fd53d"
-  integrity sha512-1r4nPW553JviRcFRvN3fS2V9nUSQGjRIws8UfEeFLIxk8j1tvtaX+AAYTkH3A4B5Muiys8SA1WJxf+00xVTXyg==
-  dependencies:
-    get-pixels "^3.3.2"
-    quantize "github:lokesh/quantize"
-
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -3894,11 +3841,6 @@ core-js@^3.36.1:
   resolved "https://registry.npmmirror.com/core-js/-/core-js-3.45.0.tgz#556c2af44a2d9c73ea7b49504392474a9f7c947e"
   integrity sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==
 
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -4117,25 +4059,6 @@ cuint@^0.2.2:
   resolved "https://registry.npmmirror.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
   integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==
 
-cwise-compiler@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
-  integrity sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==
-  dependencies:
-    uniq "^1.0.0"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
-data-uri-to-buffer@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
-  integrity sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw==
-
 data-urls@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmmirror.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
@@ -4556,14 +4479,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5206,21 +5121,6 @@ ext-name@^5.0.0:
     ext-list "^2.0.0"
     sort-keys-length "^1.0.0"
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -5434,11 +5334,6 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
 form-data@^4.0.0, form-data@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
@@ -5450,15 +5345,6 @@ form-data@^4.0.0, form-data@^4.0.4:
     hasown "^2.0.2"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -5568,23 +5454,6 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
-get-pixels@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.3.tgz#71e2dfd4befb810b5478a61c6354800976ce01c7"
-  integrity sha512-5kyGBn90i9tSMUVHTqkgCHsoWoR+/lGbl4yC83Gefyr0HLIhgSWEx/2F/3YgsZ7UpYNuM6pDhDK7zebrUJ5nXg==
-  dependencies:
-    data-uri-to-buffer "0.0.3"
-    jpeg-js "^0.4.1"
-    mime-types "^2.0.1"
-    ndarray "^1.0.13"
-    ndarray-pack "^1.1.1"
-    node-bitmap "0.0.1"
-    omggif "^1.0.5"
-    parse-data-uri "^0.2.0"
-    pngjs "^3.3.3"
-    request "^2.44.0"
-    through "^2.3.4"
-
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
@@ -5648,13 +5517,6 @@ get-tsconfig@^4.7.0:
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
 git-clone@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmmirror.com/git-clone/-/git-clone-0.1.0.tgz#0d76163778093aef7f1c30238f2a9ef3f07a2eb9"
@@ -5834,19 +5696,6 @@ handle-thing@^2.0.0:
   resolved "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmmirror.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -6102,15 +5951,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-proxy-agent@^7.0.5:
   version "7.0.6"
   resolved "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
@@ -6268,11 +6108,6 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-iota-array@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
-  integrity sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -6330,7 +6165,7 @@ is-boolean-object@^1.2.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-buffer@^1.0.2, is-buffer@~1.1.6:
+is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -6544,11 +6379,6 @@ is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
   dependencies:
     which-typed-array "^1.1.16"
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@@ -6606,11 +6436,6 @@ isobject@^3.0.1:
   resolved "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -6701,11 +6526,6 @@ joi@^17.12.3:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
-jpeg-js@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
-  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6718,11 +6538,6 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
 jsdom@^24.0.0:
   version "24.1.3"
   resolved "https://registry.npmmirror.com/jsdom/-/jsdom-24.1.3.tgz#88e4a07cb9dd21067514a619e9f17b090a394a9f"
@@ -6785,21 +6600,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
 json5@^1.0.1, json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
@@ -6835,16 +6640,6 @@ jsonp-retry@^1.0.3:
   dependencies:
     object-assign "^4.1.1"
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.3.5"
   resolved "https://registry.npmmirror.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
@@ -7323,7 +7118,7 @@ mime-db@1.52.0:
   resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
   integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
 
-mime-types@^2.0.1, mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -7509,22 +7304,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-ndarray-pack@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
-  integrity sha512-51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==
-  dependencies:
-    cwise-compiler "^1.1.2"
-    ndarray "^1.0.13"
-
-ndarray@^1.0.13:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
-  integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
-  dependencies:
-    iota-array "^1.0.0"
-    is-buffer "^1.0.2"
-
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -7560,11 +7339,6 @@ node-addon-api@^7.0.0:
   resolved "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
   integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
 
-node-bitmap@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
-  integrity sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==
-
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -7646,11 +7420,6 @@ nwsapi@^2.2.12:
   resolved "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.21.tgz#8df7797079350adda208910d8c33fc4c2d7520c3"
   integrity sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -7722,11 +7491,6 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-omggif@^1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"
-  integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==
-
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -7912,13 +7676,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-data-uri@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
-  integrity sha512-uOtts8NqDcaCt1rIsO3VFDRsAfgE4c6osG4d9z3l4dCBlxYFzni6Di/oNU270SDrjkfZuUvLZx1rxMyqh46Y9w==
-  dependencies:
-    data-uri-to-buffer "0.0.3"
-
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -8032,11 +7789,6 @@ pend@~1.2.0:
   resolved "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -8101,11 +7853,6 @@ platform@^1.3.6:
   resolved "https://registry.npmmirror.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
-pngjs@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
-  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
-
 possible-typed-array-names@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -8479,15 +8226,6 @@ promise-polyfill@^7.1.0:
   resolved "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
   integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
 
-prop-types@15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 prop-types@^15.6.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -8525,7 +8263,7 @@ prr@~1.0.1:
   resolved "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.15.0"
   resolved "https://registry.npmmirror.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
   integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==
@@ -8552,15 +8290,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-"quantize@github:lokesh/quantize":
-  version "1.4.0"
-  resolved "https://codeload.github.com/lokesh/quantize/tar.gz/270c6f81623c3247eed50ba37b9d74d79af7a267"
-
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.npmmirror.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -8634,7 +8363,7 @@ react-dom@^18.0.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
-react-is@^16.13.1, react-is@^16.8.1:
+react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8844,32 +8573,6 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-request@^2.44.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -9018,7 +8721,7 @@ safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -9045,7 +8748,7 @@ safe-regex-test@^1.1.0:
     es-errors "^1.3.0"
     is-regex "^1.2.1"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -9491,21 +9194,6 @@ split-on-first@^3.0.0:
   resolved "https://registry.npmmirror.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7"
   integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==
 
-sshpk@^1.7.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
-  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 stackframe@^1.3.4:
   version "1.3.4"
   resolved "https://registry.npmmirror.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
@@ -9908,7 +9596,7 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-through@^2.3.4, through@^2.3.6, through@^2.3.8:
+through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -9969,14 +9657,6 @@ tough-cookie@^4.1.4:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^5.1.0:
   version "5.1.1"
   resolved "https://registry.npmmirror.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
@@ -10049,11 +9729,6 @@ tsconfig-paths@^4.1.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.10.0:
   version "1.14.1"
   resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -10071,11 +9746,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -10239,11 +9909,6 @@ unicorn-magic@^0.3.0:
   resolved "https://registry.npmmirror.com/unicorn-magic/-/unicorn-magic-0.3.0.tgz#4efd45c85a69e0dd576d25532fbfa22aa5c8a104"
   integrity sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==
 
-uniq@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
-
 universal-router@^9.2.0:
   version "9.2.1"
   resolved "https://registry.npmmirror.com/universal-router/-/universal-router-9.2.1.tgz#38e267770f75655c853123b81bcdd6be1bfc31a5"
@@ -10325,11 +9990,6 @@ url-to-options@^1.0.1:
   resolved "https://registry.npmmirror.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
   integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==
 
-use-current-effect@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/use-current-effect/-/use-current-effect-2.1.0.tgz#8b0074da370cbc3b756cedbd041806fd53d870af"
-  integrity sha512-yxSWZsBfohTulb+HyLdSIcUoG5UnSbgNl5SAEtFhzq1yqTeJAa32dZhhO5ACYn7Lc2IGt03pUOkUZZQQX/ReXg==
-
 use-sync-external-store@^1.2.2:
   version "1.5.0"
   resolved "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0"
@@ -10350,11 +10010,6 @@ utils-merge@1.0.1:
   resolved "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -10393,15 +10048,6 @@ vary@~1.1.2:
   resolved "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vm2@^3.9.19:
   version "3.9.19"
   resolved "https://registry.npmmirror.com/vm2/-/vm2-3.9.19.tgz#be1e1d7a106122c6c492b4d51c2e8b93d3ed6a4a"

From 7a7ab85a8220557c72933ccd1d5f9e886d002c39 Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Tue, 19 Aug 2025 00:43:29 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CityFilter/index.module.scss |  1 +
 src/components/CityFilter/index.tsx         | 11 +--
 src/components/Menu/index.module.scss       |  2 +
 src/components/SearchBar/index.module.scss  |  1 -
 src/components/SearchBar/index.tsx          | 24 +++---
 src/config/images.js                        |  1 +
 src/pages/list/FilterPopup.tsx              | 23 +++++-
 src/pages/list/filterPopup.module.scss      | 27 +++++++
 src/pages/list/index.module.scss            | 15 ++++
 src/pages/list/index.scss                   |  0
 src/pages/list/index.tsx                    | 82 +++++++++++++--------
 src/static/list/icon-filter.svg             | 11 +++
 src/store/listStore.ts                      | 60 +++++++--------
 13 files changed, 174 insertions(+), 84 deletions(-)
 create mode 100644 src/pages/list/index.module.scss
 delete mode 100644 src/pages/list/index.scss
 create mode 100644 src/static/list/icon-filter.svg

diff --git a/src/components/CityFilter/index.module.scss b/src/components/CityFilter/index.module.scss
index aa8442f..ef6d454 100644
--- a/src/components/CityFilter/index.module.scss
+++ b/src/components/CityFilter/index.module.scss
@@ -1,6 +1,7 @@
 .menuWrap {
   padding: 5px 20px 10px;
   .menuItem {
+    width: 100vw;
     left: 0;
     border-bottom-left-radius: 30px;
     border-bottom-right-radius: 30px;
diff --git a/src/components/CityFilter/index.tsx b/src/components/CityFilter/index.tsx
index db40f86..b50c8ca 100644
--- a/src/components/CityFilter/index.tsx
+++ b/src/components/CityFilter/index.tsx
@@ -12,7 +12,7 @@ interface IProps {
 }
 
 const MenuComponent = (props: IProps) => {
-  const { value, onChange, wrapperClassName, itemClassName } = props;
+  const { value, onChange, wrapperClassName, itemClassName, options } = props;
   const [isChange, setIsChange] = useState(false);
   const itemRef = useRef(null);
 
@@ -22,12 +22,7 @@ const MenuComponent = (props: IProps) => {
     onChange && onChange(value);
   };
 
-  const options: BubbleOption[] = [
-    { id: 0, label: "全城", value: "0" },
-    { id: 1, label: "3km", value: "3" },
-    { id: 2, label: "5km", value: "5" },
-    { id: 3, label: "10km", value: "10" },
-  ];
+  
 
   return (
     <Menu
@@ -38,7 +33,7 @@ const MenuComponent = (props: IProps) => {
     >
       <Menu.Item
         title="全城"
-        className={`${styles.menuItem} ${itemClassName}`}
+        className={`${styles.menuItem} ${itemClassName ? itemClassName : ''}`}
         ref={itemRef}
       >
         <div className={styles.positionWrap}>
diff --git a/src/components/Menu/index.module.scss b/src/components/Menu/index.module.scss
index 0867087..4bebabb 100644
--- a/src/components/Menu/index.module.scss
+++ b/src/components/Menu/index.module.scss
@@ -1,6 +1,8 @@
 .menuWrap {
+  position: static;
   padding: 5px 20px 10px;
   .menuItem {
+    width: 100vw;
     left: 0;
     border-bottom-left-radius: 30px;
     border-bottom-right-radius: 30px;
diff --git a/src/components/SearchBar/index.module.scss b/src/components/SearchBar/index.module.scss
index b376efc..632fe92 100644
--- a/src/components/SearchBar/index.module.scss
+++ b/src/components/SearchBar/index.module.scss
@@ -6,7 +6,6 @@
   --nutui-searchbar-input-text-color: #000000;
   --nutui-searchbar-input-padding: 0 0 0 10px;
   --nutui-searchbar-padding:0 15px;
-  // --nutui-searchbar-background: #ffffff;
   :global(.nut-searchbar-content) {
     box-shadow: 0 4px 48px #00000014;
   }
diff --git a/src/components/SearchBar/index.tsx b/src/components/SearchBar/index.tsx
index 60fd06f..9456d55 100644
--- a/src/components/SearchBar/index.tsx
+++ b/src/components/SearchBar/index.tsx
@@ -1,22 +1,26 @@
+import { SearchBar } from "@nutui/nutui-react-taro";
+// import {ICON_FILTER} from '../../config/images.js'
+import styles from "./index.module.scss";
 
-import { SearchBar } from '@nutui/nutui-react-taro'
-import styles from './index.module.scss'
-
-const SearchBarComponent = () => {
+const SearchBarComponent = (props: IProps) => {
+  // console.log('===', ICON_FILTER)
+  const { handleFilterIcon } = props;
   return (
     <>
-    <SearchBar
+      <SearchBar
         // leftIn={
         //   <div>123</div>
         // }
         right={
-          <div className={styles.searchBarRight}>筛</div>
+          <div className={styles.searchBarRight} onClick={handleFilterIcon}>
+            筛
+          </div>
         }
         className={styles.searchBar}
-        placeholder='搜索上海的球局和场地'
+        placeholder="搜索上海的球局和场地"
       />
     </>
-  )
-}
+  );
+};
 
-export default SearchBarComponent
\ No newline at end of file
+export default SearchBarComponent;
diff --git a/src/config/images.js b/src/config/images.js
index ab20192..2f42a82 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -8,4 +8,5 @@ export default {
     ICON_COST: require('@/static/publishBall/icon-cost.svg'),
     ICON_TIPS: require('@/static/publishBall/icon-tips.svg'),
     ICON_ARROW_RIGHT: require('@/static/publishBall/icon-arrow-right.svg'),
+    ICON_FILTER: require('@/static/list/icon-filter.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index 1e31276..a4c19f3 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -3,6 +3,8 @@ import Range from "../../components/Range";
 import Bubble, { BubbleOption } from "../../components/Bubble";
 import styles from "./filterPopup.module.scss";
 import TitleComponent from "src/components/Title";
+import { Button } from "@nutui/nutui-react-taro";
+import { useListStore } from "../../store/listStore";
 
 const timeOptions: BubbleOption[] = [
   { id: 1, label: "晨间 6:00-10:00", value: "morning" },
@@ -19,7 +21,14 @@ const locationOptions: BubbleOption[] = [
   { id: 3, label: "半室外", value: "3" },
 ];
 
-const FilterPopup = () => {
+interface IProps {
+  onCancel: () => void;
+  onConfirm: () => void;
+  loading: boolean;
+}
+
+const FilterPopup = (props: IProps) => {
+  const { loading, onCancel, onConfirm } = props;
   return (
     <>
       <Popup
@@ -28,9 +37,6 @@ const FilterPopup = () => {
         position="top"
         round
         closeOnOverlayClick={false}
-        onClose={() => {
-          // setShowTop(false)
-        }}
       >
         <div className={styles.filterPopupWrapper}>
           {/* 时间气泡选项 */}
@@ -63,6 +69,15 @@ const FilterPopup = () => {
               columns={3}
             />
           </div>
+          {/* 按钮 */}
+          <div className={styles.filterPopupBtnWrapper}>
+            <Button className={styles.btn} type="default" onClick={onCancel}>
+              清空全部
+            </Button>
+            <Button className={`${styles.btn} ${styles.confirm}`} type="default" loading={loading} onClick={onConfirm}>
+              显示 332 场球局
+            </Button>
+          </div>
         </div>
       </Popup>
     </>
diff --git a/src/pages/list/filterPopup.module.scss b/src/pages/list/filterPopup.module.scss
index c1e834a..9305f21 100644
--- a/src/pages/list/filterPopup.module.scss
+++ b/src/pages/list/filterPopup.module.scss
@@ -1,8 +1,35 @@
 .filterPopupWrapper {
+  position: relative;
   $m18: 18px;
   padding: $m18;
+
   .filterPopupRange {
     margin-top: $m18;
     margin-bottom: $m18;
   }
+
+  .filterPopupBtnWrapper {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+    position: sticky;
+    bottom: 0;
+    background-color: #ffffff;
+    padding: 8px 0;
+
+    .btn {
+      flex: 1;
+    }
+    
+    --nutui-button-border-width: 0.5px;
+    --nutui-button-default-border-color: #0000000F;
+    --nutui-button-border-radius: 16px;
+    --nutui-button-default-height: 44px;
+    --nutui-button-default-color: #000000;
+    .confirm {
+      --nutui-button-default-color: #ffffff;
+      --nutui-button-default-background-color: #000000;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/pages/list/index.module.scss b/src/pages/list/index.module.scss
new file mode 100644
index 0000000..1aa4c24
--- /dev/null
+++ b/src/pages/list/index.module.scss
@@ -0,0 +1,15 @@
+.listPage {
+  background-color: #fafafa;
+  padding: 0 15px;
+
+  .listTopFilterWrapper {
+    display: flex;
+    align-items: center;
+    padding: 5px 0 10px;
+    gap: 5px;
+  }
+
+  .menuFilter {
+    padding: 0;
+  }
+}
diff --git a/src/pages/list/index.scss b/src/pages/list/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 7587ed3..525fddc 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -1,29 +1,26 @@
 import ListItem from "../../components/ListItem";
 import List from "../../components/List";
-import Bubble from "../../components/Bubble/example";
-import Range from "../../components/Range/example";
-import Menu from "../../components/Menu/example";
-import CityFilter from "../../components/CityFilter/example";
+import Menu from "../../components/Menu";
+import CityFilter from "../../components/CityFilter";
 import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
-import "./index.scss";
+import styles from  "./index.module.scss";
 import { useEffect } from "react";
 import Taro from "@tarojs/taro";
-import {
-  useTennisMatches,
-  useTennisLoading,
-  useTennisError,
-  useTennisLastRefresh,
-  useTennisActions,
-} from "../../store/listStore";
+import { useListStore } from "../../store/listStore";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
-  const matches = useTennisMatches();
-  const loading = useTennisLoading();
-  const error = useTennisError();
-  const lastRefreshTime = useTennisLastRefresh();
-  const { fetchMatches, refreshMatches, clearError } = useTennisActions();
+  const {
+    isShowFilterPopup,
+    error,
+    matches,
+    loading,
+    fetchMatches,
+    refreshMatches,
+    clearError,
+    updateState,
+  } = useListStore() || {};
 
   useEffect(() => {
     // 页面加载时获取数据
@@ -146,22 +143,43 @@ const ListPage = () => {
     );
   }
 
-  return (
-    <div>
-      <SearchBar />
-      {/* 综合筛选 */}
-      <div>
-        <FilterPopup />
-      </div>
-      {/* 筛选 */}
-      <div>
-        {/* 全城筛选 */}
-        <CityFilter />
-        {/* 智能排序 */}
-        <Menu />
-      </div>
+  const toggleShowPopup = () => {
+    updateState({ isShowFilterPopup: !isShowFilterPopup });
+  };
 
-      
+  const cityOptions: BubbleOption[] = [
+    { id: 0, label: "全城", value: "0" },
+    { id: 1, label: "3km", value: "3" },
+    { id: 2, label: "5km", value: "5" },
+    { id: 3, label: "10km", value: "10" },
+  ];
+
+ const options = [
+    { text: "默认排序", value: "a" },
+    { text: "好评排序", value: "b" },
+    { text: "销量排序", value: "c" },
+  ];
+
+  return (
+    <div className={styles.listPage}>
+      <SearchBar handleFilterIcon={toggleShowPopup} />
+      {/* 综合筛选 */}
+      {isShowFilterPopup && (
+        <div>
+          <FilterPopup
+            loading={loading}
+            onCancel={toggleShowPopup}
+            onConfirm={toggleShowPopup}
+          />
+        </div>
+      )}
+      {/* 筛选 */}
+      <div className={ styles.listTopFilterWrapper}>
+        {/* 全城筛选 */}
+        <CityFilter options={cityOptions} value="1" onChange={() => { }} wrapperClassName={styles.menuFilter} />
+        {/* 智能排序 */}
+        <Menu options={options} value="a" onChange={() => { }} wrapperClassName={styles.menuFilter} />
+      </div>
 
       {/* 列表内容 */}
       <List>
diff --git a/src/static/list/icon-filter.svg b/src/static/list/icon-filter.svg
new file mode 100644
index 0000000..dd5b39a
--- /dev/null
+++ b/src/static/list/icon-filter.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.2917 4.16666H14.7917" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4583 2.5V5.83333" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4584 4.16666H2.29175" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.62508 10H2.29175" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.95825 8.33333V11.6667" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.1249 10H8.95825" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.2917 15.8333H14.7917" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4583 14.1667V17.5" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4584 15.8333H2.29175" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index d64d49e..3a61d67 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -16,15 +16,16 @@ export interface TennisMatch {
 }
 
 // Store 状态接口
-interface TennisState {
+interface ListState {
   matches: TennisMatch[]
   loading: boolean
   error: string | null
   lastRefreshTime: string | null
+  isShowFilterPopup: boolean
 }
 
 // Store Actions 接口
-interface TennisActions {
+interface ListActions {
   fetchMatches: (params?: {
     page?: number
     pageSize?: number
@@ -33,36 +34,39 @@ interface TennisActions {
   }) => Promise<void>
   refreshMatches: () => Promise<void>
   clearError: () => void
+  updateState: (payload: Record<string, any>) => void
 }
 
 // 完整的 Store 类型
-type TennisStore = TennisState & TennisActions
+type TennisStore = ListState & ListActions
 
 // 创建 store
-export const useTennisStore = create<TennisStore>()((set, get) => ({
+export const useListStore = create<TennisStore>()((set, get) => ({
   // 初始状态
   matches: [],
   loading: false,
   error: null,
   lastRefreshTime: null,
+  // 是否展示综合筛选弹窗
+  isShowFilterPopup: false,
 
   // 获取比赛数据
   fetchMatches: async (params) => {
     set({ loading: true, error: null })
-    
+
     try {
       const matches = await getTennisMatches(params)
-      set({ 
-        matches, 
-        loading: false, 
-        lastRefreshTime: new Date().toISOString() 
+      set({
+        matches,
+        loading: false,
+        lastRefreshTime: new Date().toISOString()
       })
       console.log('Store: 成功获取网球比赛数据:', matches.length, '条')
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : '未知错误'
-      set({ 
-        error: errorMessage, 
-        loading: false 
+      set({
+        error: errorMessage,
+        loading: false
       })
       console.error('Store: 获取网球比赛数据失败:', errorMessage)
     }
@@ -71,20 +75,20 @@ export const useTennisStore = create<TennisStore>()((set, get) => ({
   // 刷新比赛数据
   refreshMatches: async () => {
     set({ loading: true, error: null })
-    
+
     try {
       const matches = await getTennisMatches()
-      set({ 
-        matches, 
-        loading: false, 
-        lastRefreshTime: new Date().toISOString() 
+      set({
+        matches,
+        loading: false,
+        lastRefreshTime: new Date().toISOString()
       })
       console.log('Store: 成功刷新网球比赛数据:', matches.length, '条')
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : '未知错误'
-      set({ 
-        error: errorMessage, 
-        loading: false 
+      set({
+        error: errorMessage,
+        loading: false
       })
       console.error('Store: 刷新网球比赛数据失败:', errorMessage)
     }
@@ -93,16 +97,14 @@ export const useTennisStore = create<TennisStore>()((set, get) => ({
   // 清除错误信息
   clearError: () => {
     set({ error: null })
+  },
+  // 更新store数据
+  updateState: (payload: Record<string, any>) => {
+    set({
+      ...(payload || {})
+    })
   }
 }))
 
 // 导出便捷的 hooks
-export const useTennisMatches = () => useTennisStore((state) => state.matches)
-export const useTennisLoading = () => useTennisStore((state) => state.loading)
-export const useTennisError = () => useTennisStore((state) => state.error)
-export const useTennisLastRefresh = () => useTennisStore((state) => state.lastRefreshTime)
-export const useTennisActions = () => useTennisStore((state) => ({
-  fetchMatches: state.fetchMatches,
-  refreshMatches: state.refreshMatches,
-  clearError: state.clearError
-}))
+export const useListState = () => useListStore((state) => state)

From e6124131e7a9989a8065e86bb3d45de4696dfe4f Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sat, 23 Aug 2025 15:40:19 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bubble/index.tsx             |  7 ++-
 src/components/CityFilter/index.module.scss | 14 +++++-
 src/components/List/index.scss              |  1 -
 src/components/Range/index.tsx              | 19 ++++----
 src/components/SearchBar/index.module.scss  | 33 +++++++++++--
 src/components/SearchBar/index.tsx          | 35 ++++++++++----
 src/config/images.js                        |  2 +
 src/pages/list/FilterPopup.tsx              | 53 +++++++++++++++------
 src/pages/list/index.tsx                    | 41 +++++++++++++---
 src/static/list/icon-filter-selected.svg    | 11 +++++
 src/static/list/icon-search.svg             |  5 ++
 src/store/listStore.ts                      | 46 ++++++++++++++++++
 12 files changed, 219 insertions(+), 48 deletions(-)
 create mode 100644 src/static/list/icon-filter-selected.svg
 create mode 100644 src/static/list/icon-search.svg

diff --git a/src/components/Bubble/index.tsx b/src/components/Bubble/index.tsx
index 264de4e..59af227 100644
--- a/src/components/Bubble/index.tsx
+++ b/src/components/Bubble/index.tsx
@@ -15,6 +15,7 @@ export interface BubbleProps {
   options: BubbleOption[];
   value?: string | number | (string | number)[];
   onChange?: (
+    name: string,
     value: string | number | (string | number)[],
     option: BubbleOption | BubbleOption[]
   ) => void;
@@ -26,6 +27,7 @@ export interface BubbleProps {
   itemClassName?: string;
   style?: React.CSSProperties;
   disabled?: boolean;
+  name: string;
 }
 
 const Bubble: React.FC<BubbleProps> = ({
@@ -40,6 +42,7 @@ const Bubble: React.FC<BubbleProps> = ({
   itemClassName = "",
   style = {},
   disabled = false,
+  name,
 }) => {
   const [selectedValues, setSelectedValues] = useState<(string | number)[]>([]);
 
@@ -74,9 +77,9 @@ const Bubble: React.FC<BubbleProps> = ({
         const selectedOptions = options.filter((opt) =>
           newSelectedValues.includes(opt.value)
         );
-        onChange(newSelectedValues, selectedOptions);
+        onChange(name, newSelectedValues, selectedOptions);
       } else {
-        onChange(option.value, option);
+        onChange(name, option.value, option);
       }
     }
   };
diff --git a/src/components/CityFilter/index.module.scss b/src/components/CityFilter/index.module.scss
index ef6d454..ec1ee63 100644
--- a/src/components/CityFilter/index.module.scss
+++ b/src/components/CityFilter/index.module.scss
@@ -1,17 +1,24 @@
 .menuWrap {
   padding: 5px 20px 10px;
+
   .menuItem {
     width: 100vw;
     left: 0;
     border-bottom-left-radius: 30px;
     border-bottom-right-radius: 30px;
   }
+
+  .menuItem {
+    position: fixed;
+  }
+
   &.active {
     .nut-menu-bar {
       background-color: #000000;
       color: #ffffff;
     }
   }
+
   :global(.nut-menu-bar) {
     color: #000000;
     line-height: 1;
@@ -23,6 +30,7 @@
     line-height: 28px;
     font-size: 14px;
     width: max-content;
+
     .nut-menu-title {
       color: inherit !important;
       font-weight: 600;
@@ -49,13 +57,15 @@
   .cityName {
     font-size: 13px;
     font-weight: 400;
-    color: #3C3C43;
+    color: #3c3c43;
   }
+
   .distanceWrap {
     margin-bottom: 16px;
     width: 100%;
   }
+
   .distanceBubbleItem {
     width: auto;
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/List/index.scss b/src/components/List/index.scss
index 391a9aa..5742c9e 100644
--- a/src/components/List/index.scss
+++ b/src/components/List/index.scss
@@ -1,6 +1,5 @@
 .list {
   background: #fafafa;
-  margin-top: 12px;
   display: flex;
   flex-direction: column;
   gap: 5px;
diff --git a/src/components/Range/index.tsx b/src/components/Range/index.tsx
index 84fe4b1..e4d0f78 100644
--- a/src/components/Range/index.tsx
+++ b/src/components/Range/index.tsx
@@ -8,9 +8,10 @@ interface RangeProps {
   max?: number;
   step?: number;
   value?: [number, number];
-  onChange?: (value: [number, number]) => void;
+  onChange?: (name: string, value: [number, number]) => void;
   disabled?: boolean;
   className?: string;
+  name: string;
 }
 
 const NtrpRange: React.FC<RangeProps> = ({
@@ -21,16 +22,18 @@ const NtrpRange: React.FC<RangeProps> = ({
   onChange,
   disabled = false,
   className,
+  name,
 }) => {
   const [currentValue, setCurrentValue] = useState<[number, number]>(value);
-
+console.log('===currentValue', currentValue)
   useEffect(() => {
+    console.log('===rrr', value)
     value && setCurrentValue(value);
   }, [JSON.stringify(value || [])]);
 
   const handleChange = (val: [number, number]) => {
     setCurrentValue(val);
-    onChange?.(val);
+    onChange?.(name, val);
   };
 
   const marks = useMemo(() => {
@@ -50,13 +53,9 @@ const NtrpRange: React.FC<RangeProps> = ({
   }, [JSON.stringify(currentValue || []), min, max]);
 
   return (
-    <div className={`${styles.nutRange} ${className ? className : ''} `}>
+    <div className={`${styles.nutRange} ${className ? className : ""} `}>
       <div className={styles.nutRangeHeader}>
-        {/* <div className={styles.nutRangeHeaderLeft}>
-          <div className="ntrp-range__icon">icon</div>
-          <h3 className={styles.nutRangeHeaderTitle}>NTRP水平区间</h3>
-        </div> */}
-        <TitleComponent title='NTRP水平区间'/>
+        <TitleComponent title="NTRP水平区间" />
         <p className={styles.nutRangeHeaderContent}>{rangContent}</p>
       </div>
 
@@ -68,7 +67,7 @@ const NtrpRange: React.FC<RangeProps> = ({
             min={min}
             max={max}
             step={step}
-            // value={currentValue}
+            value={currentValue}
             onEnd={handleChange}
             disabled={disabled}
             defaultValue={[min, max]}
diff --git a/src/components/SearchBar/index.module.scss b/src/components/SearchBar/index.module.scss
index 632fe92..cc20edd 100644
--- a/src/components/SearchBar/index.module.scss
+++ b/src/components/SearchBar/index.module.scss
@@ -5,18 +5,45 @@
   --nutui-searchbar-content-border-radius: 44px;
   --nutui-searchbar-input-text-color: #000000;
   --nutui-searchbar-input-padding: 0 0 0 10px;
-  --nutui-searchbar-padding:0 15px;
+  --nutui-searchbar-padding: 10px 0 0 0;
   :global(.nut-searchbar-content) {
     box-shadow: 0 4px 48px #00000014;
   }
   .searchBarRight {
+    position: relative;
     width: 44px;
     height: 44px;
     border-radius: 50%;
-    border: 1px solid #0000000F;
+    border: 1px solid #0000000f;
     background-color: #ffffff;
     display: flex;
     align-items: center;
     justify-content: center;
+    &.active {
+      background-color: #000000;
+    }
   }
-}
\ No newline at end of file
+  .filterIcon {
+    width: 20px;
+    height: 20px;
+  }
+  .filterCount {
+    background-color: #000000;
+    position: absolute;
+    width: 18px;
+    height: 18px;
+    border: 2px solid #ffffff;
+    border-radius: 50%;
+    right: -5px;
+    bottom: -5px;
+    color: #ffffff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 11px;
+  }
+  .searchIcon {
+    width: 20px;
+    height: 20px;
+  }
+}
diff --git a/src/components/SearchBar/index.tsx b/src/components/SearchBar/index.tsx
index 9456d55..9d4827d 100644
--- a/src/components/SearchBar/index.tsx
+++ b/src/components/SearchBar/index.tsx
@@ -1,21 +1,38 @@
 import { SearchBar } from "@nutui/nutui-react-taro";
-// import {ICON_FILTER} from '../../config/images.js'
+import { View, Text, Image } from "@tarojs/components";
+import img from "../../config/images";
 import styles from "./index.module.scss";
 
+interface IProps {
+  handleFilterIcon: () => void;
+  isSelect: boolean;
+  filterCount: number;
+}
+
 const SearchBarComponent = (props: IProps) => {
-  // console.log('===', ICON_FILTER)
-  const { handleFilterIcon } = props;
+  const { handleFilterIcon, isSelect, filterCount } = props;
   return (
     <>
       <SearchBar
-        // leftIn={
-        //   <div>123</div>
-        // }
-        right={
-          <div className={styles.searchBarRight} onClick={handleFilterIcon}>
-            筛
+        leftIn={
+          <div>
+            <Image className={styles.searchIcon} src={img.ICON_SEARCH} />
           </div>
         }
+        right={
+          <View
+            className={`${styles.searchBarRight} ${
+              isSelect ? styles.active : ""
+            }`}
+            onClick={handleFilterIcon}
+          >
+            <Image
+              src={isSelect ? img.ICON_FILTER_SELECTED : img.ICON_FILTER}
+              className={styles.filterIcon}
+            />
+            <Text className={styles.filterCount}>{filterCount}</Text>
+          </View>
+        }
         className={styles.searchBar}
         placeholder="搜索上海的球局和场地"
       />
diff --git a/src/config/images.js b/src/config/images.js
index 2f42a82..9effb04 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -9,4 +9,6 @@ export default {
     ICON_TIPS: require('@/static/publishBall/icon-tips.svg'),
     ICON_ARROW_RIGHT: require('@/static/publishBall/icon-arrow-right.svg'),
     ICON_FILTER: require('@/static/list/icon-filter.svg'),
+    ICON_FILTER_SELECTED: require('@/static/list/icon-filter-selected.svg'),
+    ICON_SEARCH: require('@/static/list/icon-search.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index a4c19f3..5598593 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -4,15 +4,14 @@ import Bubble, { BubbleOption } from "../../components/Bubble";
 import styles from "./filterPopup.module.scss";
 import TitleComponent from "src/components/Title";
 import { Button } from "@nutui/nutui-react-taro";
-import { useListStore } from "../../store/listStore";
 
 const timeOptions: BubbleOption[] = [
-  { id: 1, label: "晨间 6:00-10:00", value: "morning" },
-  { id: 2, label: "上午 10:00-12:00", value: "forenoon" },
-  { id: 3, label: "中午 12:00-14:00", value: "noon" },
-  { id: 4, label: "下午 14:00-18:00", value: "afternoon" },
-  { id: 5, label: "晚上 18:00-22:00", value: "evening" },
-  { id: 6, label: "夜间 22:00-24:00", value: "night" },
+  { id: 1, label: "晨间 6:00-10:00", value: "1" },
+  { id: 2, label: "上午 10:00-12:00", value: "2" },
+  { id: 3, label: "中午 12:00-14:00", value: "3" },
+  { id: 4, label: "下午 14:00-18:00", value: "4" },
+  { id: 5, label: "晚上 18:00-22:00", value: "5" },
+  { id: 6, label: "夜间 22:00-24:00", value: "6" },
 ];
 
 const locationOptions: BubbleOption[] = [
@@ -24,11 +23,25 @@ const locationOptions: BubbleOption[] = [
 interface IProps {
   onCancel: () => void;
   onConfirm: () => void;
+  onChange: (params: Record<string, string>) => void;
   loading: boolean;
+  filterOptions: Record<string, any>;
+  onClear: () => void;
 }
 
 const FilterPopup = (props: IProps) => {
-  const { loading, onCancel, onConfirm } = props;
+  const { loading, onCancel, onConfirm, onChange, filterOptions, onClear } = props;
+  console.log('===filterOptions', filterOptions)
+
+  const handleFilterChange = (name, value) => {
+    onChange({ [name]: value });
+  };
+
+  const handleClearFilter = () => {
+    onClear()
+    onCancel();
+  }
+
   return (
     <>
       <Popup
@@ -36,17 +49,18 @@ const FilterPopup = (props: IProps) => {
         destroyOnClose
         position="top"
         round
-        closeOnOverlayClick={false}
+        closeOnOverlayClick={true}
       >
         <div className={styles.filterPopupWrapper}>
           {/* 时间气泡选项 */}
           <Bubble
             options={timeOptions}
-            value={(value) => {}}
-            onChange={(value) => {}}
+            value={filterOptions?.time}
+            onChange={handleFilterChange}
             layout="grid"
             size="small"
             columns={3}
+            name="time"
           />
 
           {/* 范围选择 */}
@@ -55,6 +69,9 @@ const FilterPopup = (props: IProps) => {
             max={5.0}
             step={0.5}
             className={styles.filterPopupRange}
+            onChange={handleFilterChange}
+            value={filterOptions?.ntrp}
+            name='ntrp'
           />
 
           {/* 场次气泡选项 */}
@@ -62,19 +79,25 @@ const FilterPopup = (props: IProps) => {
             <TitleComponent title="场地类型" />
             <Bubble
               options={locationOptions}
-              value={(value) => {}}
-              onChange={(value) => {}}
+              value={filterOptions?.site}
+              onChange={handleFilterChange}
               layout="grid"
               size="small"
               columns={3}
+              name='site'
             />
           </div>
           {/* 按钮 */}
           <div className={styles.filterPopupBtnWrapper}>
-            <Button className={styles.btn} type="default" onClick={onCancel}>
+            <Button className={styles.btn} type="default" onClick={handleClearFilter}>
               清空全部
             </Button>
-            <Button className={`${styles.btn} ${styles.confirm}`} type="default" loading={loading} onClick={onConfirm}>
+            <Button
+              className={`${styles.btn} ${styles.confirm}`}
+              type="default"
+              loading={loading}
+              onClick={onConfirm}
+            >
               显示 332 场球局
             </Button>
           </div>
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 525fddc..0914616 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -4,7 +4,7 @@ import Menu from "../../components/Menu";
 import CityFilter from "../../components/CityFilter";
 import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
-import styles from  "./index.module.scss";
+import styles from "./index.module.scss";
 import { useEffect } from "react";
 import Taro from "@tarojs/taro";
 import { useListStore } from "../../store/listStore";
@@ -20,6 +20,10 @@ const ListPage = () => {
     refreshMatches,
     clearError,
     updateState,
+    filterCount,
+    updateFilterOptions, // 更新筛选条件
+    filterOptions,
+    clearFilterOptions,
   } = useListStore() || {};
 
   useEffect(() => {
@@ -147,6 +151,10 @@ const ListPage = () => {
     updateState({ isShowFilterPopup: !isShowFilterPopup });
   };
 
+  const updateFilterSelect = (params) => {
+    updateState(params);
+  };
+
   const cityOptions: BubbleOption[] = [
     { id: 0, label: "全城", value: "0" },
     { id: 1, label: "3km", value: "3" },
@@ -154,15 +162,23 @@ const ListPage = () => {
     { id: 3, label: "10km", value: "10" },
   ];
 
- const options = [
+  const options = [
     { text: "默认排序", value: "a" },
     { text: "好评排序", value: "b" },
     { text: "销量排序", value: "c" },
   ];
 
+  const handleUpdateFilterOptions = (params: Record<string, any>) => {
+    updateFilterOptions(params);
+  };
+
   return (
     <div className={styles.listPage}>
-      <SearchBar handleFilterIcon={toggleShowPopup} />
+      <SearchBar
+        handleFilterIcon={toggleShowPopup}
+        isSelect={filterCount > 0}
+        filterCount={filterCount}
+      />
       {/* 综合筛选 */}
       {isShowFilterPopup && (
         <div>
@@ -170,15 +186,28 @@ const ListPage = () => {
             loading={loading}
             onCancel={toggleShowPopup}
             onConfirm={toggleShowPopup}
+            onChange={handleUpdateFilterOptions}
+            filterOptions={filterOptions}
+            onClear={clearFilterOptions}
           />
         </div>
       )}
       {/* 筛选 */}
-      <div className={ styles.listTopFilterWrapper}>
+      <div className={styles.listTopFilterWrapper}>
         {/* 全城筛选 */}
-        <CityFilter options={cityOptions} value="1" onChange={() => { }} wrapperClassName={styles.menuFilter} />
+        <CityFilter
+          options={cityOptions}
+          value="1"
+          onChange={() => {}}
+          wrapperClassName={styles.menuFilter}
+        />
         {/* 智能排序 */}
-        <Menu options={options} value="a" onChange={() => { }} wrapperClassName={styles.menuFilter} />
+        <Menu
+          options={options}
+          value="a"
+          onChange={() => {}}
+          wrapperClassName={styles.menuFilter}
+        />
       </div>
 
       {/* 列表内容 */}
diff --git a/src/static/list/icon-filter-selected.svg b/src/static/list/icon-filter-selected.svg
new file mode 100644
index 0000000..4b51f02
--- /dev/null
+++ b/src/static/list/icon-filter-selected.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.2915 4.16666H14.7915" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4585 2.5V5.83333" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4582 4.16666H2.2915" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.62484 10H2.2915" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.9585 8.33333V11.6667" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.1252 10H8.9585" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.2915 15.8333H14.7915" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4585 14.1667V17.5" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4582 15.8333H2.2915" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/list/icon-search.svg b/src/static/list/icon-search.svg
new file mode 100644
index 0000000..3ca4401
--- /dev/null
+++ b/src/static/list/icon-search.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.74984 15.8333C12.6618 15.8333 15.8332 12.662 15.8332 8.75C15.8332 4.838 12.6618 1.66666 8.74984 1.66666C4.83784 1.66666 1.6665 4.838 1.6665 8.75C1.6665 12.662 4.83784 15.8333 8.74984 15.8333Z" stroke="black" stroke-width="1.66667" stroke-linejoin="round"/>
+<path d="M11.1071 5.97629C10.5039 5.37308 9.67057 5 8.75007 5C7.82961 5 6.99627 5.37308 6.39307 5.97629" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.8423 13.8424L17.3778 17.3779" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index 3a61d67..f0b2cd7 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -22,6 +22,16 @@ interface ListState {
   error: string | null
   lastRefreshTime: string | null
   isShowFilterPopup: boolean
+  filterOptions: IFilterOptions
+  filterCount: number
+}
+
+interface IFilterOptions {
+  location: string
+  time: string
+  ntrp: [number, number]
+  site: string
+  wanfa: string
 }
 
 // Store Actions 接口
@@ -35,11 +45,21 @@ interface ListActions {
   refreshMatches: () => Promise<void>
   clearError: () => void
   updateState: (payload: Record<string, any>) => void
+  updateFilterOptions: (payload: Record<string, any>) => void
+  clearFilterOptions: () => void
 }
 
 // 完整的 Store 类型
 type TennisStore = ListState & ListActions
 
+const defaultFilterOptions: IFilterOptions = {
+  location: '', // 位置
+  time: '', // 时间
+  ntrp: [1.0, 5.0], // NTRP 水平区间
+  site: '', // 场地类型
+  wanfa: '', // 玩法
+};
+
 // 创建 store
 export const useListStore = create<TennisStore>()((set, get) => ({
   // 初始状态
@@ -49,6 +69,10 @@ export const useListStore = create<TennisStore>()((set, get) => ({
   lastRefreshTime: null,
   // 是否展示综合筛选弹窗
   isShowFilterPopup: false,
+  // 综合筛选项
+  filterOptions: defaultFilterOptions,
+  // 综合筛选 选择的筛选数量
+  filterCount: 0,
 
   // 获取比赛数据
   fetchMatches: async (params) => {
@@ -98,8 +122,30 @@ export const useListStore = create<TennisStore>()((set, get) => ({
   clearError: () => {
     set({ error: null })
   },
+
+  // 更新综合筛选项
+  updateFilterOptions: (payload: Record<string, any>) => {
+    const preFilterOptions = get()?.filterOptions || {}
+    const filterOptions = { ...preFilterOptions, ...payload }
+    const filterCount = Object.values(filterOptions).filter(Boolean).length
+    set({
+      filterOptions,
+      filterCount
+    })
+  },
+
+  // 清空综合筛选选项
+  clearFilterOptions: () => {
+    set({
+      filterOptions: defaultFilterOptions,
+      filterCount: 0
+    })
+  },
+
   // 更新store数据
   updateState: (payload: Record<string, any>) => {
+    const state = get();
+    console.log('Store: 更新数据:', state);
     set({
       ...(payload || {})
     })

From d84a67726fc4e72bf7c571453e7ad7e5749c1d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Sun, 24 Aug 2025 15:51:41 +0800
Subject: [PATCH 07/22] feat: detail suspend

---
 src/components/UploadCover/index.scss      |  0
 src/components/UploadCover/index.tsx       | 24 ++++++++++++++++++++++
 src/config/images.js                       |  2 ++
 src/static/publishBall/icon-arrow-left.svg |  3 +++
 src/static/publishBall/icon-logo-go!.svg   |  5 +++++
 5 files changed, 34 insertions(+)
 create mode 100644 src/components/UploadCover/index.scss
 create mode 100644 src/components/UploadCover/index.tsx
 create mode 100644 src/static/publishBall/icon-arrow-left.svg
 create mode 100644 src/static/publishBall/icon-logo-go!.svg

diff --git a/src/components/UploadCover/index.scss b/src/components/UploadCover/index.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/UploadCover/index.tsx b/src/components/UploadCover/index.tsx
new file mode 100644
index 0000000..426b037
--- /dev/null
+++ b/src/components/UploadCover/index.tsx
@@ -0,0 +1,24 @@
+import React, { useState } from 'react'
+import { Popup } from "@nutui/nutui-react-taro";
+
+import './index.scss'
+
+export default function UploadCover(props) {
+  const { value = [], onChange = () => {} } = props
+  const [visible, setVisible] = useState(false)
+
+  return (
+    <>
+      <Popup
+        visible={visible}
+        onClose={() => setVisible(false)}
+        round
+        closeable
+      >
+      <div className="upload-cover-popup" onClick={}>
+        <div className="upload-cover-popup-title">上传封面</div>
+      </div>
+    </>
+  );
+};
+
diff --git a/src/config/images.js b/src/config/images.js
index ab20192..cfaa79d 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -8,4 +8,6 @@ export default {
     ICON_COST: require('@/static/publishBall/icon-cost.svg'),
     ICON_TIPS: require('@/static/publishBall/icon-tips.svg'),
     ICON_ARROW_RIGHT: require('@/static/publishBall/icon-arrow-right.svg'),
+    ICON_ARROW_LEFT: require('@/static/publishBall/icon-arrow-left.svg'),
+    ICON_LOGO_GO: require('@/static/publishBall/icon-logo-go.svg'),
   }
\ No newline at end of file
diff --git a/src/static/publishBall/icon-arrow-left.svg b/src/static/publishBall/icon-arrow-left.svg
new file mode 100644
index 0000000..fca111b
--- /dev/null
+++ b/src/static/publishBall/icon-arrow-left.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 1L1 7L7 13" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/src/static/publishBall/icon-logo-go!.svg b/src/static/publishBall/icon-logo-go!.svg
new file mode 100644
index 0000000..468b5ff
--- /dev/null
+++ b/src/static/publishBall/icon-logo-go!.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.9106 10.4998L16.7487 6.92161C16.7208 6.30199 17.1953 5.79401 17.8708 5.79401C18.5462 5.79401 19.0319 6.30199 18.9984 6.92161L18.8197 10.4998C18.7862 11.0413 18.3787 11.3985 17.8652 11.3985C17.3404 11.3985 16.9329 11.019 16.9106 10.4998ZM16.7599 12.822C16.7599 12.2135 17.2623 11.8395 17.8763 11.8395C18.4848 11.8395 18.9816 12.2135 18.9816 12.822C18.9816 13.4361 18.4848 13.8101 17.8763 13.8101C17.2623 13.8101 16.7599 13.4361 16.7599 12.822Z" fill="white"/>
+<path d="M8.65674 10.3268V9.50059C8.65674 7.27329 9.93506 5.93914 12.1512 5.93914C14.3673 5.93914 15.6401 7.27887 15.6401 9.50059V10.3268C15.6401 12.5373 14.3673 13.8603 12.1512 13.8603C9.93506 13.8603 8.65674 12.5317 8.65674 10.3268ZM10.8617 9.48384V10.3212C10.8617 11.4432 11.3362 12.0907 12.1512 12.0907C12.9662 12.0907 13.4351 11.4432 13.4351 10.3212V9.48384C13.4351 8.36182 12.9662 7.7087 12.1512 7.7087C11.3362 7.7087 10.8617 8.36182 10.8617 9.48384Z" fill="white"/>
+<path d="M1 10.3323V9.41127C1 7.29562 2.32857 5.93914 4.45539 5.93914C5.2983 5.93914 6.07981 6.16243 6.6492 6.52527C7.20742 6.87137 7.56468 7.34586 7.56468 7.83151C7.56468 8.34507 7.20184 8.70233 6.68269 8.70233C6.4594 8.70233 6.27519 8.63535 6.1133 8.5237C5.66115 8.22226 5.30388 7.78127 4.62844 7.78127C3.67388 7.78127 3.20497 8.36182 3.20497 9.5285V10.3268C3.20497 11.4767 3.67388 12.0852 4.57261 12.0852C5.24248 12.0852 5.69464 11.6944 5.69464 11.1306V10.9743H5.35412C4.80148 10.9743 4.50005 10.7063 4.50005 10.2207C4.50005 9.73504 4.7959 9.48384 5.35412 9.48384H6.56546C7.40279 9.48384 7.76564 9.83552 7.76564 10.6338V10.9352C7.76564 12.7048 6.47057 13.8603 4.47772 13.8603C2.28949 13.8603 1 12.5373 1 10.3323Z" fill="white"/>
+</svg>
\ No newline at end of file

From 64001496631049e2ed4b089e5066ad09c053cad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Sun, 24 Aug 2025 16:10:00 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index/index.tsx | 18 +++++++++++++++---
 src/services/loginService.ts    | 19 ++++++++-----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/login/index/index.tsx b/src/pages/login/index/index.tsx
index 09951c0..29facb3 100644
--- a/src/pages/login/index/index.tsx
+++ b/src/pages/login/index/index.tsx
@@ -10,7 +10,7 @@ const LoginPage: React.FC = () => {
   const [show_terms_layer, set_show_terms_layer] = useState(false);
 
   // 微信授权登录
-  const handle_wechat_login = async () => {
+  const handle_wechat_login = async (e: any) => {
     if (!agree_terms) {
       set_show_terms_layer(true);
       Taro.showToast({
@@ -21,9 +21,20 @@ const LoginPage: React.FC = () => {
       return;
     }
 
+    // 检查是否获取到手机号
+    if (!e.detail || !e.detail.code) {
+      Taro.showToast({
+        title: '获取手机号失败，请重试',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+
     set_is_loading(true);
     try {
-      const response = await wechat_auth_login();
+      // 传递手机号code给登录服务
+      const response = await wechat_auth_login(e.detail.code);
       if (response.success) {
         save_login_state(response.token!, response.user_info!);
 
@@ -123,7 +134,8 @@ const LoginPage: React.FC = () => {
           {/* 微信快捷登录 */}
           <Button
             className={`login_button wechat_button ${is_loading ? 'loading' : ''}`}
-            onClick={handle_wechat_login}
+            openType="getPhoneNumber"
+            onGetPhoneNumber={handle_wechat_login}
             disabled={is_loading}
           >
             <View className="wechat_icon">
diff --git a/src/services/loginService.ts b/src/services/loginService.ts
index 54036ff..a95ca37 100644
--- a/src/services/loginService.ts
+++ b/src/services/loginService.ts
@@ -36,7 +36,7 @@ export interface VerifyCodeResponse {
 }
 
 // 微信授权登录
-export const wechat_auth_login = async (): Promise<LoginResponse> => {
+export const wechat_auth_login = async (phone_code?: string): Promise<LoginResponse> => {
   try {
     // 先进行微信登录获取code
     const login_result = await Taro.login();
@@ -48,15 +48,12 @@ export const wechat_auth_login = async (): Promise<LoginResponse> => {
       };
     }
 
-  
-    
-    // 使用 httpService 调用微信授权接口
-    const auth_response = await httpService.post('/user/wx_auth', {
-      code: login_result.code
+    // 使用 httpService 调用微信授权接口，传递手机号code
+    const auth_response = await httpService.post('user/wx_auth', {
+      code: login_result.code,
+      phone_code: phone_code // 传递手机号加密code
     });
 
-
-    
     if (auth_response.code === 0) {
       return {
         success: true,
@@ -89,7 +86,7 @@ export interface PhoneLoginParams {
 export const phone_auth_login = async (params: PhoneLoginParams): Promise<LoginResponse> => {
   try {
     // 使用 httpService 调用验证验证码接口
-    const verify_response = await httpService.post('/user/sms/verify', {
+    const verify_response = await httpService.post('user/sms/verify', {
       phone: params.phone,
       code: params.verification_code
     });
@@ -127,7 +124,7 @@ export const phone_auth_login = async (params: PhoneLoginParams): Promise<LoginR
 // 发送短信验证码
 export const send_sms_code = async (phone: string): Promise<SmsResponse> => {
   try {
-    const response = await httpService.post('/user/sms/send', {
+    const response = await httpService.post('user/sms/send', {
       phone: phone
     });
     
@@ -155,7 +152,7 @@ export const send_sms_code = async (phone: string): Promise<SmsResponse> => {
 // 验证短信验证码
 export const verify_sms_code = async (phone: string, code: string): Promise<VerifyCodeResponse> => {
   try {
-    const response = await httpService.post('/user/sms/verify', {
+    const response = await httpService.post('user/sms/verify', {
       phone: phone,
       code: code
     });

From 8cfe0ab0b02f71b2c7704cfab0ce1fb04cd7a882 Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sun, 24 Aug 2025 16:24:49 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bubble/BubbleItem.tsx        |  11 +-
 src/components/Bubble/README.md             | 208 -----------------
 src/components/Bubble/USAGE.md              | 211 ------------------
 src/components/Bubble/example.tsx           | 235 --------------------
 src/components/Bubble/index.tsx             |  30 +--
 src/components/CityFilter/example.tsx       |  18 --
 src/components/CityFilter/index.module.scss |  37 +--
 src/components/CityFilter/index.tsx         |  52 +++--
 src/components/ListItem/index.scss          |  55 +++--
 src/components/ListItem/index.tsx           | 103 +++++----
 src/components/Menu/example.tsx             |  18 --
 src/components/Menu/index.module.scss       |  40 +++-
 src/components/Menu/index.tsx               |  49 ++--
 src/components/Range/README.md              |  93 --------
 src/components/Range/example.tsx            |  85 -------
 src/components/Range/index.tsx              |  11 +-
 src/components/Range/simple-test.tsx        |  22 --
 src/components/Range/style-test.tsx         |  68 ------
 src/components/Range/test.tsx               |  35 ---
 src/components/SearchBar/index.tsx          |  11 +-
 src/components/Title/index.module.scss      |  13 +-
 src/components/Title/index.tsx              |   5 +-
 src/config/images.js                        |   6 +
 src/pages/list/FilterPopup.tsx              |  73 +++---
 src/pages/list/index.module.scss            |  14 +-
 src/pages/list/index.tsx                    | 180 ++++++++-------
 src/static/list/icon-arrow-down-white.svg   |   3 +
 src/static/list/icon-arrow-down.svg         |   3 +
 src/static/list/icon-list-right-arrow.svg   |   3 +
 src/static/list/icon-menu-item-selected.svg |   3 +
 src/static/list/icon-play.svg               |   5 +
 src/static/list/icon-site.svg               |   6 +
 src/store/listStore.ts                      | 112 +++++-----
 types/list/types.ts                         | 141 ++++++++++++
 34 files changed, 620 insertions(+), 1339 deletions(-)
 delete mode 100644 src/components/Bubble/README.md
 delete mode 100644 src/components/Bubble/USAGE.md
 delete mode 100644 src/components/Bubble/example.tsx
 delete mode 100644 src/components/CityFilter/example.tsx
 delete mode 100644 src/components/Menu/example.tsx
 delete mode 100644 src/components/Range/README.md
 delete mode 100644 src/components/Range/example.tsx
 delete mode 100644 src/components/Range/simple-test.tsx
 delete mode 100644 src/components/Range/style-test.tsx
 delete mode 100644 src/components/Range/test.tsx
 create mode 100644 src/static/list/icon-arrow-down-white.svg
 create mode 100644 src/static/list/icon-arrow-down.svg
 create mode 100644 src/static/list/icon-list-right-arrow.svg
 create mode 100644 src/static/list/icon-menu-item-selected.svg
 create mode 100644 src/static/list/icon-play.svg
 create mode 100644 src/static/list/icon-site.svg
 create mode 100644 types/list/types.ts

diff --git a/src/components/Bubble/BubbleItem.tsx b/src/components/Bubble/BubbleItem.tsx
index 0ede586..62ba0c8 100644
--- a/src/components/Bubble/BubbleItem.tsx
+++ b/src/components/Bubble/BubbleItem.tsx
@@ -1,16 +1,7 @@
 import React from 'react';
-import { BubbleOption } from './index';
+import { BubbleItemProps } from '../../../types/list/types';
 import styles from './bubbleItem.module.scss';
 
-export interface BubbleItemProps {
-  option: BubbleOption;
-  isSelected: boolean;
-  size: 'small' | 'medium' | 'large';
-  disabled: boolean;
-  onClick: (option: BubbleOption) => void;
-  itemClassName?: string;
-}
-
 const BubbleItem: React.FC<BubbleItemProps> = ({
   option,
   isSelected,
diff --git a/src/components/Bubble/README.md b/src/components/Bubble/README.md
deleted file mode 100644
index 90512d3..0000000
--- a/src/components/Bubble/README.md
+++ /dev/null
@@ -1,208 +0,0 @@
-# Bubble 通用气泡组件
-
-一个高度可配置的气泡选择器组件，支持任何内容的选择，包括但不限于时间、地点、标签、分类等。
-
-## 特性
-
-- 🎯 支持单选和多选模式
-- 📱 三种布局方式：水平、垂直、网格
-- 🎨 三种尺寸：小、中、大
-- ♿ 支持禁用状态和图标描述
-- 🔄 支持受控和非受控模式
-- 📱 响应式设计，自动适应不同屏幕
-- 🎨 可自定义样式和类名
-
-## 基本用法
-
-### 室内外选择示例（如UI图所示）
-
-```tsx
-import React, { useState } from 'react';
-import Bubble, { BubbleOption } from './index';
-
-const LocationSelector: React.FC = () => {
-  const [selectedLocation, setSelectedLocation] = useState<string>('');
-
-  const locationOptions: BubbleOption[] = [
-    { id: 1, label: '室内', value: 'indoor' },
-    { id: 2, label: '室外', value: 'outdoor' },
-    { id: 3, label: '半室外', value: 'semi-outdoor' }
-  ];
-
-  return (
-    <Bubble
-      options={locationOptions}
-      value={selectedLocation}
-      onChange={(value) => setSelectedLocation(value as string)}
-      layout="horizontal"
-      size="medium"
-    />
-  );
-};
-```
-
-### 时间选择器示例
-
-```tsx
-const TimeSelector: React.FC = () => {
-  const [selectedTime, setSelectedTime] = useState<string>('');
-
-  const timeOptions: BubbleOption[] = [
-    { id: 1, label: '晨间 6:00-10:00', value: 'morning' },
-    { id: 2, label: '上午 10:00-12:00', value: 'forenoon' },
-    { id: 3, label: '中午 12:00-14:00', value: 'noon' },
-    { id: 4, label: '下午 14:00-18:00', value: 'afternoon' },
-    { id: 5, label: '晚上 18:00-22:00', value: 'evening' },
-    { id: 6, label: '夜间 22:00-24:00', value: 'night' }
-  ];
-
-  return (
-    <Bubble
-      options={timeOptions}
-      value={selectedTime}
-      onChange={(value) => setSelectedTime(value as string)}
-      layout="grid"
-      columns={3}
-      size="medium"
-    />
-  );
-};
-```
-
-### 多选模式
-
-```tsx
-const MultiSelectExample: React.FC = () => {
-  const [selectedValues, setSelectedValues] = useState<string[]>([]);
-
-  const options: BubbleOption[] = [
-    { id: 1, label: '运动', value: 'sports' },
-    { id: 2, label: '音乐', value: 'music' },
-    { id: 3, label: '阅读', value: 'reading' },
-    { id: 4, label: '旅行', value: 'travel' }
-  ];
-
-  return (
-    <Bubble
-      options={options}
-      value={selectedValues}
-      onChange={(value) => setSelectedValues(value as string[])}
-      multiple={true}
-      layout="grid"
-      columns={2}
-      size="medium"
-    />
-  );
-};
-```
-
-### 带图标和描述
-
-```tsx
-const IconExample: React.FC = () => {
-  const [selectedValue, setSelectedValue] = useState<string>('');
-
-  const options: BubbleOption[] = [
-    { 
-      id: 1, 
-      label: '网球', 
-      value: 'tennis',
-      icon: '🎾',
-      description: '室内外均可'
-    },
-    { 
-      id: 2, 
-      label: '篮球', 
-      value: 'basketball',
-      icon: '🏀',
-      description: '室内场地'
-    }
-  ];
-
-  return (
-    <Bubble
-      options={options}
-      value={selectedValue}
-      onChange={(value) => setSelectedValue(value as string)}
-      layout="vertical"
-      size="large"
-    />
-  );
-};
-```
-
-## API
-
-### BubbleProps
-
-| 属性 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| options | `BubbleOption[]` | - | 选项数组 |
-| value | `string \| number \| (string \| number)[]` | - | 当前选中的值 |
-| onChange | `(value, option) => void` | - | 选择变化时的回调 |
-| multiple | `boolean` | `false` | 是否支持多选 |
-| layout | `'horizontal' \| 'vertical' \| 'grid'` | `'horizontal'` | 布局方式 |
-| columns | `number` | `3` | 网格布局的列数 |
-| size | `'small' \| 'medium' \| 'large'` | `'medium'` | 按钮尺寸 |
-| className | `string` | `''` | 自定义类名 |
-| style | `React.CSSProperties` | `{}` | 自定义样式 |
-| disabled | `boolean` | `false` | 是否禁用整个组件 |
-
-### BubbleOption
-
-| 属性 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| id | `string \| number` | - | 选项的唯一标识 |
-| label | `string` | - | 显示的文本 |
-| value | `string \| number` | - | 选项的值 |
-| disabled | `boolean` | `false` | 是否禁用 |
-| icon | `React.ReactNode` | - | 可选的图标 |
-| description | `string` | - | 可选的描述文本 |
-
-## 布局说明
-
-### 水平布局 (horizontal)
-- 适合选项较少的情况
-- 自动换行，响应式设计
-- 适合顶部导航、标签选择等
-
-### 垂直布局 (vertical)
-- 适合选项较多的情况
-- 每个选项占满一行
-- 适合侧边栏、设置页面等
-
-### 网格布局 (grid)
-- 适合选项较多且需要整齐排列的情况
-- 可自定义列数
-- 适合分类选择、时间选择等
-
-## 尺寸说明
-
-### 小尺寸 (small)
-- 适合紧凑的界面
-- 适合移动端或空间受限的场景
-
-### 中尺寸 (medium)
-- 默认尺寸，适合大多数场景
-- 平衡了可用性和美观性
-
-### 大尺寸 (large)
-- 适合需要突出显示的场景
-- 适合触摸设备或重要操作
-
-## 样式定制
-
-组件使用 SCSS 编写，可以通过以下方式自定义样式：
-
-1. 覆盖 CSS 变量
-2. 使用 `className` 和 `style` 属性
-3. 修改 SCSS 源文件
-
-## 注意事项
-
-- 在网格布局中，`columns` 属性控制列数，行数会根据选项数量自动计算
-- 多选模式下，`value` 应该是数组类型
-- 单选模式下，`value` 可以是字符串或数字类型
-- 组件会自动处理选中状态的样式变化
-- 支持图标和描述，让选项更加丰富
-- 响应式设计，自动适应不同屏幕尺寸
diff --git a/src/components/Bubble/USAGE.md b/src/components/Bubble/USAGE.md
deleted file mode 100644
index afd455f..0000000
--- a/src/components/Bubble/USAGE.md
+++ /dev/null
@@ -1,211 +0,0 @@
-# 如何使用 Bubble 通用气泡组件
-
-## 在其他组件中导入
-
-```tsx
-import Bubble, { BubbleOption } from '@/components/Bubble';
-```
-
-## 基本使用示例
-
-### 1. 室内外选择（如UI图所示）
-
-```tsx
-import React, { useState } from 'react';
-import Bubble, { BubbleOption } from '@/components/Bubble';
-
-const MyPage: React.FC = () => {
-  const [selectedLocation, setSelectedLocation] = useState<string>('');
-
-  const locationOptions: BubbleOption[] = [
-    { id: 1, label: '室内', value: 'indoor' },
-    { id: 2, label: '室外', value: 'outdoor' },
-    { id: 3, label: '半室外', value: 'semi-outdoor' }
-  ];
-
-  return (
-    <div>
-      <h2>选择场地类型</h2>
-      <Bubble
-        options={locationOptions}
-        value={selectedLocation}
-        onChange={(value) => setSelectedLocation(value as string)}
-        layout="horizontal"
-        size="medium"
-      />
-      <p>您选择的场地类型: {selectedLocation}</p>
-    </div>
-  );
-};
-```
-
-### 2. 时间选择器
-
-```tsx
-const [selectedTime, setSelectedTime] = useState<string>('');
-
-const timeOptions: BubbleOption[] = [
-  { id: 1, label: '晨间 6:00-10:00', value: 'morning' },
-  { id: 2, label: '上午 10:00-12:00', value: 'forenoon' },
-  { id: 3, label: '中午 12:00-14:00', value: 'noon' },
-  { id: 4, label: '下午 14:00-18:00', value: 'afternoon' },
-  { id: 5, label: '晚上 18:00-22:00', value: 'evening' },
-  { id: 6, label: '夜间 22:00-24:00', value: 'night' }
-];
-
-<Bubble
-  options={timeOptions}
-  value={selectedTime}
-  onChange={(value) => setSelectedTime(value as string)}
-  layout="grid"
-  columns={3}
-  size="medium"
-/>
-```
-
-### 3. 多选模式
-
-```tsx
-const [selectedValues, setSelectedValues] = useState<string[]>([]);
-
-const options: BubbleOption[] = [
-  { id: 1, label: '运动', value: 'sports' },
-  { id: 2, label: '音乐', value: 'music' },
-  { id: 3, label: '阅读', value: 'reading' },
-  { id: 4, label: '旅行', value: 'travel' }
-];
-
-<Bubble
-  options={options}
-  value={selectedValues}
-  onChange={(value) => setSelectedValues(value as string[])}
-  multiple={true}
-  layout="grid"
-  columns={2}
-  size="medium"
-/>
-```
-
-### 4. 带图标和描述
-
-```tsx
-const [selectedSport, setSelectedSport] = useState<string>('');
-
-const sportOptions: BubbleOption[] = [
-  { 
-    id: 1, 
-    label: '网球', 
-    value: 'tennis',
-    icon: '🎾',
-    description: '室内外均可'
-  },
-  { 
-    id: 2, 
-    label: '篮球', 
-    value: 'basketball',
-    icon: '🏀',
-    description: '室内场地'
-  }
-];
-
-<Bubble
-  options={sportOptions}
-  value={selectedSport}
-  onChange={(value) => setSelectedSport(value as string)}
-  layout="vertical"
-  size="large"
-/>
-```
-
-### 5. 不同布局方式
-
-```tsx
-// 水平布局 - 适合选项较少
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="horizontal"
-  size="medium"
-/>
-
-// 垂直布局 - 适合选项较多
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="vertical"
-  size="medium"
-/>
-
-// 网格布局 - 适合需要整齐排列
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="grid"
-  columns={3}
-  size="medium"
-/>
-```
-
-### 6. 不同尺寸
-
-```tsx
-// 小尺寸 - 适合紧凑界面
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="horizontal"
-  size="small"
-/>
-
-// 中尺寸 - 默认尺寸
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="horizontal"
-  size="medium"
-/>
-
-// 大尺寸 - 适合触摸设备
-<Bubble
-  options={options}
-  value={selectedValue}
-  onChange={handleChange}
-  layout="horizontal"
-  size="large"
-/>
-```
-
-## 组件特性
-
-- **通用性**: 不局限于特定功能，可用于任何选择场景
-- **灵活布局**: 支持水平、垂直、网格三种布局方式
-- **多尺寸支持**: 小、中、大三种尺寸适应不同场景
-- **丰富内容**: 支持图标和描述，让选项更加丰富
-- **响应式设计**: 自动适应不同屏幕尺寸
-- **状态管理**: 内置选中状态管理，支持单选和多选
-- **类型安全**: 完整的 TypeScript 类型定义
-- **可访问性**: 支持键盘导航和屏幕阅读器
-
-## 常见使用场景
-
-1. **场地选择**: 室内/室外/半室外
-2. **时间选择**: 时间段、日期范围
-3. **分类选择**: 兴趣爱好、技能标签
-4. **设置选项**: 主题、语言、通知设置
-5. **筛选条件**: 价格范围、评分、距离等
-6. **导航菜单**: 顶部导航、侧边栏菜单
-
-## 注意事项
-
-1. 确保传入的 `options` 数组不为空
-2. 多选模式下，`value` 应该是数组类型
-3. 单选模式下，`value` 可以是字符串或数字类型
-4. 组件会自动处理选中状态的样式变化
-5. 支持图标和描述，让选项更加丰富
-6. 响应式设计，自动适应不同屏幕尺寸
-7. 可以通过 `disabled` 属性禁用整个组件或单个选项
diff --git a/src/components/Bubble/example.tsx b/src/components/Bubble/example.tsx
deleted file mode 100644
index 0ebcdf8..0000000
--- a/src/components/Bubble/example.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import React, { useState } from 'react';
-import Bubble, { BubbleOption } from './index';
-
-// 室内外选择示例（如UI图所示）
-export const LocationSelector: React.FC = () => {
-  const [selectedLocation, setSelectedLocation] = useState<string>('');
-
-  const locationOptions: BubbleOption[] = [
-    { id: 1, label: '室内', value: 'indoor' },
-    { id: 2, label: '室外', value: 'outdoor' },
-    { id: 3, label: '半室外', value: 'semi-outdoor' }
-  ];
-
-  return (
-    <div>
-      <h3>选择场地类型</h3>
-      <Bubble
-        options={locationOptions}
-        value={selectedLocation}
-        onChange={(value) => setSelectedLocation(value as string)}
-        layout="horizontal"
-        size="small"
-      />
-      <p>当前选择: {selectedLocation || '未选择'}</p>
-    </div>
-  );
-};
-
-// 时间选择器示例
-export const TimeSelector: React.FC = () => {
-  const [selectedTime, setSelectedTime] = useState<string>('');
-
-  const timeOptions: BubbleOption[] = [
-    { id: 1, label: '晨间 6:00-10:00', value: 'morning' },
-    { id: 2, label: '上午 10:00-12:00', value: 'forenoon' },
-    { id: 3, label: '中午 12:00-14:00', value: 'noon' },
-    { id: 4, label: '下午 14:00-18:00', value: 'afternoon' },
-    { id: 5, label: '晚上 18:00-22:00', value: 'evening' },
-    { id: 6, label: '夜间 22:00-24:00', value: 'night' }
-  ];
-
-  return (
-    <div>
-      <h3>选择时间段</h3>
-      <Bubble
-        options={timeOptions}
-        value={selectedTime}
-        onChange={(value) => setSelectedTime(value as string)}
-        layout="grid"
-        size="small"
-        columns={3}
-      />
-      <p>当前选择: {selectedTime || '未选择'}</p>
-      <hr />
-      <h3>选择时间段</h3>
-      <Bubble
-        options={timeOptions}
-        value={selectedTime}
-        onChange={(value) => setSelectedTime(value as string)}
-        layout="grid"
-        columns={2}
-        size="small"
-      />
-      <p>当前选择: {selectedTime || '未选择'}</p>
-    </div>
-  );
-};
-
-// 多选示例
-export const MultiSelectExample: React.FC = () => {
-  const [selectedValues, setSelectedValues] = useState<string[]>([]);
-
-  const options: BubbleOption[] = [
-    { id: 1, label: '运动', value: 'sports' },
-    { id: 2, label: '音乐', value: 'music' },
-    { id: 3, label: '阅读', value: 'reading' },
-    { id: 4, label: '旅行', value: 'travel' },
-    { id: 5, label: '美食', value: 'food' },
-    { id: 6, label: '摄影', value: 'photography' }
-  ];
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h3>多选示例 - 兴趣爱好</h3>
-      <Bubble
-        options={options}
-        value={selectedValues}
-        onChange={(value) => setSelectedValues(value as string[])}
-        multiple={true}
-        layout="grid"
-        columns={3}
-        size="medium"
-      />
-      <p>当前选择: {selectedValues.join(', ') || '未选择'}</p>
-    </div>
-  );
-};
-
-// 带图标和描述的示例
-export const IconExample: React.FC = () => {
-  const [selectedValue, setSelectedValue] = useState<string>('');
-
-  const options: BubbleOption[] = [
-    { 
-      id: 1, 
-      label: '网球', 
-      value: 'tennis',
-      icon: '🎾',
-      description: '室内外均可'
-    },
-    { 
-      id: 2, 
-      label: '篮球', 
-      value: 'basketball',
-      icon: '🏀',
-      description: '室内场地'
-    },
-    { 
-      id: 3, 
-      label: '足球', 
-      value: 'football',
-      icon: '⚽',
-      description: '室外场地'
-    }
-  ];
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h3>带图标和描述的运动选择</h3>
-      <Bubble
-        options={options}
-        value={selectedValue}
-        onChange={(value) => setSelectedValue(value as string)}
-        layout="vertical"
-        size="large"
-      />
-      <p>当前选择: {selectedValue || '未选择'}</p>
-    </div>
-  );
-};
-
-// 带禁用状态的示例
-export const DisabledExample: React.FC = () => {
-  const [selectedValue, setSelectedValue] = useState<string>('');
-
-  const options: BubbleOption[] = [
-    { id: 1, label: '可用选项1', value: 'option1' },
-    { id: 2, label: '禁用选项2', value: 'option2', disabled: true },
-    { id: 3, label: '可用选项3', value: 'option3' },
-    { id: 4, label: '禁用选项4', value: 'option4', disabled: true }
-  ];
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h3>带禁用状态的示例</h3>
-      <Bubble
-        options={options}
-        value={selectedValue}
-        onChange={(value) => setSelectedValue(value as string)}
-        layout="grid"
-        columns={2}
-        size="medium"
-      />
-      <p>当前选择: {selectedValue || '未选择'}</p>
-    </div>
-  );
-};
-
-// 不同尺寸的示例
-export const SizeExample: React.FC = () => {
-  const [selectedSize, setSelectedSize] = useState<string>('');
-
-  const sizeOptions: BubbleOption[] = [
-    { id: 1, label: '小尺寸', value: 'small' },
-    { id: 2, label: '中尺寸', value: 'medium' },
-    { id: 3, label: '大尺寸', value: 'large' }
-  ];
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h3>不同尺寸的示例</h3>
-      
-      <h4>小尺寸</h4>
-      <Bubble
-        options={sizeOptions}
-        value={selectedSize}
-        onChange={(value) => setSelectedSize(value as string)}
-        layout="horizontal"
-        size="small"
-      />
-      
-      <h4>中尺寸</h4>
-      <Bubble
-        options={sizeOptions}
-        value={selectedSize}
-        onChange={(value) => setSelectedSize(value as string)}
-        layout="horizontal"
-        size="medium"
-      />
-      
-      <h4>大尺寸</h4>
-      <Bubble
-        options={sizeOptions}
-        value={selectedSize}
-        onChange={(value) => setSelectedSize(value as string)}
-        layout="horizontal"
-        size="large"
-      />
-      
-      <p>当前选择: {selectedSize || '未选择'}</p>
-    </div>
-  );
-};
-
-// 主示例组件
-export const BubbleExamples: React.FC = () => {
-  return (
-    <div>
-      <h1>Bubble 通用气泡组件示例</h1>
-      <LocationSelector />
-      <hr />
-      <TimeSelector />
-      <hr />
-      <MultiSelectExample />
-      <hr />
-      <IconExample />
-      <hr />
-      <DisabledExample />
-      <hr />
-      <SizeExample />
-    </div>
-  );
-};
-
-export default BubbleExamples;
diff --git a/src/components/Bubble/index.tsx b/src/components/Bubble/index.tsx
index 59af227..8f07166 100644
--- a/src/components/Bubble/index.tsx
+++ b/src/components/Bubble/index.tsx
@@ -1,34 +1,7 @@
 import React, { useState, useEffect } from "react";
 import styles from "./index.module.scss";
 import BubbleItem from "./BubbleItem";
-
-export interface BubbleOption {
-  id: string | number;
-  label: string;
-  value: string | number;
-  disabled?: boolean;
-  icon?: React.ReactNode;
-  description?: string;
-}
-
-export interface BubbleProps {
-  options: BubbleOption[];
-  value?: string | number | (string | number)[];
-  onChange?: (
-    name: string,
-    value: string | number | (string | number)[],
-    option: BubbleOption | BubbleOption[]
-  ) => void;
-  multiple?: boolean;
-  layout?: "horizontal" | "vertical" | "grid";
-  columns?: number;
-  size?: "small" | "medium" | "large";
-  className?: string;
-  itemClassName?: string;
-  style?: React.CSSProperties;
-  disabled?: boolean;
-  name: string;
-}
+import {BubbleProps} from '../../../types/list/types'
 
 const Bubble: React.FC<BubbleProps> = ({
   options,
@@ -79,6 +52,7 @@ const Bubble: React.FC<BubbleProps> = ({
         );
         onChange(name, newSelectedValues, selectedOptions);
       } else {
+        console.log('===111', name, option.value)
         onChange(name, option.value, option);
       }
     }
diff --git a/src/components/CityFilter/example.tsx b/src/components/CityFilter/example.tsx
deleted file mode 100644
index 022297a..0000000
--- a/src/components/CityFilter/example.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useState } from "react";
-import MenuComponent from "./index";
-
-export default function Example() {
-  const [value, setValue] = useState("a");
-  const options = [
-    { text: "默认排序", value: "a" },
-    { text: "好评排序", value: "b" },
-    { text: "销量排序", value: "c" },
-  ];
-  return (
-    <MenuComponent
-      options={options}
-      value={value}
-      onChange={(val) => setValue(val)}
-    />
-  );
-}
diff --git a/src/components/CityFilter/index.module.scss b/src/components/CityFilter/index.module.scss
index ec1ee63..dca674d 100644
--- a/src/components/CityFilter/index.module.scss
+++ b/src/components/CityFilter/index.module.scss
@@ -1,5 +1,15 @@
 .menuWrap {
   padding: 5px 20px 10px;
+  $height: 26px;
+
+  .menuIcon {
+    width: 16px;
+    height: 16px;
+
+    &.rotate {
+      transform: rotate(180deg);
+    }
+  }
 
   .menuItem {
     width: 100vw;
@@ -13,7 +23,7 @@
   }
 
   &.active {
-    .nut-menu-bar {
+    :global(.nut-menu-bar) {
       background-color: #000000;
       color: #ffffff;
     }
@@ -21,24 +31,23 @@
 
   :global(.nut-menu-bar) {
     color: #000000;
-    line-height: 1;
+    width: 66px;
+    height: $height;
+    border-radius: $height;
+    line-height: $height;
     box-shadow: unset;
-    min-height: 28px;
-    min-width: 80px;
-    border-radius: 28px;
     border: 1px solid #e5e5e5;
-    line-height: 28px;
     font-size: 14px;
-    width: max-content;
+    font-weight: 600;
+  }
 
-    .nut-menu-title {
-      color: inherit !important;
-      font-weight: 600;
-    }
+  :global(.nut-menu-title) {
+    color: inherit !important;
+    font-weight: 600;
+  }
 
-    .nut-menu-title-text {
-      padding-left: 0;
-    }
+  :global(.nut-menu-title-text) {
+    --nutui-menu-title-padding: 0 6px 0 0;
   }
 
   .positionWrap {
diff --git a/src/components/CityFilter/index.tsx b/src/components/CityFilter/index.tsx
index b50c8ca..9784915 100644
--- a/src/components/CityFilter/index.tsx
+++ b/src/components/CityFilter/index.tsx
@@ -1,28 +1,33 @@
 import { Menu } from "@nutui/nutui-react-taro";
 import styles from "./index.module.scss";
 import { useState, useRef } from "react";
-import Bubble, { BubbleOption } from "../Bubble";
+import Bubble from "../Bubble";
+import { Image } from "@tarojs/components";
+import img from "../../config/images";
+import {DistanceFilterProps} from '../../../types/list/types'
 
-interface IProps {
-  options: BubbleOption[];
-  value: string;
-  onChange: (value: string) => void;
-  wrapperClassName?: string;
-  itemClassName?: string;
-}
 
-const MenuComponent = (props: IProps) => {
-  const { value, onChange, wrapperClassName, itemClassName, options } = props;
+
+const MenuComponent = (props: DistanceFilterProps) => {
+  const { value, onChange, wrapperClassName, itemClassName, options, name } =
+    props;
   const [isChange, setIsChange] = useState(false);
+  const [iOpen, setIsOpen] = useState(false);
   const itemRef = useRef(null);
 
-  const handleChange = (value: string) => {
-    console.log("===value", value);
+  const handleChange = (name: string, value: string) => {
     setIsChange(true);
-    onChange && onChange(value);
+    onChange && onChange(name, value);
+    (itemRef.current as any)?.toggle(false);
   };
 
-  
+  const handleOpen = () => {
+    setIsOpen(true);
+  };
+
+  const handleClose = () => {
+    setIsOpen(false);
+  };
 
   return (
     <Menu
@@ -30,11 +35,25 @@ const MenuComponent = (props: IProps) => {
         isChange ? styles.active : ""
       }`}
       activeColor="#000"
+      onOpen={handleOpen}
+      onClose={handleClose}
+      icon={
+        <Image
+          className={`${styles.menuIcon} ${iOpen ? styles.rotate : ""}`}
+          src={isChange ? img.ICON_ARROW_DOWN_WHITE : img.ICON_ARROW_DOWN}
+        />
+      }
     >
       <Menu.Item
-        title="全城"
-        className={`${styles.menuItem} ${itemClassName ? itemClassName : ''}`}
+        title={value}
+        className={`${styles.menuItem} ${itemClassName ? itemClassName : ""}`}
         ref={itemRef}
+        icon={
+          <Image
+            className={styles.itemIcon}
+            src={img.ICON_MENU_ITEM_SELECTED}
+          />
+        }
       >
         <div className={styles.positionWrap}>
           <p className={styles.title}>当前位置</p>
@@ -49,6 +68,7 @@ const MenuComponent = (props: IProps) => {
             size="small"
             columns={4}
             itemClassName={styles.distanceBubbleItem}
+            name={name}
           />
         </div>
       </Menu.Item>
diff --git a/src/components/ListItem/index.scss b/src/components/ListItem/index.scss
index ded1507..3fc1920 100644
--- a/src/components/ListItem/index.scss
+++ b/src/components/ListItem/index.scss
@@ -10,26 +10,32 @@
   flex: 1;
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  gap: 6px;
+}
+
+.titleWrapper {
+  display: flex;
+  align-items: center;
 }
 
 .title {
   font-size: 16px;
   font-weight: 600;
-  color: #333333;
-  line-height: 1.4;
+  color: #000000;
+  line-height: 24px;
 }
 
-.date-time {
-  font-size: 14px;
-  color: #666666;
-  line-height: 1.3;
+.title-right-arrow {
+  width: 16px;
+  height: 16px;
 }
 
+.date-time,
 .location {
-  font-size: 14px;
-  color: #666666;
-  line-height: 1.3;
+  font-size: 12px;
+  color: #3C3C4399;
+  font-weight: 400;
+  line-height: 18px;
 }
 
 .bottom-info {
@@ -58,6 +64,8 @@
   border: 2px solid #ffffff;
   margin-left: -8px;
   overflow: hidden;
+  box-sizing: border-box;
+
   .avatar-image {
     width: 100%;
     height: 100%;
@@ -89,8 +97,10 @@
 }
 
 .tag {
-  padding: 3px;
-  border: 1px solid #f5f5f5;
+  box-sizing: border-box;
+  padding: 0 6px;
+  border: 0.5px solid #00000029;
+  height: 20px;
   border-radius: 20px;
   min-width: 38px;
   display: flex;
@@ -98,7 +108,7 @@
   justify-content: center;
   flex-shrink: 0;
   color: #000000;
-  font-size: 12px;
+  font-size: 11px;
 }
 
 .tag-text-max {
@@ -112,16 +122,20 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-basis: 100px;
+  flex-grow: 0;
+  flex-shrink: 0;
 
   .image-container {
     width: 100%;
     height: 100%;
-    padding: 2px;
-    background: #ffffff;
+    border: 1.5px solid #ffffff;
     border-radius: 10px;
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
     overflow: hidden;
     position: absolute;
+    box-sizing: border-box;
+
     .image {
       border-radius: 10px;
     }
@@ -132,7 +146,10 @@
   position: relative;
   width: 88px;
   height: 88px;
+
   .image-container {
+    width: 88px;
+    height: 88px;
     transform: rotate(-10deg);
   }
 }
@@ -151,13 +168,13 @@
 
     &:first-child {
       z-index: 2;
-      transform: rotate(-10deg);
+      transform: translateX(4px) rotate(-10deg);
     }
 
     &:last-child {
       right: 0;
       z-index: 1;
-      transform: rotate(10deg);
+      transform: translateX(-4px) rotate(10deg);
     }
   }
 }
@@ -177,7 +194,7 @@
       width: 55px;
       height: 55px;
       z-index: 3;
-      transform: rotate(-10deg);
+      transform: translateX(4px) rotate(-10deg);
     }
 
     &:nth-child(2) {
@@ -204,4 +221,4 @@
   width: 100%;
   height: 100%;
   object-fit: cover;
-}
+}
\ No newline at end of file
diff --git a/src/components/ListItem/index.tsx b/src/components/ListItem/index.tsx
index cc0f498..46a6539 100644
--- a/src/components/ListItem/index.tsx
+++ b/src/components/ListItem/index.tsx
@@ -1,16 +1,17 @@
-import { View, Text, Image } from '@tarojs/components'
-import './index.scss'
+import { View, Text, Image } from "@tarojs/components";
+import img from "../../config/images";
+import "./index.scss";
 
 interface ListItemProps {
-  title: string
-  dateTime: string
-  location: string
-  distance: string
-  registeredCount: number
-  maxCount: number
-  skillLevel: string
-  matchType: string
-  images: string[]
+  title: string;
+  dateTime: string;
+  location: string;
+  distance: string;
+  registeredCount: number;
+  maxCount: number;
+  skillLevel: string;
+  matchType: string;
+  images: string[];
 }
 
 const ListItem: React.FC<ListItemProps> = ({
@@ -22,22 +23,22 @@ const ListItem: React.FC<ListItemProps> = ({
   maxCount,
   skillLevel,
   matchType,
-  images
+  images,
 }) => {
   // 根据图片数量决定展示样式
   const renderImages = () => {
-    if (images.length === 0) return null
-    
+    if (images.length === 0) return null;
+
     if (images.length === 1) {
       return (
         <View className="single-image">
-          <View className="image-container"> 
+          <View className="image-container">
             <Image src={images[0]} className="image" mode="aspectFill" />
           </View>
         </View>
-      )
+      );
     }
-    
+
     if (images.length === 2) {
       return (
         <View className="double-image">
@@ -48,9 +49,9 @@ const ListItem: React.FC<ListItemProps> = ({
             <Image src={images[1]} className="image" mode="aspectFill" />
           </View>
         </View>
-      )
+      );
     }
-    
+
     // 3张或更多图片
     return (
       <View className="triple-image">
@@ -64,40 +65,54 @@ const ListItem: React.FC<ListItemProps> = ({
           <Image src={images[2]} className="image" mode="aspectFill" />
         </View>
       </View>
-    )
-  }
+    );
+  };
 
   return (
     <View className="list-item">
       {/* 左侧内容区域 */}
       <View className="content">
         {/* 标题 */}
-        <Text className="title">{title}</Text>
-        
+        <View className="titleWrapper">
+          <Text className="title">{title}</Text>
+          <Image
+            src={img.ICON_LIST_RIGHT_ARROW}
+            className="title-right-arrow"
+            mode="aspectFit"
+          />
+        </View>
+
         {/* 时间信息 */}
         <Text className="date-time">{dateTime}</Text>
-        
+
         {/* 地点和距离 */}
-        <Text className="location">{location}・{distance}</Text>
-        
+        <Text className="location">
+          {location}・{distance}
+        </Text>
+
         {/* 底部信息行：头像组、报名人数、技能等级、比赛类型 */}
         <View className="bottom-info">
           <View className="left-section">
             <View className="avatar-group">
-              {Array.from({ length: Math.min(registeredCount, 3) }).map((_, index) => (
-                <View key={index} className="avatar" >
-                  <Image
-                    className="avatar-image"
-                    src="https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center" className="avatar-image" mode="aspectFill" />
-                </View>
-              ))}
+              {Array.from({ length: Math.min(registeredCount, 3) }).map(
+                (_, index) => (
+                  <View key={index} className="avatar">
+                    <Image
+                      className="avatar-image"
+                      src="https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center"
+                      mode="aspectFill"
+                    />
+                  </View>
+                )
+              )}
             </View>
           </View>
-          
+
           <View className="tags">
-          <View className="tag">
+            <View className="tag">
               <Text className="tag-text">
-               报名人数 {registeredCount}/<Text className="tag-text-max">{maxCount}</Text>
+                报名人数 {registeredCount}/
+                <Text className="tag-text-max">{maxCount}</Text>
               </Text>
             </View>
             <View className="tag">
@@ -109,13 +124,11 @@ const ListItem: React.FC<ListItemProps> = ({
           </View>
         </View>
       </View>
-      
-      {/* 右侧图片区域 */}
-      <View className="image-section">
-        {renderImages()}
-      </View>
-    </View>
-  )
-}
 
-export default ListItem
\ No newline at end of file
+      {/* 右侧图片区域 */}
+      <View className="image-section">{renderImages()}</View>
+    </View>
+  );
+};
+
+export default ListItem;
diff --git a/src/components/Menu/example.tsx b/src/components/Menu/example.tsx
deleted file mode 100644
index 022297a..0000000
--- a/src/components/Menu/example.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useState } from "react";
-import MenuComponent from "./index";
-
-export default function Example() {
-  const [value, setValue] = useState("a");
-  const options = [
-    { text: "默认排序", value: "a" },
-    { text: "好评排序", value: "b" },
-    { text: "销量排序", value: "c" },
-  ];
-  return (
-    <MenuComponent
-      options={options}
-      value={value}
-      onChange={(val) => setValue(val)}
-    />
-  );
-}
diff --git a/src/components/Menu/index.module.scss b/src/components/Menu/index.module.scss
index 4bebabb..cf1df49 100644
--- a/src/components/Menu/index.module.scss
+++ b/src/components/Menu/index.module.scss
@@ -1,33 +1,46 @@
 .menuWrap {
   position: static;
   padding: 5px 20px 10px;
+  --nutui-menu-title-padding: 0 6px 0 0;
+  $height: 26px;
+
   .menuItem {
     width: 100vw;
     left: 0;
     border-bottom-left-radius: 30px;
     border-bottom-right-radius: 30px;
   }
+
+  .menuIcon {
+    width: 16px;
+    height: 16px;
+
+    &.rotate {
+      transform: rotate(180deg);
+    }
+  }
+
+  .itemIcon {
+    width: 20px;
+    height: 20px;
+  }
+
   &.active {
     :global(.nut-menu-bar) {
       background-color: #000000;
       color: #ffffff;
     }
   }
+
   :global(.nut-menu-bar) {
     color: #000000;
-    line-height: 1;
     box-shadow: unset;
-    min-height: 28px;
-    min-width: 94px;
-    border-radius: 28px;
+    border-radius: $height;
+    line-height: $height;
+    height: $height;
     border: 1px solid #e5e5e5;
-    line-height: 28px;
     font-size: 14px;
-    width: max-content;
-
-    .nut-menu-title-text {
-      padding-left: 0;
-    }
+    width: 94px;
   }
 
   :global(.nut-menu-title) {
@@ -35,13 +48,18 @@
     font-weight: 600;
   }
 
+  :global(.nut-menu-title-text) {
+    --nutui-menu-title-padding: 0 6px 0 4px;
+  }
+
   :global(.nut-menu-container-item) {
     color: #3c3c43;
     font-weight: 600;
     font-size: 14px;
   }
+
   :global(.nut-menu-container-item.active) {
     flex-direction: row-reverse;
     justify-content: space-between;
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
index 0f3d435..fd7b4db 100644
--- a/src/components/Menu/index.tsx
+++ b/src/components/Menu/index.tsx
@@ -1,34 +1,55 @@
 import { Menu } from "@nutui/nutui-react-taro";
-import styles from "./index.module.scss";
 import { useState } from "react";
+import { Image } from "@tarojs/components";
+import img from "../../config/images";
+import { MenuFilterProps } from "../../../types/list/types";
+import styles from "./index.module.scss";
 
-interface IProps {
-  options: { text: string; value: string }[];
-  value: string;
-  onChange: (value: string) => void;
-  wrapperClassName?: string;
-  itemClassName?: string;
-}
-
-const MenuComponent = (props: IProps) => {
-  const { options, value, onChange, wrapperClassName, itemClassName } = props;
+const MenuComponent = (props: MenuFilterProps) => {
+  const { options, value, onChange, wrapperClassName, itemClassName, name } =
+    props;
   const [isChange, setIsChange] = useState(false);
+  const [isOpen, setIsOpen] = useState(false);
 
-  const handleChange = (value: string) => {
+  const handleChange = (val: Record<string, string>) => {
     setIsChange(true);
-    onChange && onChange(value);
+    onChange && onChange(name, val.value);
+  };
+
+  const handleOpen = () => {
+    setIsOpen(true);
+  };
+
+  const handleClose = () => {
+    setIsOpen(false);
   };
 
   return (
     <Menu
-      className={`${styles.menuWrap} ${wrapperClassName} ${isChange ? styles.active : ""}`}
+      className={`${styles.menuWrap} ${wrapperClassName} ${
+        isChange ? styles.active : ""
+      }`}
       activeColor="#000"
+      onOpen={handleOpen}
+      onClose={handleClose}
+      icon={
+        <Image
+          className={`${styles.menuIcon} ${isOpen ? styles.rotate : ""}`}
+          src={isChange ? img.ICON_ARROW_DOWN_WHITE : img.ICON_ARROW_DOWN}
+        />
+      }
     >
       <Menu.Item
         className={`${styles.menuItem} ${itemClassName}`}
         options={options}
         defaultValue={value}
         onChange={handleChange}
+        icon={
+          <Image
+            className={styles.itemIcon}
+            src={img.ICON_MENU_ITEM_SELECTED}
+          />
+        }
       />
     </Menu>
   );
diff --git a/src/components/Range/README.md b/src/components/Range/README.md
deleted file mode 100644
index 5da1a01..0000000
--- a/src/components/Range/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# NtrpRange 范围选择器组件
-
-基于NutUI Range组件的双滑块范围选择器，通过CSS样式覆盖完全匹配设计稿，支持自定义范围、步长和回调函数。
-
-## 功能特性
-
-- 🎯 双滑块设计，支持选择范围区间
-- 🎨 精准还原设计稿的视觉效果
-- 📱 响应式设计，支持移动端
-- 🎮 流畅的拖拽交互体验
-- ⚙️ 可配置的最小值、最大值和步长
-- 🔒 支持禁用状态
-- 📊 实时值变化回调
-
-## 基本用法
-
-```tsx
-import NtrpRange from '@/components/Range';
-
-const MyComponent = () => {
-  const [value, setValue] = useState<[number, number]>([2.0, 4.0]);
-
-  return (
-    <NtrpRange
-      min={2.0}
-      max={4.0}
-      step={0.5}
-      value={value}
-      onChange={setValue}
-    />
-  );
-};
-```
-
-## 属性说明
-
-| 属性 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| `min` | `number` | `2.0` | 最小值 |
-| `max` | `number` | `4.0` | 最大值 |
-| `step` | `number` | `0.5` | 步长 |
-| `value` | `[number, number]` | `[min, max]` | 当前选择的范围值 |
-| `onChange` | `(value: [number, number]) => void` | - | 值变化时的回调函数 |
-| `disabled` | `boolean` | `false` | 是否禁用 |
-
-## 技术实现
-
-- 基于NutUI Range组件，确保拖拽功能的可靠性
-- 通过CSS样式覆盖，完全匹配设计稿视觉效果
-- TypeScript + React Hooks
-- 响应式设计，支持移动端
-
-## 设计规范
-
-组件严格按照设计稿实现，包含以下视觉元素：
-
-- **网球图标**: 黑色轮廓的网球图标
-- **标题**: "NTRP水平区间" 文字
-- **标签**: 左右两端的范围标签（如"2.0及以下"、"4.0及以上"）
-- **滑块轨道**: 圆角矩形容器，带有浅灰色边框和阴影
-- **滑块手柄**: 两个白色圆形手柄，带有黑色边框和阴影
-- **轨道填充**: 黑色填充条，显示当前选择的范围
-- **标记点**: 四个浅灰色圆点，均匀分布在轨道上
-
-## 样式定制
-
-组件使用 BEM 命名规范，可以通过 CSS 变量或覆盖样式来自定义外观：
-
-```scss
-.ntrp-range {
-  // 自定义样式
-  &__track {
-    background: #f5f5f5;
-    border-color: #d0d0d0;
-  }
-  
-  &__handle {
-    background: #007bff;
-    border-color: #0056b3;
-  }
-}
-```
-
-## 注意事项
-
-1. 确保 `min < max`，否则组件可能无法正常工作
-2. `step` 值应该能够整除 `max - min` 的差值
-3. 组件内部会确保左右滑块不会重叠，最小间距为 `step` 值
-4. 拖拽时会自动吸附到最近的步长值
-
-## 示例
-
-查看 `example.tsx` 文件获取更多使用示例。
diff --git a/src/components/Range/example.tsx b/src/components/Range/example.tsx
deleted file mode 100644
index a9b65df..0000000
--- a/src/components/Range/example.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * @Author: juguohong juguohong@flashhold.com
- * @Date: 2025-08-16 17:59:28
- * @LastEditors: juguohong juguohong@flashhold.com
- * @LastEditTime: 2025-08-16 23:48:25
- * @FilePath: /mini-programs/src/components/Range/example.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import React, { useState } from 'react';
-import NtrpRange from './index';
-
-const RangeExample: React.FC = () => {
-  const [ntrpRange, setNtrpRange] = useState<[number, number]>([2.0, 4.0]);
-  const [customRange, setCustomRange] = useState<[number, number]>([0, 100]);
-
-  const handleNtrpChange = (value: [number, number]) => {
-    console.log('NTRP range changed:', value);
-    setNtrpRange(value);
-  };
-
-  const handleCustomChange = (value: [number, number]) => {
-    console.log('Custom range changed:', value);
-    setCustomRange(value);
-  };
-
-  return (
-    <div >
-      <h1>Range 组件示例</h1>
-      
-      <div style={{ marginBottom: '40px' }}>
-        <h2>NTRP 水平区间选择器</h2>
-        <NtrpRange
-          min={1.0}
-          max={5.0}
-          step={0.5}
-          value={ntrpRange}
-          onChange={handleNtrpChange}
-        />
-        <div >
-          当前选择范围: {ntrpRange[0]} - {ntrpRange[1]}
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '40px' }}>
-        <h2>自定义范围选择器</h2>
-        <NtrpRange
-          min={0}
-          max={100}
-          step={10}
-          value={customRange}
-          onChange={handleCustomChange}
-        />
-        <div style={{ marginTop: '16px', fontSize: '14px', color: '#666' }}>
-          当前选择范围: {customRange[0]} - {customRange[1]}
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '40px' }}>
-        <h2>禁用状态</h2>
-        <NtrpRange
-          min={1}
-          max={10}
-          step={1}
-          value={[3, 7]}
-          disabled={true}
-        />
-        <div style={{ marginTop: '16px', fontSize: '14px', color: '#999' }}>
-          此选择器已被禁用
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '40px' }}>
-        <h2>测试说明</h2>
-        <div style={{ fontSize: '14px', color: '#666', lineHeight: '1.6' }}>
-          <p>1. 点击并拖拽左右滑块手柄</p>
-          <p>2. 查看控制台日志确认拖拽事件</p>
-          <p>3. 观察滑块位置和值的实时变化</p>
-          <p>4. 检查调试信息显示</p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default RangeExample;
diff --git a/src/components/Range/index.tsx b/src/components/Range/index.tsx
index e4d0f78..3275515 100644
--- a/src/components/Range/index.tsx
+++ b/src/components/Range/index.tsx
@@ -1,7 +1,9 @@
 import React, { useState, useEffect, useMemo } from "react";
+import { View, Text, Image } from "@tarojs/components";
 import { Range } from "@nutui/nutui-react-taro";
 import styles from "./index.module.scss";
 import TitleComponent from "../Title";
+import img from "../../config/images";
 
 interface RangeProps {
   min?: number;
@@ -25,9 +27,8 @@ const NtrpRange: React.FC<RangeProps> = ({
   name,
 }) => {
   const [currentValue, setCurrentValue] = useState<[number, number]>(value);
-console.log('===currentValue', currentValue)
+
   useEffect(() => {
-    console.log('===rrr', value)
     value && setCurrentValue(value);
   }, [JSON.stringify(value || [])]);
 
@@ -55,7 +56,10 @@ console.log('===currentValue', currentValue)
   return (
     <div className={`${styles.nutRange} ${className ? className : ""} `}>
       <div className={styles.nutRangeHeader}>
-        <TitleComponent title="NTRP水平区间" />
+        <TitleComponent
+          title="NTRP水平区间"
+          icon={<Image src={img.ICON_PLAY} />}
+        />
         <p className={styles.nutRangeHeaderContent}>{rangContent}</p>
       </div>
 
@@ -69,6 +73,7 @@ console.log('===currentValue', currentValue)
             step={step}
             value={currentValue}
             onEnd={handleChange}
+            onChange={handleChange}
             disabled={disabled}
             defaultValue={[min, max]}
             className={styles.rangeHandle}
diff --git a/src/components/Range/simple-test.tsx b/src/components/Range/simple-test.tsx
deleted file mode 100644
index f874642..0000000
--- a/src/components/Range/simple-test.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React, { useState } from 'react';
-import NtrpRange from './index';
-
-const SimpleTest: React.FC = () => {
-  const [value, setValue] = useState<[number, number]>([2.0, 4.0]);
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h2>简单测试</h2>
-      <NtrpRange
-        min={2.0}
-        max={4.0}
-        step={0.5}
-        value={value}
-        onChange={setValue}
-      />
-      <p>当前值: {value[0]} - {value[1]}</p>
-    </div>
-  );
-};
-
-export default SimpleTest;
diff --git a/src/components/Range/style-test.tsx b/src/components/Range/style-test.tsx
deleted file mode 100644
index 60134d0..0000000
--- a/src/components/Range/style-test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useState } from 'react';
-import NtrpRange from './index';
-
-const StyleTest: React.FC = () => {
-  const [value, setValue] = useState<[number, number]>([2.0, 4.0]);
-
-  return (
-    <div style={{ padding: '20px', maxWidth: '600px', margin: '0 auto' }}>
-      <h1>NtrpRange 样式测试</h1>
-      
-      <div style={{ marginBottom: '30px' }}>
-        <h2>NTRP 水平区间选择器</h2>
-        <NtrpRange
-          min={2.0}
-          max={4.0}
-          step={0.5}
-          value={value}
-          onChange={setValue}
-        />
-        <div style={{ marginTop: '16px', fontSize: '14px', color: '#666' }}>
-          当前选择范围: {value[0]} - {value[1]}
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '30px' }}>
-        <h2>自定义范围选择器</h2>
-        <NtrpRange
-          min={0}
-          max={100}
-          step={1}
-          value={[20, 80]}
-          onChange={(val) => console.log('Custom range:', val)}
-        />
-        <div style={{ marginTop: '16px', fontSize: '14px', color: '#666' }}>
-          固定范围: 20 - 80
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '30px' }}>
-        <h2>禁用状态</h2>
-        <NtrpRange
-          min={1}
-          max={10}
-          step={1}
-          value={[3, 7]}
-          disabled={true}
-        />
-        <div style={{ marginTop: '16px', fontSize: '14px', color: '#999' }}>
-          此选择器已被禁用
-        </div>
-      </div>
-
-      <div style={{ marginBottom: '30px' }}>
-        <h2>样式说明</h2>
-        <div style={{ fontSize: '14px', color: '#666', lineHeight: '1.6' }}>
-          <p>✅ 网球图标 + "NTRP水平区间"标题</p>
-          <p>✅ 左右范围标签（"2.0及以下"、"4.0及以上"）</p>
-          <p>✅ 圆角矩形轨道容器，带有边框和阴影</p>
-          <p>✅ 白色圆形滑块手柄，黑色边框和阴影</p>
-          <p>✅ 黑色轨道填充条</p>
-          <p>✅ 五个浅灰色标记点</p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default StyleTest;
diff --git a/src/components/Range/test.tsx b/src/components/Range/test.tsx
deleted file mode 100644
index 624772c..0000000
--- a/src/components/Range/test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { useState } from 'react';
-import NtrpRange from './index';
-
-const TestPage: React.FC = () => {
-  const [value, setValue] = useState<[number, number]>([2.0, 4.0]);
-
-  return (
-    <div style={{ padding: '20px' }}>
-      <h1>NtrpRange 组件测试</h1>
-      
-      <div style={{ marginBottom: '20px' }}>
-        <NtrpRange
-          min={2.0}
-          max={4.0}
-          step={0.5}
-          value={value}
-          onChange={setValue}
-        />
-      </div>
-      
-      <div style={{ fontSize: '14px', color: '#666' }}>
-        当前值: {value[0].toFixed(1)} - {value[1].toFixed(1)}
-      </div>
-      
-      <div style={{ marginTop: '20px', fontSize: '12px', color: '#999' }}>
-        <p>测试说明:</p>
-        <p>1. 拖拽左右滑块手柄</p>
-        <p>2. 观察值的变化</p>
-        <p>3. 检查样式是否正确</p>
-      </div>
-    </div>
-  );
-};
-
-export default TestPage;
diff --git a/src/components/SearchBar/index.tsx b/src/components/SearchBar/index.tsx
index 9d4827d..e4f1fab 100644
--- a/src/components/SearchBar/index.tsx
+++ b/src/components/SearchBar/index.tsx
@@ -7,10 +7,14 @@ interface IProps {
   handleFilterIcon: () => void;
   isSelect: boolean;
   filterCount: number;
+  onChange: (value: string) => void;
 }
 
 const SearchBarComponent = (props: IProps) => {
-  const { handleFilterIcon, isSelect, filterCount } = props;
+  const { handleFilterIcon, isSelect, filterCount, onChange } = props;
+  const handleChange = (value: string) => {
+    onChange && onChange(value);
+  };
   return (
     <>
       <SearchBar
@@ -30,11 +34,14 @@ const SearchBarComponent = (props: IProps) => {
               src={isSelect ? img.ICON_FILTER_SELECTED : img.ICON_FILTER}
               className={styles.filterIcon}
             />
-            <Text className={styles.filterCount}>{filterCount}</Text>
+            {isSelect && (
+              <Text className={styles.filterCount}>{filterCount}</Text>
+            )}
           </View>
         }
         className={styles.searchBar}
         placeholder="搜索上海的球局和场地"
+        onChange={handleChange}
       />
     </>
   );
diff --git a/src/components/Title/index.module.scss b/src/components/Title/index.module.scss
index a731606..c31b552 100644
--- a/src/components/Title/index.module.scss
+++ b/src/components/Title/index.module.scss
@@ -4,8 +4,19 @@
   margin-bottom: 10px;
   gap: 6px;
 }
+
+.icon {
+  width: 16px;
+  height: 16px;
+
+  image {
+    width: 100%;
+    height: 100%;
+  }
+}
+
 .title {
   font-weight: 600;
   font-size: 16px;
   line-height: 20px;
-}
+}
\ No newline at end of file
diff --git a/src/components/Title/index.tsx b/src/components/Title/index.tsx
index 2eca985..425c593 100644
--- a/src/components/Title/index.tsx
+++ b/src/components/Title/index.tsx
@@ -2,15 +2,16 @@ import styles from "./index.module.scss";
 interface IProps {
   title: string;
   className?: string;
+  icon?: JSX.Element;
 }
 const TitleComponent = (props: IProps) => {
-  const { title, className } = props;
+  const { title, className, icon } = props;
   return (
     <>
       <div
         className={`${styles.titleContainer} ${className ? className : ""} `}
       >
-        <div>图</div>
+        <div className={styles.icon}>{icon}</div>
         <h1 className={styles.title}>{title}</h1>
       </div>
     </>
diff --git a/src/config/images.js b/src/config/images.js
index 9effb04..2eaa335 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -11,4 +11,10 @@ export default {
     ICON_FILTER: require('@/static/list/icon-filter.svg'),
     ICON_FILTER_SELECTED: require('@/static/list/icon-filter-selected.svg'),
     ICON_SEARCH: require('@/static/list/icon-search.svg'),
+    ICON_PLAY: require('@/static/list/icon-play.svg'),
+    ICON_SITE: require('@/static/list/icon-site.svg'),
+    ICON_ARROW_DOWN: require('@/static/list/icon-arrow-down.svg'),
+    ICON_MENU_ITEM_SELECTED: require('@/static/list/icon-menu-item-selected.svg'),
+    ICON_ARROW_DOWN_WHITE: require('@/static/list/icon-arrow-down-white.svg'),
+    ICON_LIST_RIGHT_ARROW: require('@/static/list/icon-list-right-arrow.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index 5598593..9af9136 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -1,60 +1,52 @@
 import { Popup } from "@nutui/nutui-react-taro";
 import Range from "../../components/Range";
-import Bubble, { BubbleOption } from "../../components/Bubble";
+import Bubble from "../../components/Bubble";
 import styles from "./filterPopup.module.scss";
 import TitleComponent from "src/components/Title";
 import { Button } from "@nutui/nutui-react-taro";
+import { Image } from "@tarojs/components";
+import img from "../../config/images";
+import { useListStore } from "src/store/listStore";
+import {FilterPopupProps} from '../../../types/list/types'
 
-const timeOptions: BubbleOption[] = [
-  { id: 1, label: "晨间 6:00-10:00", value: "1" },
-  { id: 2, label: "上午 10:00-12:00", value: "2" },
-  { id: 3, label: "中午 12:00-14:00", value: "3" },
-  { id: 4, label: "下午 14:00-18:00", value: "4" },
-  { id: 5, label: "晚上 18:00-22:00", value: "5" },
-  { id: 6, label: "夜间 22:00-24:00", value: "6" },
-];
-
-const locationOptions: BubbleOption[] = [
-  { id: 1, label: "室内", value: "1" },
-  { id: 2, label: "室外", value: "2" },
-  { id: 3, label: "半室外", value: "3" },
-];
-
-interface IProps {
-  onCancel: () => void;
-  onConfirm: () => void;
-  onChange: (params: Record<string, string>) => void;
-  loading: boolean;
-  filterOptions: Record<string, any>;
-  onClear: () => void;
-}
-
-const FilterPopup = (props: IProps) => {
-  const { loading, onCancel, onConfirm, onChange, filterOptions, onClear } = props;
-  console.log('===filterOptions', filterOptions)
+const FilterPopup = (props: FilterPopupProps) => {
+  const {
+    loading,
+    onCancel,
+    onConfirm,
+    onChange,
+    filterOptions,
+    onClear,
+    visible,
+    onClose,
+  } = props;
+  
+  const store = useListStore() || {};
+  const { timeBubbleData, locationOptions } = store;
 
   const handleFilterChange = (name, value) => {
     onChange({ [name]: value });
   };
 
   const handleClearFilter = () => {
-    onClear()
+    onClear();
     onCancel();
-  }
+  };
 
   return (
     <>
       <Popup
-        visible={true}
         destroyOnClose
         position="top"
         round
-        closeOnOverlayClick={true}
+        visible={visible}
+        onClose={onClose}
+        // closeOnOverlayClick={true}
       >
         <div className={styles.filterPopupWrapper}>
           {/* 时间气泡选项 */}
           <Bubble
-            options={timeOptions}
+            options={timeBubbleData}
             value={filterOptions?.time}
             onChange={handleFilterChange}
             layout="grid"
@@ -71,12 +63,15 @@ const FilterPopup = (props: IProps) => {
             className={styles.filterPopupRange}
             onChange={handleFilterChange}
             value={filterOptions?.ntrp}
-            name='ntrp'
+            name="ntrp"
           />
 
           {/* 场次气泡选项 */}
           <div>
-            <TitleComponent title="场地类型" />
+            <TitleComponent
+              title="场地类型"
+              icon={<Image src={img.ICON_SITE} />}
+            />
             <Bubble
               options={locationOptions}
               value={filterOptions?.site}
@@ -84,12 +79,16 @@ const FilterPopup = (props: IProps) => {
               layout="grid"
               size="small"
               columns={3}
-              name='site'
+              name="site"
             />
           </div>
           {/* 按钮 */}
           <div className={styles.filterPopupBtnWrapper}>
-            <Button className={styles.btn} type="default" onClick={handleClearFilter}>
+            <Button
+              className={styles.btn}
+              type="default"
+              onClick={handleClearFilter}
+            >
               清空全部
             </Button>
             <Button
diff --git a/src/pages/list/index.module.scss b/src/pages/list/index.module.scss
index 1aa4c24..e1db7c9 100644
--- a/src/pages/list/index.module.scss
+++ b/src/pages/list/index.module.scss
@@ -1,15 +1,23 @@
 .listPage {
   background-color: #fafafa;
-  padding: 0 15px;
+
+  .listTopSearchWrapper {
+    padding: 0 15px;
+  }
 
   .listTopFilterWrapper {
     display: flex;
     align-items: center;
-    padding: 5px 0 10px;
+    margin-top: 5px;
+    margin-bottom: 10px;
     gap: 5px;
   }
 
+  .listContentWrapper {
+    padding: 0 5px;
+  }
+
   .menuFilter {
     padding: 0;
   }
-}
+}
\ No newline at end of file
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 0914616..75ce3e8 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -8,9 +8,12 @@ import styles from "./index.module.scss";
 import { useEffect } from "react";
 import Taro from "@tarojs/taro";
 import { useListStore } from "../../store/listStore";
+import { View } from "@tarojs/components";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
+  const store = useListStore() || {};
+  console.log("===store===", store);
   const {
     isShowFilterPopup,
     error,
@@ -24,7 +27,10 @@ const ListPage = () => {
     updateFilterOptions, // 更新筛选条件
     filterOptions,
     clearFilterOptions,
-  } = useListStore() || {};
+    distanceData,
+    quickFilterData,
+    distanceQuickFilter,
+  } = store;
 
   useEffect(() => {
     // 页面加载时获取数据
@@ -155,98 +161,110 @@ const ListPage = () => {
     updateState(params);
   };
 
-  const cityOptions: BubbleOption[] = [
-    { id: 0, label: "全城", value: "0" },
-    { id: 1, label: "3km", value: "3" },
-    { id: 2, label: "5km", value: "5" },
-    { id: 3, label: "10km", value: "10" },
-  ];
-
-  const options = [
-    { text: "默认排序", value: "a" },
-    { text: "好评排序", value: "b" },
-    { text: "销量排序", value: "c" },
-  ];
-
+  /**
+   * @description 更新筛选条件
+   * @param {Record<string, any>} params 筛选项
+   */
   const handleUpdateFilterOptions = (params: Record<string, any>) => {
     updateFilterOptions(params);
   };
 
+  const handleSearchChange = () => {};
+
+  // 距离筛选
+  const handleDistanceOrQuickChange = (name, value) => {
+    updateState({
+      distanceQuickFilter: {
+        ...distanceQuickFilter,
+        [name]: value,
+      },
+    });
+  };
+  console.log("===visible", isShowFilterPopup);
   return (
-    <div className={styles.listPage}>
-      <SearchBar
-        handleFilterIcon={toggleShowPopup}
-        isSelect={filterCount > 0}
-        filterCount={filterCount}
-      />
-      {/* 综合筛选 */}
-      {isShowFilterPopup && (
-        <div>
-          <FilterPopup
-            loading={loading}
-            onCancel={toggleShowPopup}
-            onConfirm={toggleShowPopup}
-            onChange={handleUpdateFilterOptions}
-            filterOptions={filterOptions}
-            onClear={clearFilterOptions}
+    <View className={styles.listPage}>
+      <View className={styles.listTopSearchWrapper}>
+        <SearchBar
+          handleFilterIcon={toggleShowPopup}
+          isSelect={filterCount > 0}
+          filterCount={filterCount}
+          onChange={handleSearchChange}
+        />
+        {/* 综合筛选 */}
+        {isShowFilterPopup && (
+          <div>
+            <FilterPopup
+              loading={loading}
+              onCancel={toggleShowPopup}
+              onConfirm={toggleShowPopup}
+              onChange={handleUpdateFilterOptions}
+              filterOptions={filterOptions}
+              onClear={clearFilterOptions}
+              visible={isShowFilterPopup}
+              onClose={toggleShowPopup}
+            />
+          </div>
+        )}
+        {/* 筛选 */}
+        <div className={styles.listTopFilterWrapper}>
+          {/* 全城筛选 */}
+          <CityFilter
+            options={distanceData}
+            value={distanceQuickFilter?.distance}
+            wrapperClassName={styles.menuFilter}
+            onChange={handleDistanceOrQuickChange}
+            name="distance"
+          />
+          {/* 智能排序 */}
+          <Menu
+            options={quickFilterData}
+            value={distanceQuickFilter?.quick}
+            onChange={handleDistanceOrQuickChange}
+            wrapperClassName={styles.menuFilter}
+            name="quick"
           />
         </div>
-      )}
-      {/* 筛选 */}
-      <div className={styles.listTopFilterWrapper}>
-        {/* 全城筛选 */}
-        <CityFilter
-          options={cityOptions}
-          value="1"
-          onChange={() => {}}
-          wrapperClassName={styles.menuFilter}
-        />
-        {/* 智能排序 */}
-        <Menu
-          options={options}
-          value="a"
-          onChange={() => {}}
-          wrapperClassName={styles.menuFilter}
-        />
-      </div>
+      </View>
 
-      {/* 列表内容 */}
-      <List>
-        {matches.map((match, index) => (
-          <ListItem key={match.id || index} {...match} />
-        ))}
-      </List>
+      <View className={styles.listContentWrapper}>
+        {/* 列表内容 */}
+        <List>
+          {matches.map((match, index) => (
+            <ListItem key={match.id || index} {...match} />
+          ))}
+        </List>
 
-      {/* 空状态 */}
-      {!loading && matches.length === 0 && (
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            justifyContent: "center",
-            alignItems: "center",
-            height: "200px",
-            fontSize: "14px",
-            color: "#999",
-          }}
-        >
-          <div style={{ marginBottom: "10px" }}>暂无比赛数据</div>
-          <button
-            onClick={() => fetchMatches()}
+        {/* 空状态 */}
+        {!loading && matches.length === 0 && (
+          <div
             style={{
-              padding: "8px 16px",
-              fontSize: "12px",
-              color: "#fff",
-              backgroundColor: "#007aff",
-              border: "none",
-              borderRadius: "4px",
+              display: "flex",
+              flexDirection: "column",
+              justifyContent: "center",
+              alignItems: "center",
+              height: "200px",
+              fontSize: "14px",
+              color: "#999",
             }}
           >
-            重新加载
-          </button>
-        </div>
-      )}
-    </div>
+            <div style={{ marginBottom: "10px" }}>暂无比赛数据</div>
+            <button
+              onClick={() => fetchMatches()}
+              style={{
+                padding: "8px 16px",
+                fontSize: "12px",
+                color: "#fff",
+                backgroundColor: "#007aff",
+                border: "none",
+                borderRadius: "4px",
+              }}
+            >
+              重新加载
+            </button>
+          </div>
+        )}
+      </View>
+    </View>
   );
 };
 
diff --git a/src/static/list/icon-arrow-down-white.svg b/src/static/list/icon-arrow-down-white.svg
new file mode 100644
index 0000000..31becd1
--- /dev/null
+++ b/src/static/list/icon-arrow-down-white.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 6L8 10L4 6" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/list/icon-arrow-down.svg b/src/static/list/icon-arrow-down.svg
new file mode 100644
index 0000000..1c6953d
--- /dev/null
+++ b/src/static/list/icon-arrow-down.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 10L8 6L12 10" stroke="black" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/list/icon-list-right-arrow.svg b/src/static/list/icon-list-right-arrow.svg
new file mode 100644
index 0000000..018fb2e
--- /dev/null
+++ b/src/static/list/icon-list-right-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.33325 4L10.3333 8L6.33325 12" stroke="#3C3C43" stroke-opacity="0.6" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/list/icon-menu-item-selected.svg b/src/static/list/icon-menu-item-selected.svg
new file mode 100644
index 0000000..c79702f
--- /dev/null
+++ b/src/static/list/icon-menu-item-selected.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.16663 9.99999L8.33329 14.1667L16.6666 5.83333" stroke="#333333" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/list/icon-play.svg b/src/static/list/icon-play.svg
new file mode 100644
index 0000000..715cd6b
--- /dev/null
+++ b/src/static/list/icon-play.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00016 14.6666C11.6821 14.6666 14.6668 11.6819 14.6668 7.99998C14.6668 4.31808 11.6821 1.33331 8.00016 1.33331C4.31826 1.33331 1.3335 4.31808 1.3335 7.99998C1.3335 11.6819 4.31826 14.6666 8.00016 14.6666Z" stroke="black" stroke-width="1.33333"/>
+<path d="M8.00016 1.33331C7.96653 3.55605 7.4208 5.22318 6.36296 6.33478C5.3051 7.44635 3.6286 8.00235 1.3335 8.00275" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.6561 8.33505C12.4852 8.18615 10.8265 8.65015 9.67983 9.72705C8.53313 10.804 7.97353 12.4505 8.00096 14.6666" stroke="black" stroke-width="1.33333" stroke-linecap="round"/>
+</svg>
diff --git a/src/static/list/icon-site.svg b/src/static/list/icon-site.svg
new file mode 100644
index 0000000..8e28d73
--- /dev/null
+++ b/src/static/list/icon-site.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6668 3.33331H1.3335V13.3333H14.6668V3.33331Z" stroke="black" stroke-width="1.33333" stroke-linejoin="round"/>
+<path d="M3.3335 5.33331L12.6668 11.3333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6667 5.33331L8 11.6666" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00016 5.33331L3.3335 11.3333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index f0b2cd7..9a5ec9a 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -1,53 +1,6 @@
 import { create } from 'zustand'
 import { getTennisMatches } from '../services/listApi'
-
-// 网球比赛数据接口
-export interface TennisMatch {
-  id: string
-  title: string
-  dateTime: string
-  location: string
-  distance: string
-  registeredCount: number
-  maxCount: number
-  skillLevel: string
-  matchType: string
-  images: string[]
-}
-
-// Store 状态接口
-interface ListState {
-  matches: TennisMatch[]
-  loading: boolean
-  error: string | null
-  lastRefreshTime: string | null
-  isShowFilterPopup: boolean
-  filterOptions: IFilterOptions
-  filterCount: number
-}
-
-interface IFilterOptions {
-  location: string
-  time: string
-  ntrp: [number, number]
-  site: string
-  wanfa: string
-}
-
-// Store Actions 接口
-interface ListActions {
-  fetchMatches: (params?: {
-    page?: number
-    pageSize?: number
-    location?: string
-    skillLevel?: string
-  }) => Promise<void>
-  refreshMatches: () => Promise<void>
-  clearError: () => void
-  updateState: (payload: Record<string, any>) => void
-  updateFilterOptions: (payload: Record<string, any>) => void
-  clearFilterOptions: () => void
-}
+import {ListActions, IFilterOptions, ListState } from '../../types/list/types'
 
 // 完整的 Store 类型
 type TennisStore = ListState & ListActions
@@ -60,6 +13,8 @@ const defaultFilterOptions: IFilterOptions = {
   wanfa: '', // 玩法
 };
 
+const defaultDistance = 'all'; // 默认距离
+
 // 创建 store
 export const useListStore = create<TennisStore>()((set, get) => ({
   // 初始状态
@@ -73,6 +28,43 @@ export const useListStore = create<TennisStore>()((set, get) => ({
   filterOptions: defaultFilterOptions,
   // 综合筛选 选择的筛选数量
   filterCount: 0,
+  // 距离筛选
+  distance: defaultDistance,
+  // 快捷筛选
+  quickFilter: 1, // 1: 默认 2: 好评 3: 销量
+  // 距离筛选数据
+  distanceData: [
+    { id: 0, label: "全城", value: "全城" },
+    { id: 1, label: "3km", value: "3km" },
+    { id: 2, label: "5km", value: "5km" },
+    { id: 3, label: "10km", value: "10km" },
+  ],
+  // 快捷筛选数据
+  quickFilterData:[
+    { text: "默认排序", value: "0" },
+    { text: "好评排序", value: "1" },
+    { text: "销量排序", value: "2" },
+  ],
+  // 距离筛选和快捷筛选
+  distanceQuickFilter: {
+    distance: '全城',
+    quick: '0',
+  },
+  // 时间气泡数据
+  timeBubbleData: [
+    { id: 1, label: "晨间 6:00-10:00", value: "1" },
+    { id: 2, label: "上午 10:00-12:00", value: "2" },
+    { id: 3, label: "中午 12:00-14:00", value: "3" },
+    { id: 4, label: "下午 14:00-18:00", value: "4" },
+    { id: 5, label: "晚上 18:00-22:00", value: "5" },
+    { id: 6, label: "夜间 22:00-24:00", value: "6" },
+  ],
+  // 场地类型数据
+  locationOptions: [
+    { id: 1, label: "室内", value: "1" },
+    { id: 2, label: "室外", value: "2" },
+    { id: 3, label: "半室外", value: "3" },
+  ],
 
   // 获取比赛数据
   fetchMatches: async (params) => {
@@ -87,12 +79,12 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       })
       console.log('Store: 成功获取网球比赛数据:', matches.length, '条')
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : '未知错误'
-      set({
-        error: errorMessage,
-        loading: false
-      })
-      console.error('Store: 获取网球比赛数据失败:', errorMessage)
+      // const errorMessage = error instanceof Error ? error.message : '未知错误'
+      // set({
+      //   error: errorMessage,
+      //   loading: false
+      // })
+      // console.error('Store: 获取网球比赛数据失败:', errorMessage)
     }
   },
 
@@ -109,12 +101,12 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       })
       console.log('Store: 成功刷新网球比赛数据:', matches.length, '条')
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : '未知错误'
-      set({
-        error: errorMessage,
-        loading: false
-      })
-      console.error('Store: 刷新网球比赛数据失败:', errorMessage)
+      // const errorMessage = error instanceof Error ? error.message : '未知错误'
+      // set({
+      //   error: errorMessage,
+      //   loading: false
+      // })
+      // console.error('Store: 刷新网球比赛数据失败:', errorMessage)
     }
   },
 
diff --git a/types/list/types.ts b/types/list/types.ts
new file mode 100644
index 0000000..2fc8d71
--- /dev/null
+++ b/types/list/types.ts
@@ -0,0 +1,141 @@
+// 网球比赛数据接口
+export interface TennisMatch {
+  id: string
+  title: string
+  dateTime: string
+  location: string
+  distance: string
+  registeredCount: number
+  maxCount: number
+  skillLevel: string
+  matchType: string
+  images: string[]
+}
+export interface IFilterOptions {
+  location: string
+  time: string
+  ntrp: [number, number]
+  site: string
+  wanfa: string
+}
+export interface ListState {
+  matches: TennisMatch[]
+  loading: boolean
+  error: string | null
+  lastRefreshTime: string | null
+  isShowFilterPopup: boolean
+  filterOptions: IFilterOptions
+  filterCount: number
+  distance: string | number
+  quickFilter: string | number
+  distanceData: any[]
+  quickFilterData: any[]
+  distanceQuickFilter: {
+    distance: string
+    quick: string
+  }
+  timeBubbleData: BubbleOption[]
+  locationOptions: BubbleOption[]
+}
+
+export interface ListState {
+  matches: TennisMatch[]
+  loading: boolean
+  error: string | null
+  lastRefreshTime: string | null
+  isShowFilterPopup: boolean
+  filterOptions: IFilterOptions
+  filterCount: number
+  distance: string | number
+  quickFilter: string | number
+  distanceData: any[]
+  quickFilterData: any[]
+  distanceQuickFilter: {
+    distance: string
+    quick: string
+  }
+}
+
+export interface ListActions {
+  fetchMatches: (params?: {
+    page?: number
+    pageSize?: number
+    location?: string
+    skillLevel?: string
+  }) => Promise<void>
+  refreshMatches: () => Promise<void>
+  clearError: () => void
+  updateState: (payload: Record<string, any>) => void
+  updateFilterOptions: (payload: Record<string, any>) => void
+  clearFilterOptions: () => void
+}
+
+// 快捷筛选
+export interface MenuFilterProps {
+  options: { text: string; value: string }[];
+  value: string;
+  onChange: (name: string, value: string) => void;
+  wrapperClassName?: string;
+  itemClassName?: string;
+  name: string;
+}
+
+// 距离筛选
+export interface DistanceFilterProps {
+  options: BubbleOption[];
+  value: string;
+  onChange: (name: string, value: string) => void;
+  wrapperClassName?: string;
+  itemClassName?: string;
+  name: string;
+}
+
+// bubble 组件
+export interface BubbleOption {
+  id: string | number;
+  label: string;
+  value: string | number;
+  disabled?: boolean;
+  icon?: React.ReactNode;
+  description?: string;
+}
+
+export interface BubbleProps {
+  options: BubbleOption[];
+  value?: string | number | (string | number)[];
+  onChange?: (
+    name: string,
+    value: string | number | (string | number)[],
+    option: BubbleOption | BubbleOption[]
+  ) => void;
+  multiple?: boolean;
+  layout?: "horizontal" | "vertical" | "grid";
+  columns?: number;
+  size?: "small" | "medium" | "large";
+  className?: string;
+  itemClassName?: string;
+  style?: React.CSSProperties;
+  disabled?: boolean;
+  name: string;
+}
+
+export interface BubbleItemProps {
+  option: BubbleOption;
+  isSelected: boolean;
+  size: 'small' | 'medium' | 'large';
+  disabled: boolean;
+  onClick: (option: BubbleOption) => void;
+  itemClassName?: string;
+}
+
+// FilterPopup 组件
+export interface FilterPopupProps {
+  onCancel: () => void;
+  onConfirm: () => void;
+  onChange: (params: Record<string, string>) => void;
+  loading: boolean;
+  filterOptions: Record<string, any>;
+  onClear: () => void;
+  visible: boolean;
+  onClose: () => void;
+}
\ No newline at end of file

From f4576bb099bca4c829fe48e623478de954368524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Sun, 24 Aug 2025 16:27:34 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index/index.scss |  2 +-
 src/pages/login/terms/index.scss | 11 ++++++++++-
 src/pages/login/terms/index.tsx  | 15 ++++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/login/index/index.scss b/src/pages/login/index/index.scss
index 6436bd6..6f2f2f0 100644
--- a/src/pages/login/index/index.scss
+++ b/src/pages/login/index/index.scss
@@ -370,7 +370,7 @@
       font-family: 'PingFang SC';
       font-weight: 400;
       font-size: 16px;
-      color: #07C160;
+      color: #000000;
       text-decoration: underline;
       cursor: pointer;
       transition: all 0.3s ease;
diff --git a/src/pages/login/terms/index.scss b/src/pages/login/terms/index.scss
index 61ac7c9..d163398 100644
--- a/src/pages/login/terms/index.scss
+++ b/src/pages/login/terms/index.scss
@@ -157,7 +157,7 @@
   position: relative;
   z-index: 5;
   flex: 1;
-   padding: 0px 24px ;
+ 
    box-sizing: border-box;
    
   overflow-y: auto;
@@ -181,6 +181,7 @@
     line-height: 1.43em;
     color: #000000;
     margin-bottom: 24px;
+   
   }
 
   // 条款详细内容
@@ -192,6 +193,14 @@
     color: #000000;
     margin-bottom: 40px;
     white-space: pre-line;
+    padding: 0px 24px ;
+    
+    .terms_first_line,
+    span.terms_first_line {
+      font-weight: 500;
+      display: block;
+      margin-bottom: 16px;
+    }
   }
 
   // 底部按钮
diff --git a/src/pages/login/terms/index.tsx b/src/pages/login/terms/index.tsx
index f5b94b5..591d437 100644
--- a/src/pages/login/terms/index.tsx
+++ b/src/pages/login/terms/index.tsx
@@ -24,7 +24,7 @@ const TermsPage: React.FC = () => {
       case 'terms':
         setPageTitle('条款和条件');
         setTermsTitle('《开场的条款和条件》');
-        setTermsContent(`欢迎使用本平台（以下简称"本平台"）发布与参与网球活动。为保障您的权益，请您务必仔细阅读并理解以下服务条款。
+        setTermsContent(`<span class="terms_first_line">欢迎使用本平台（以下简称"本平台"）发布与参与网球活动。为保障您的权益，请您务必仔细阅读并理解以下服务条款。</span>
 
 一、服务内容
 1. 本平台为用户提供活动发布、报名、聊天室沟通、活动提醒等服务。
@@ -70,7 +70,7 @@ const TermsPage: React.FC = () => {
       case 'binding':
         setPageTitle('微信号绑定协议');
         setTermsTitle('《开场与微信号绑定协议》');
-        setTermsContent(`欢迎使用本平台（以下简称"本平台"）的微信绑定服务。为保障您的权益，请您务必仔细阅读并理解以下协议内容。
+        setTermsContent(`<span class="terms_first_line">欢迎使用本平台（以下简称"本平台"）的微信绑定服务。为保障您的权益，请您务必仔细阅读并理解以下协议内容。</span>
 
 一、绑定服务说明
 1. 本平台提供微信账号绑定服务，用户可通过微信快捷登录方式使用平台功能。
@@ -115,7 +115,7 @@ const TermsPage: React.FC = () => {
       case 'privacy':
         setPageTitle('隐私权政策');
         setTermsTitle('《隐私权政策》');
-        setTermsContent(`本平台（以下简称"我们"）非常重视用户的隐私保护，本隐私权政策说明了我们如何收集、使用、存储和保护您的个人信息。
+        setTermsContent(`<span class="terms_first_line">本平台（以下简称"我们"）非常重视用户的隐私保护，本隐私权政策说明了我们如何收集、使用、存储和保护您的个人信息。</span>
 
 一、信息收集
 1. 注册信息：包括手机号码、微信账号、昵称、头像等基本信息。
@@ -190,13 +190,14 @@ const TermsPage: React.FC = () => {
         </View>
 
         {/* 条款详细内容 */}
-        <View className="terms_content">
-          {termsContent}
-        </View>
+        <View 
+          className="terms_content"
+          dangerouslySetInnerHTML={{ __html: termsContent }}
+        />
 
       </ScrollView>
 
-  
+
     </View>
   );
 };

From 58bacb3a47c750779d4f2adfc4d183401be15c04 Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sun, 24 Aug 2025 19:58:00 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=AA=A8=E6=9E=B6?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.ts                               |   2 +-
 src/app.config.ts                             |  12 +-
 src/components/GamePlayType/index.module.scss |   0
 src/components/GamePlayType/index.tsx         |  28 ++
 .../{ListItem => ListCard}/index.scss         |  28 +-
 .../{ListItem => ListCard}/index.tsx          |  64 ++---
 src/components/ListCardSkeleton/index.scss    | 264 ++++++++++++++++++
 src/components/ListCardSkeleton/index.tsx     |  57 ++++
 src/pages/list/FilterPopup.tsx                |   9 +-
 src/pages/list/index.tsx                      |  59 +---
 src/services/listApi.ts                       | 227 ++++++---------
 src/store/listStore.ts                        |  15 +-
 types/list/types.ts                           |  16 ++
 13 files changed, 532 insertions(+), 249 deletions(-)
 create mode 100644 src/components/GamePlayType/index.module.scss
 create mode 100644 src/components/GamePlayType/index.tsx
 rename src/components/{ListItem => ListCard}/index.scss (88%)
 rename src/components/{ListItem => ListCard}/index.tsx (66%)
 create mode 100644 src/components/ListCardSkeleton/index.scss
 create mode 100644 src/components/ListCardSkeleton/index.tsx

diff --git a/config/index.ts b/config/index.ts
index c77a458..9e16ab3 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -2,7 +2,7 @@ import { defineConfig, type UserConfigExport } from '@tarojs/cli'
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'
 import devConfig from './dev'
 import prodConfig from './prod'
-import vitePluginImp from 'vite-plugin-imp'
+// import vitePluginImp from 'vite-plugin-imp'
 import path from 'path'
 
 // https://taro-docs.jd.com/docs/next/config#defineconfig-辅助函数
diff --git a/src/app.config.ts b/src/app.config.ts
index 7c74bbe..7b1fcad 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -1,12 +1,12 @@
 export default defineAppConfig({
   pages: [
-    'pages/login/index/index',
-    'pages/login/verification/index',
-    'pages/login/terms/index',
-    // 'pages/publishBall/index',
+    'pages/list/index',
+    'pages/publishBall/index',
+    // 'pages/login/index/index',
+    // 'pages/login/verification/index',
+    // 'pages/login/terms/index',
     // 'pages/mapDisplay/index',
-    // 'pages/list/index',
-     'pages/index/index'
+    //  'pages/index/index'
   ],
   window: {
     backgroundTextStyle: 'light',
diff --git a/src/components/GamePlayType/index.module.scss b/src/components/GamePlayType/index.module.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/GamePlayType/index.tsx b/src/components/GamePlayType/index.tsx
new file mode 100644
index 0000000..d426d8b
--- /dev/null
+++ b/src/components/GamePlayType/index.tsx
@@ -0,0 +1,28 @@
+import PopupGameplay from "../../pages/publishBall/components/PopupGameplay";
+import { View, Text, Image } from "@tarojs/components";
+import TitleComponent from "@/components/Title";
+import img from "@/config/images";
+
+const GamePlayType = () => {
+  return (
+    <View>
+      <TitleComponent title="玩法" icon={<Image src={img.ICON_SITE} />} />
+      <PopupGameplay
+        onClose={() => {
+          console.log("onClose");
+        }}
+        onConfirm={() => {
+          console.log("onConfirm");
+        }}
+        visible={false}
+        options={[
+          { label: "不限", value: "不限" },
+          { label: "单打", value: "单打" },
+          { label: "双打", value: "双打" },
+          { label: "拉球", value: "拉球" },
+        ]}
+      />
+    </View>
+  );
+};
+export default GamePlayType;
diff --git a/src/components/ListItem/index.scss b/src/components/ListCard/index.scss
similarity index 88%
rename from src/components/ListItem/index.scss
rename to src/components/ListCard/index.scss
index 3fc1920..23ed8af 100644
--- a/src/components/ListItem/index.scss
+++ b/src/components/ListCard/index.scss
@@ -1,16 +1,17 @@
 .list-item {
   display: flex;
-  padding: 16px;
+  padding: 12px 15px;
   background: #ffffff;
   border-radius: 20px;
   border: 0.5px solid #f0f0f0;
+  justify-content: space-between;
 }
 
 .content {
   flex: 1;
   display: flex;
   flex-direction: column;
-  gap: 6px;
+  width: calc(100% - 122px);
 }
 
 .titleWrapper {
@@ -23,19 +24,40 @@
   font-weight: 600;
   color: #000000;
   line-height: 24px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .title-right-arrow {
   width: 16px;
   height: 16px;
+  flex-shrink: 0;
 }
 
-.date-time,
 .location {
+  display: flex;
+  align-items: center;
+}
+
+.location-position {
+  max-width: 66%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.location-text {
+  display: block;
+}
+
+.date-time {
   font-size: 12px;
   color: #3C3C4399;
   font-weight: 400;
   line-height: 18px;
+  margin-top: 6px;
+  margin-bottom: 4px;
 }
 
 .bottom-info {
diff --git a/src/components/ListItem/index.tsx b/src/components/ListCard/index.tsx
similarity index 66%
rename from src/components/ListItem/index.tsx
rename to src/components/ListCard/index.tsx
index 46a6539..56bbc42 100644
--- a/src/components/ListItem/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -1,20 +1,10 @@
 import { View, Text, Image } from "@tarojs/components";
 import img from "../../config/images";
+import { ListCardProps } from "../../../types/list/types";
 import "./index.scss";
+// import SkeletonComponent from "../../components/Skeleton";
 
-interface ListItemProps {
-  title: string;
-  dateTime: string;
-  location: string;
-  distance: string;
-  registeredCount: number;
-  maxCount: number;
-  skillLevel: string;
-  matchType: string;
-  images: string[];
-}
-
-const ListItem: React.FC<ListItemProps> = ({
+const ListCard: React.FC<ListCardProps> = ({
   title,
   dateTime,
   location,
@@ -24,7 +14,12 @@ const ListItem: React.FC<ListItemProps> = ({
   skillLevel,
   matchType,
   images,
+  shinei,
 }) => {
+  const renderItemImage = (src: string) => {
+    return <Image src={src} className="image" mode="aspectFill" />;
+  };
+
   // 根据图片数量决定展示样式
   const renderImages = () => {
     if (images.length === 0) return null;
@@ -33,7 +28,8 @@ const ListItem: React.FC<ListItemProps> = ({
       return (
         <View className="single-image">
           <View className="image-container">
-            <Image src={images[0]} className="image" mode="aspectFill" />
+            {/* <Image src={images[0]} className="image" mode="aspectFill" /> */}
+            {renderItemImage(images[0])}
           </View>
         </View>
       );
@@ -43,10 +39,12 @@ const ListItem: React.FC<ListItemProps> = ({
       return (
         <View className="double-image">
           <View className="image-container">
-            <Image src={images[0]} className="image" mode="aspectFill" />
+            {/* <Image src={images[0]} className="image" mode="aspectFill" /> */}
+            {renderItemImage(images[0])}
           </View>
           <View className="image-container">
-            <Image src={images[1]} className="image" mode="aspectFill" />
+            {/* <Image src={images[1]} className="image" mode="aspectFill" /> */}
+            {renderItemImage(images[1])}
           </View>
         </View>
       );
@@ -55,19 +53,13 @@ const ListItem: React.FC<ListItemProps> = ({
     // 3张或更多图片
     return (
       <View className="triple-image">
-        <View className="image-container">
-          <Image src={images[0]} className="image" mode="aspectFill" />
-        </View>
-        <View className="image-container">
-          <Image src={images[1]} className="image" mode="aspectFill" />
-        </View>
-        <View className="image-container">
-          <Image src={images[2]} className="image" mode="aspectFill" />
-        </View>
+        <View className="image-container">{renderItemImage(images[0])}</View>
+        <View className="image-container">{renderItemImage(images[1])}</View>
+        <View className="image-container">{renderItemImage(images[2])}</View>
       </View>
     );
   };
-
+  console.log("===ttt", !title);
   return (
     <View className="list-item">
       {/* 左侧内容区域 */}
@@ -83,12 +75,20 @@ const ListItem: React.FC<ListItemProps> = ({
         </View>
 
         {/* 时间信息 */}
-        <Text className="date-time">{dateTime}</Text>
 
-        {/* 地点和距离 */}
-        <Text className="location">
-          {location}・{distance}
-        </Text>
+        <View className="date-time">
+          <Text>{dateTime}</Text>
+        </View>
+
+        {/* 地点,室内外,距离 */}
+
+        <View className="location">
+          <Text className="location-text location-position">{location}</Text>
+          <Text className="location-text location-time-distance">
+            {shinei && `・${shinei}`}
+            {distance && `・${distance}`}
+          </Text>
+        </View>
 
         {/* 底部信息行：头像组、报名人数、技能等级、比赛类型 */}
         <View className="bottom-info">
@@ -131,4 +131,4 @@ const ListItem: React.FC<ListItemProps> = ({
   );
 };
 
-export default ListItem;
+export default ListCard;
diff --git a/src/components/ListCardSkeleton/index.scss b/src/components/ListCardSkeleton/index.scss
new file mode 100644
index 0000000..e642055
--- /dev/null
+++ b/src/components/ListCardSkeleton/index.scss
@@ -0,0 +1,264 @@
+.list-item {
+  display: flex;
+  padding: 12px 15px;
+  background: #ffffff;
+  border-radius: 20px;
+  border: 0.5px solid #f0f0f0;
+  justify-content: space-between;
+  --nutui-skeleton-line-height: 24px;
+  --nutui-skeleton-line-border-radius: 24px;
+
+  .nut-skeleton-block {
+    margin: 0;
+  }
+}
+
+.content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  width: calc(100% - 122px);
+}
+
+.titleWrapper {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #000000;
+  line-height: 24px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.title-right-arrow {
+  width: 16px;
+  height: 16px;
+  flex-shrink: 0;
+}
+
+.location {
+  display: flex;
+  align-items: center;
+}
+
+.location-position {
+  max-width: 66%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.location-text {
+  display: block;
+}
+
+.date-time {
+  font-size: 12px;
+  color: #3C3C4399;
+  font-weight: 400;
+  line-height: 18px;
+  margin-top: 6px;
+  margin-bottom: 4px;
+}
+
+.bottom-info {
+  display: flex;
+  align-items: center;
+  margin-top: 4px;
+  column-gap: 4px;
+}
+
+.left-section {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.avatar-group {
+  display: flex;
+  align-items: center;
+}
+
+.avatar {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background: #e0e0e0;
+  border: 2px solid #ffffff;
+  margin-left: -8px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  .avatar-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
+  &:first-child {
+    margin-left: 0;
+    z-index: 3;
+  }
+
+  &:nth-child(2) {
+    z-index: 2;
+  }
+
+  &:nth-child(3) {
+    z-index: 1;
+  }
+}
+
+.registration-text {
+  font-size: 12px;
+  color: #999999;
+}
+
+.tags {
+  display: flex;
+  gap: 4px;
+}
+
+.tag {
+  box-sizing: border-box;
+  padding: 0 6px;
+  border: 0.5px solid #00000029;
+  height: 20px;
+  border-radius: 20px;
+  min-width: 38px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  color: #000000;
+  font-size: 11px;
+}
+
+.tag-text-max {
+  color: #666666;
+}
+
+.image-section {
+  width: 100px;
+  height: 100px;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-basis: 100px;
+  flex-grow: 0;
+  flex-shrink: 0;
+
+  .image-container {
+    width: 100%;
+    height: 100%;
+    border: 1.5px solid #ffffff;
+    border-radius: 10px;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
+    overflow: hidden;
+    position: absolute;
+    box-sizing: border-box;
+
+    .nut-skeleton,
+    .nut-skeleton-content,
+    .nut-skeleton-block {
+      width: 100%;
+      height: 100%;
+    }
+
+    .nut-skeleton-block {
+      margin: 0;
+      border-radius: unset;
+    }
+
+    .image {
+      border-radius: 10px;
+    }
+  }
+}
+
+.single-image {
+  position: relative;
+  width: 88px;
+  height: 88px;
+
+  .image-container {
+    width: 88px;
+    height: 88px;
+    transform: rotate(-10deg);
+  }
+}
+
+.double-image {
+  width: 100%;
+  height: 100%;
+  position: relative;
+
+  .image-container {
+    width: 60%;
+    height: 60%;
+    position: absolute;
+    overflow: hidden;
+    top: 20%;
+
+    &:first-child {
+      z-index: 2;
+      transform: translateX(4px) rotate(-10deg);
+    }
+
+    &:last-child {
+      right: 0;
+      z-index: 1;
+      transform: translateX(-4px) rotate(10deg);
+    }
+  }
+}
+
+.triple-image {
+  width: 100%;
+  height: 100%;
+  position: relative;
+
+  .image-container {
+    position: absolute;
+    overflow: hidden;
+
+    &:nth-child(1) {
+      bottom: 0;
+      left: 0;
+      width: 55px;
+      height: 55px;
+      z-index: 3;
+      transform: translateX(4px) rotate(-10deg);
+    }
+
+    &:nth-child(2) {
+      bottom: 10px;
+      right: 0;
+      width: 55px;
+      height: 55px;
+      z-index: 2;
+      transform: rotate(3deg);
+    }
+
+    &:nth-child(3) {
+      top: 5%;
+      left: 50%;
+      width: 100rpx;
+      height: 100rpx;
+      z-index: 1;
+      transform: translateX(-50%);
+    }
+  }
+}
+
+.image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
\ No newline at end of file
diff --git a/src/components/ListCardSkeleton/index.tsx b/src/components/ListCardSkeleton/index.tsx
new file mode 100644
index 0000000..d19bf56
--- /dev/null
+++ b/src/components/ListCardSkeleton/index.tsx
@@ -0,0 +1,57 @@
+import { View } from "@tarojs/components";
+import { Skeleton } from "@nutui/nutui-react-taro";
+import "./index.scss";
+
+const ListCard = () => {
+  return (
+    <View className="list-item">
+      {/* 左侧内容区域 */}
+      <View className="content">
+        {/* 标题 */}
+        <View className="titleWrapper">
+          <Skeleton visible={false} style={{ width: "180px" }} />
+        </View>
+
+        {/* 时间信息 */}
+
+        <View className="date-time">
+          <Skeleton visible={false} style={{ width: "88px", }} />
+        </View>
+
+        {/* 地点,室内外,距离 */}
+
+        <View className="location">
+        <Skeleton visible={false} style={{ width: "60px", }} />
+        </View>
+
+        {/* 底部信息行：头像组、报名人数、技能等级、比赛类型 */}
+        <View className="bottom-info">
+          <View className="left-section">
+            <View className="avatar-group">
+              {Array.from({ length: 3 }).map((_, index) => (
+                <View key={index} className="avatar">
+                  <Skeleton visible={false} style={{ width: "20px", height: '0' }} />
+                </View>
+              ))}
+            </View>
+          </View>
+
+          <View className="tags">
+            <Skeleton visible={false} style={{ width: "64px" }} />
+          </View>
+        </View>
+      </View>
+
+      {/* 右侧图片区域 */}
+      <View className="image-section">
+        <View className="single-image">
+          <View className="image-container">
+            <Skeleton visible={false} />
+          </View>
+        </View>
+      </View>
+    </View>
+  );
+};
+
+export default ListCard;
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index 9af9136..8beea3a 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -2,12 +2,13 @@ import { Popup } from "@nutui/nutui-react-taro";
 import Range from "../../components/Range";
 import Bubble from "../../components/Bubble";
 import styles from "./filterPopup.module.scss";
-import TitleComponent from "src/components/Title";
+import TitleComponent from "@/components/Title";
 import { Button } from "@nutui/nutui-react-taro";
 import { Image } from "@tarojs/components";
 import img from "../../config/images";
 import { useListStore } from "src/store/listStore";
-import {FilterPopupProps} from '../../../types/list/types'
+import { FilterPopupProps } from "../../../types/list/types";
+import GamePlayType from "@/components/GamePlayType";
 
 const FilterPopup = (props: FilterPopupProps) => {
   const {
@@ -20,7 +21,7 @@ const FilterPopup = (props: FilterPopupProps) => {
     visible,
     onClose,
   } = props;
-  
+
   const store = useListStore() || {};
   const { timeBubbleData, locationOptions } = store;
 
@@ -82,6 +83,8 @@ const FilterPopup = (props: FilterPopupProps) => {
               name="site"
             />
           </div>
+          {/* 玩法 */}
+          <GamePlayType />
           {/* 按钮 */}
           <div className={styles.filterPopupBtnWrapper}>
             <Button
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 448943e..9d5a251 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -1,4 +1,5 @@
-import ListItem from "../../components/ListItem";
+import ListCard from "../../components/ListCard";
+import ListCardSkeleton from "../../components/ListCardSkeleton";
 import List from "../../components/List";
 import Menu from "../../components/Menu";
 import CityFilter from "../../components/CityFilter";
@@ -9,7 +10,6 @@ import { useEffect } from "react";
 import Taro from "@tarojs/taro";
 import { useListStore } from "../../store/listStore";
 import { View } from "@tarojs/components";
-import "./index.scss";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
@@ -82,21 +82,6 @@ const ListPage = () => {
     }
   }, [error, clearError]);
 
-  // 格式化时间显示
-  const formatRefreshTime = (timeString: string | null) => {
-    if (!timeString) return "";
-    const date = new Date(timeString);
-    const now = new Date();
-    const diff = now.getTime() - date.getTime();
-    const minutes = Math.floor(diff / 60000);
-
-    if (minutes < 1) return "刚刚";
-    if (minutes < 60) return `${minutes}分钟前`;
-    const hours = Math.floor(minutes / 60);
-    if (hours < 24) return `${hours}小时前`;
-    return date.toLocaleDateString();
-  };
-
   // 加载状态显示
   if (loading && matches.length === 0) {
     return (
@@ -230,40 +215,18 @@ const ListPage = () => {
       <View className={styles.listContentWrapper}>
         {/* 列表内容 */}
         <List>
-          {matches.map((match, index) => (
-            <ListItem key={match.id || index} {...match} />
-          ))}
+          {!loading &&
+            matches.length > 0 &&
+            matches.map((match, index) => (
+              <ListCard key={match.id || index} {...match} />
+            ))}
         </List>
 
         {/* 空状态 */}
-        {!loading && matches.length === 0 && (
-          <div
-            style={{
-              display: "flex",
-              flexDirection: "column",
-              justifyContent: "center",
-              alignItems: "center",
-              height: "200px",
-              fontSize: "14px",
-              color: "#999",
-            }}
-          >
-            <div style={{ marginBottom: "10px" }}>暂无比赛数据</div>
-            <button
-              onClick={() => fetchMatches()}
-              style={{
-                padding: "8px 16px",
-                fontSize: "12px",
-                color: "#fff",
-                backgroundColor: "#007aff",
-                border: "none",
-                borderRadius: "4px",
-              }}
-            >
-              重新加载
-            </button>
-          </div>
-        )}
+        {loading &&
+          new Array(10).fill(0).map(() => {
+            return <ListCardSkeleton />;
+          })}
       </View>
     </View>
   );
diff --git a/src/services/listApi.ts b/src/services/listApi.ts
index a937558..77ebd65 100644
--- a/src/services/listApi.ts
+++ b/src/services/listApi.ts
@@ -1,93 +1,85 @@
-import { TennisMatch } from '../store/listStore'
+import { TennisMatch } from "../store/listStore";
 
 // 模拟网络延迟
-const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 // 模拟API响应格式
 interface ApiResponse<T> {
-  code: number
-  message: string
-  data: T
-  timestamp: number
+  code: number;
+  message: string;
+  data: T;
+  timestamp: number;
 }
 
-
 // 模拟网球比赛数据
 const mockTennisMatches: TennisMatch[] = [
   {
-    id: '1',
-    title: '周一晚场浦东新区单打约球',
-    dateTime: '明天(周五)下午5点 2小时',
-    location: '仁恒河滨花园网球场・室外',
-    distance: '3.5km',
+    id: "1",
+    title: "周一晚场浦东新区单打约球",
+    dateTime: "明天(周五)下午5点 2小时",
+    location: "仁恒河滨花园网球场",
+    distance: "3.5km",
+    shinei: "室内",
     registeredCount: 3,
     maxCount: 4,
-    skillLevel: '2.0 至 2.5',
-    matchType: '双打',
+    skillLevel: "2.0 至 2.5",
+    matchType: "双打",
     images: [
-      'https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center',
-      'https://images.unsplash.com/photo-1571019613454-1cb2f99b2d8b?w=200&h=200&fit=crop&crop=center',
-      'https://images.unsplash.com/photo-1551698618-1dfe5d97d256?w=200&h=200&fit=crop&crop=center'
-    ]
+      "https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center",
+      "https://images.unsplash.com/photo-1571019613454-1cb2f99b2d8b?w=200&h=200&fit=crop&crop=center",
+      "https://images.unsplash.com/photo-1551698618-1dfe5d97d256?w=200&h=200&fit=crop&crop=center",
+    ],
   },
   {
-    id: '2',
-    title: '浦东新区单打约球',
-    dateTime: '明天(周五)下午5点 2小时',
-    location: '仁恒河滨花园网球场・室外',
-    distance: '3.5km',
+    id: "2",
+    title: "浦东新区单打约球",
+    dateTime: "明天(周五)下午5点 2小时",
+    location: "仁恒河滨花园网球场",
+    distance: "3.5km",
+    shinei: "室外",
     registeredCount: 2,
     maxCount: 4,
-    skillLevel: '2.0 至 2.5',
-    matchType: '双打',
+    skillLevel: "2.0 至 2.5",
+    matchType: "双打",
     images: [
-      'https://images.unsplash.com/photo-1571019613454-1cb2f99b2d8b?w=200&h=200&fit=crop&crop=center',
-      'https://images.unsplash.com/photo-1551698618-1dfe5d97d256?w=200&h=200&fit=crop&crop=center'
-    ]
+      "https://images.unsplash.com/photo-1571019613454-1cb2f99b2d8b?w=200&h=200&fit=crop&crop=center",
+      "https://images.unsplash.com/photo-1551698618-1dfe5d97d256?w=200&h=200&fit=crop&crop=center",
+    ],
   },
   {
-    id: '3',
-    title: '黄浦区双打约球',
-    dateTime: '7月20日(周日)下午6点 2小时',
-    location: '仁恒河滨花园网球场・室外',
-    distance: '3.5km',
+    id: "3",
+    title: "黄浦区双打约球",
+    dateTime: "7月20日(周日)下午6点 2小时",
+    location: "仁恒河滨花园网球场",
+    distance: "3.5km",
     registeredCount: 3,
     maxCount: 4,
-    skillLevel: '2.0 至 2.5',
-    matchType: '双打',
+    skillLevel: "2.0 至 2.5",
+    matchType: "双打",
     images: [
-      'https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center'
-    ]
-  }
-]
+      "https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center",
+    ],
+  },
+];
 
 // 模拟数据变化
 const generateDynamicData = (): TennisMatch[] => {
-  return mockTennisMatches.map(match => ({
+  Promise.resolve((res) => {
+    setTimeout(res, 3000);
+  });
+  return mockTennisMatches.map((match) => ({
     ...match,
     // 随机更新注册人数
     registeredCount: Math.min(
-      match.maxCount, 
+      match.maxCount,
       Math.max(0, match.registeredCount + Math.floor(Math.random() * 3) - 1)
     ),
     // 随机更新距离
     distance: `${(Math.random() * 5 + 1).toFixed(1)}km`,
     // 随机更新时间
-    dateTime: Math.random() > 0.5 ? match.dateTime : '今天下午3点 2小时'
-  }))
-}
-
-// 模拟网络错误
-const simulateNetworkError = (): boolean => {
-  // 10% 概率模拟网络错误
-  return Math.random() < 0.1
-}
-
-// 模拟网络超时
-const simulateTimeout = (): boolean => {
-  // 5% 概率模拟超时
-  return Math.random() < 0.05
-}
+    dateTime: Math.random() > 0.5 ? match.dateTime : "今天下午3点 2小时",
+  }));
+};
 
 /**
  * 获取网球比赛列表
@@ -95,59 +87,21 @@ const simulateTimeout = (): boolean => {
  * @returns Promise<TennisMatch[]>
  */
 export const getTennisMatches = async (params?: {
-  page?: number
-  pageSize?: number
-  location?: string
-  skillLevel?: string
+  page?: number;
+  pageSize?: number;
+  location?: string;
+  skillLevel?: string;
 }): Promise<TennisMatch[]> => {
   try {
-    console.log('API调用: getTennisMatches', params)
-    
-    // 模拟网络延迟 (800-1500ms)
-    const delayTime = 800 + Math.random() * 700
-    await delay(delayTime)
-    
-    // 模拟网络错误
-    if (simulateNetworkError()) {
-      throw new Error('网络连接失败，请检查网络设置')
-    }
-    
-    // 模拟超时
-    if (simulateTimeout()) {
-      throw new Error('请求超时，请稍后重试')
-    }
-    
     // 生成动态数据
-    const matches = generateDynamicData()
-    
-    // 模拟分页
-    if (params?.page && params?.pageSize) {
-      const start = (params.page - 1) * params.pageSize
-      const end = start + params.pageSize
-      return matches.slice(start, end)
-    }
-    
-    // 模拟筛选
-    if (params?.location) {
-      return matches.filter(match => 
-        match.location.includes(params.location!)
-      )
-    }
-    
-    if (params?.skillLevel) {
-      return matches.filter(match => 
-        match.skillLevel.includes(params.skillLevel!)
-      )
-    }
-    
-    console.log('API响应成功:', matches.length, '条数据')
-    return matches
-    
+    const matches = generateDynamicData();
+
+    return matches;
   } catch (error) {
-    console.error('API调用失败:', error)
-    throw error
+    console.error("API调用失败:", error);
+    throw error;
   }
-}
+};
 
 /**
  * 刷新网球比赛数据
@@ -155,60 +109,47 @@ export const getTennisMatches = async (params?: {
  */
 export const refreshTennisMatches = async (): Promise<TennisMatch[]> => {
   try {
-    console.log('API调用: refreshTennisMatches')
-    
-    // 模拟刷新延迟 (500-1000ms)
-    const delayTime = 500 + Math.random() * 500
-    await delay(delayTime)
-    
-    // 模拟网络错误
-    if (simulateNetworkError()) {
-      throw new Error('刷新失败，请稍后重试')
-    }
-    
     // 生成新的动态数据
-    const matches = generateDynamicData()
-    
-    console.log('API刷新成功:', matches.length, '条数据')
-    return matches
-    
+    const matches = generateDynamicData();
+    return matches;
   } catch (error) {
-    console.error('API刷新失败:', error)
-    throw error
+    console.error("API刷新失败:", error);
+    throw error;
   }
-}
+};
 
 /**
  * 获取比赛详情
  * @param id 比赛ID
  * @returns Promise<TennisMatch | null>
  */
-export const getTennisMatchDetail = async (id: string): Promise<TennisMatch | null> => {
+export const getTennisMatchDetail = async (
+  id: string
+): Promise<TennisMatch | null> => {
   try {
-    console.log('API调用: getTennisMatchDetail', id)
-    
+    console.log("API调用: getTennisMatchDetail", id);
+
     // 模拟网络延迟
-    await delay(600 + Math.random() * 400)
-    
+    await delay(600 + Math.random() * 400);
+
     // 模拟网络错误
     if (simulateNetworkError()) {
-      throw new Error('获取详情失败，请稍后重试')
+      throw new Error("获取详情失败，请稍后重试");
     }
-    
-    const match = mockTennisMatches.find(m => m.id === id)
-    
+
+    const match = mockTennisMatches.find((m) => m.id === id);
+
     if (!match) {
-      throw new Error('比赛不存在')
+      throw new Error("比赛不存在");
     }
-    
-    console.log('API获取详情成功:', match.title)
-    return match
-    
+
+    console.log("API获取详情成功:", match.title);
+    return match;
   } catch (error) {
-    console.error('API获取详情失败:', error)
-    throw error
+    console.error("API获取详情失败:", error);
+    throw error;
   }
-}
+};
 
 /**
  * 模拟API统计信息
@@ -218,6 +159,6 @@ export const getApiStats = () => {
     totalCalls: 0,
     successRate: 0.95,
     averageResponseTime: 800,
-    lastCallTime: new Date().toISOString()
-  }
-}
+    lastCallTime: new Date().toISOString(),
+  };
+};
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index 9a5ec9a..b5eb210 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -77,14 +77,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         loading: false,
         lastRefreshTime: new Date().toISOString()
       })
-      console.log('Store: 成功获取网球比赛数据:', matches.length, '条')
+
     } catch (error) {
-      // const errorMessage = error instanceof Error ? error.message : '未知错误'
-      // set({
-      //   error: errorMessage,
-      //   loading: false
-      // })
-      // console.error('Store: 获取网球比赛数据失败:', errorMessage)
+
     }
   },
 
@@ -101,12 +96,6 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       })
       console.log('Store: 成功刷新网球比赛数据:', matches.length, '条')
     } catch (error) {
-      // const errorMessage = error instanceof Error ? error.message : '未知错误'
-      // set({
-      //   error: errorMessage,
-      //   loading: false
-      // })
-      // console.error('Store: 刷新网球比赛数据失败:', errorMessage)
     }
   },
 
diff --git a/types/list/types.ts b/types/list/types.ts
index 2fc8d71..789164c 100644
--- a/types/list/types.ts
+++ b/types/list/types.ts
@@ -10,6 +10,7 @@ export interface TennisMatch {
   skillLevel: string
   matchType: string
   images: string[]
+  shinei: string
 }
 export interface IFilterOptions {
   location: string
@@ -138,4 +139,19 @@ export interface FilterPopupProps {
   onClear: () => void;
   visible: boolean;
   onClose: () => void;
+}
+
+// 列表卡片
+export interface ListCardProps {
+  title: string;
+  dateTime: string;
+  location: string;
+  distance: string;
+  registeredCount: number;
+  maxCount: number;
+  skillLevel: string;
+  matchType: string;
+  images: string[];
+  shinei: string;
+  showSkeleton?: boolean;
 }
\ No newline at end of file

From 517c61d691618906963767a24c7f2bf24a19b9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Sun, 24 Aug 2025 20:55:38 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.config.ts                         |   2 +
 src/pages/userInfo/myself/index.config.ts |   9 +
 src/pages/userInfo/myself/index.scss      | 600 ++++++++++++++++++++++
 src/pages/userInfo/myself/index.tsx       | 377 ++++++++++++++
 src/static/userInfo/default_avatar.svg    |   5 +
 src/static/userInfo/game1.svg             |   6 +
 src/static/userInfo/game2.svg             |   6 +
 src/static/userInfo/game3.svg             |   6 +
 src/static/userInfo/location.svg          |   5 +
 src/static/userInfo/message.svg           |   6 +
 src/static/userInfo/plus.svg              |   4 +
 src/static/userInfo/tennis.svg            |   7 +
 src/static/userInfo/user1.svg             |   5 +
 src/static/userInfo/user2.svg             |   5 +
 14 files changed, 1043 insertions(+)
 create mode 100644 src/pages/userInfo/myself/index.config.ts
 create mode 100644 src/pages/userInfo/myself/index.scss
 create mode 100644 src/pages/userInfo/myself/index.tsx
 create mode 100644 src/static/userInfo/default_avatar.svg
 create mode 100644 src/static/userInfo/game1.svg
 create mode 100644 src/static/userInfo/game2.svg
 create mode 100644 src/static/userInfo/game3.svg
 create mode 100644 src/static/userInfo/location.svg
 create mode 100644 src/static/userInfo/message.svg
 create mode 100644 src/static/userInfo/plus.svg
 create mode 100644 src/static/userInfo/tennis.svg
 create mode 100644 src/static/userInfo/user1.svg
 create mode 100644 src/static/userInfo/user2.svg

diff --git a/src/app.config.ts b/src/app.config.ts
index 7c74bbe..0b0c69a 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -3,6 +3,8 @@ export default defineAppConfig({
     'pages/login/index/index',
     'pages/login/verification/index',
     'pages/login/terms/index',
+    'pages/userInfo/myself/index',
+    
     // 'pages/publishBall/index',
     // 'pages/mapDisplay/index',
     // 'pages/list/index',
diff --git a/src/pages/userInfo/myself/index.config.ts b/src/pages/userInfo/myself/index.config.ts
new file mode 100644
index 0000000..eb44728
--- /dev/null
+++ b/src/pages/userInfo/myself/index.config.ts
@@ -0,0 +1,9 @@
+export default {
+  navigationBarTitleText: '个人主页',
+  navigationBarBackgroundColor: '#FFFFFF',
+  navigationBarTextStyle: 'black',
+  backgroundColor: '#FAFAFA',
+  enablePullDownRefresh: false,
+  disableScroll: false,
+  navigationStyle: 'custom'
+} 
\ No newline at end of file
diff --git a/src/pages/userInfo/myself/index.scss b/src/pages/userInfo/myself/index.scss
new file mode 100644
index 0000000..2aa9ace
--- /dev/null
+++ b/src/pages/userInfo/myself/index.scss
@@ -0,0 +1,600 @@
+// 个人页面样式
+.myself_page {
+  min-height: 100vh;
+  background: radial-gradient(circle at 50% 0%, rgba(238, 255, 220, 1) 0%, rgba(255, 255, 255, 1) 37%);
+  position: relative;
+  overflow: hidden;
+  box-sizing: border-box;
+}
+
+// 主要内容区域
+.main_content {
+  position: relative;
+  z-index: 5;
+  flex: 1;
+  margin-top: 0;
+  box-sizing: border-box;
+  overflow-y: auto;
+  padding: 15px 15px 15px;
+
+  // 用户信息区域
+  .user_info_section {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    margin-bottom: 16px;
+
+    // 基本信息
+    .basic_info {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+
+      .avatar_container {
+        width: 64px;
+        height: 64px;
+        border-radius: 50%;
+        overflow: hidden;
+        box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.12), 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+
+        .avatar {
+          width: 100%;
+          height: 100%;
+          object-fit: cover;
+        }
+      }
+
+      .info_container {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+
+        .nickname {
+          font-family: 'PingFang SC';
+          font-weight: 600;
+          font-size: 20px;
+          line-height: 1.4em;
+          letter-spacing: 1.9%;
+          color: #000000;
+        }
+
+        .join_date {
+          font-family: 'PingFang SC';
+          font-weight: 400;
+          font-size: 14px;
+          line-height: 1.4em;
+          letter-spacing: 2.7%;
+          color: rgba(0, 0, 0, 0.35);
+        }
+      }
+    }
+
+    // 统计数据
+    .stats_section {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 24px;
+
+      .stats_container {
+        display: flex;
+        align-items: center;
+        gap: 20px;
+
+        .stat_item {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+
+          .stat_number {
+            font-family: 'PingFang SC';
+            font-weight: 600;
+            font-size: 18px;
+            line-height: 1.4em;
+            letter-spacing: 2.1%;
+            color: rgba(0, 0, 0, 0.85);
+          }
+
+          .stat_label {
+            font-family: 'PingFang SC';
+            font-weight: 500;
+            font-size: 12px;
+            line-height: 1.4em;
+            letter-spacing: 3.2%;
+            color: rgba(0, 0, 0, 0.35);
+          }
+        }
+      }
+
+      .action_buttons {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        
+      
+
+        .follow_button {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          padding: 12px 16px 12px 12px;
+          height: 40px;
+          background: #000000;
+          border: 0.5px solid rgba(0, 0, 0, 0.06);
+          border-radius: 999px;
+          cursor: pointer;
+          transition: all 0.3s ease;
+
+          &.following {
+            background: #FFFFFF;
+            color: #000000;
+          }
+
+          .button_icon {
+            width: 20px;
+            height: 20px;
+          }
+
+          .button_text {
+            font-family: 'PingFang SC';
+            font-weight: 600;
+            font-size: 14px;
+            line-height: 1.4em;
+            color: #FFFFFF;
+
+            .following & {
+              color: #000000;
+            }
+          }
+        }
+
+        .message_button {
+          width: 40px;
+          height: 40px;
+          background: #FFFFFF;
+          border: 0.5px solid rgba(0, 0, 0, 0.12);
+          border-radius: 999px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+          transition: all 0.3s ease;
+
+          .button_icon {
+            width: 18px;
+            height: 18px;
+          }
+        }
+
+        .edit_button {
+          min-width: 60px;
+          height: 40px;
+          background: #FFFFFF;
+          border: 0.5px solid rgba(0, 0, 0, 0.12);
+          border-radius: 999px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+          transition: all 0.3s ease;
+          padding: 0 12px;
+
+          .button_text {
+            font-family: 'PingFang SC';
+            font-weight: 500;
+            font-size: 14px;
+            line-height: 1.4em;
+            color: #000000;
+          }
+        }
+
+        .share_button {
+          min-width: 60px;
+          height: 40px;
+          background: #FFFFFF;
+          border: 0.5px solid rgba(0, 0, 0, 0.12);
+          border-radius: 999px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+          transition: all 0.3s ease;
+          padding: 0 12px;
+          margin: 0px !important;
+
+          .button_text {
+            font-family: 'PingFang SC';
+            font-weight: 500;
+            font-size: 14px;
+            line-height: 1.4em;
+            color: #000000;
+          }
+        }
+      }
+    }
+
+    // 标签和简介
+    .tags_bio_section {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+
+      .tags_container {
+        display: flex;
+        gap: 8px;
+        flex-wrap: wrap;
+
+        .tag_item {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          padding: 6px 8px;
+          height: 20px;
+          background: #FFFFFF;
+          border: 0.5px solid rgba(0, 0, 0, 0.16);
+          border-radius: 999px;
+
+          .tag_icon {
+            width: 12px;
+            height: 12px;
+          }
+
+          .tag_text {
+            font-family: 'PingFang SC';
+            font-weight: 500;
+            font-size: 11px;
+            line-height: 1.8em;
+            letter-spacing: -2.1%;
+            color: #000000;
+          }
+        }
+      }
+
+      .bio_text {
+        font-family: 'PingFang SC';
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 1.571em;
+        color: rgba(0, 0, 0, 0.65);
+        white-space: pre-line;
+      }
+    }
+
+    // 球局订单和收藏功能
+    .quick_actions_section {
+      margin-bottom: 16px;
+
+      .action_card {
+        display: flex;
+        align-items: center;
+        background: #FFFFFF;
+        border: 1px solid rgba(0, 0, 0, 0.06);
+        border-radius: 12px;
+        box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06);
+        overflow: hidden;
+
+        .action_content {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          gap: 8px;
+          padding: 20px 0;
+          cursor: pointer;
+          transition: background-color 0.3s ease;
+
+          &:hover {
+            background-color: rgba(0, 0, 0, 0.02);
+          }
+
+          .action_icon {
+            width: 20px;
+            height: 20px;
+          }
+
+          .action_text {
+            font-family: 'PingFang SC';
+            font-weight: 600;
+            font-size: 15px;
+            line-height: 1.4em;
+            color: #000000;
+          }
+        }
+
+        .action_divider {
+          width: 1px;
+          height: 16px;
+          background: rgba(0, 0, 0, 0.06);
+        }
+      }
+    }
+  }
+
+  // 球局类型标签页
+  .game_tabs_section {
+    margin-bottom: 16px;
+
+    .tab_container {
+      display: flex;
+      gap: 16px;
+      padding: 12px 15px;
+
+      .tab_item {
+        padding: 12px 0;
+        cursor: pointer;
+        transition: all 0.3s ease;
+
+        .tab_text {
+          font-family: 'PingFang SC';
+          font-weight: 600;
+          font-size: 20px;
+          line-height: 1.4em;
+          letter-spacing: 1.9%;
+          color: rgba(0, 0, 0, 0.85);
+          transition: color 0.3s ease;
+        }
+
+        &.active {
+          .tab_text {
+            color: #000000;
+          }
+        }
+
+        &:not(.active) {
+          .tab_text {
+            color: rgba(0, 0, 0, 0.2);
+          }
+        }
+      }
+    }
+  }
+
+  // 球局列表区域
+  .game_list_section {
+    .date_header {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      padding: 10px 15px;
+      margin-bottom: 16px;
+
+      .date_text {
+        font-family: 'PingFang SC';
+        font-weight: 600;
+        font-size: 14px;
+        line-height: 1.4em;
+        letter-spacing: 2.71%;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .separator {
+        font-family: 'PingFang SC';
+        font-weight: 400;
+        font-size: 18px;
+        line-height: 1.4em;
+        letter-spacing: 2.11%;
+        color: rgba(0, 0, 0, 0.35);
+      }
+
+      .weekday_text {
+        font-family: 'PingFang SC';
+        font-weight: 600;
+        font-size: 14px;
+        line-height: 1.4em;
+        letter-spacing: 2.71%;
+        color: rgba(0, 0, 0, 0.85);
+      }
+    }
+
+    // 球局卡片
+    .game_cards {
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+      padding: 0 5px 15px;
+
+      .game_card {
+        background: #FFFFFF;
+        border: 0.5px solid rgba(0, 0, 0, 0.08);
+        border-radius: 20px;
+        padding: 0 0 12px;
+        box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06);
+        cursor: pointer;
+        transition: all 0.3s ease;
+        position: relative;
+
+        &:active {
+          transform: scale(0.98);
+        }
+
+        // 球局标题和类型
+        .game_header {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          padding: 12px 15px 0;
+
+          .game_title {
+            font-family: 'PingFang SC';
+            font-weight: 600;
+            font-size: 16px;
+            line-height: 1.5em;
+            color: #000000;
+          }
+
+          .game_type_icon {
+            width: 16px;
+            height: 16px;
+
+            .type_icon {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
+
+        // 球局时间
+        .game_time {
+          padding: 6px 15px 0;
+
+          .time_text {
+            font-family: 'PingFang SC';
+            font-weight: 400;
+            font-size: 12px;
+            line-height: 1.5em;
+            color: rgba(60, 60, 67, 0.6);
+          }
+        }
+
+        // 球局地点和类型
+        .game_location {
+          display: flex;
+          align-items: center;
+          gap: 2px;
+          padding: 4px 15px 0;
+
+          .location_text,
+          .type_text,
+          .distance_text {
+            font-family: 'PingFang SC';
+            font-weight: 400;
+            font-size: 12px;
+            line-height: 1.5em;
+            color: rgba(60, 60, 67, 0.6);
+          }
+
+          .separator {
+            font-family: 'PingFang SC';
+            font-weight: 400;
+            font-size: 14px;
+            line-height: 1.3em;
+            color: rgba(60, 60, 67, 0.3);
+          }
+        }
+
+        // 球局图片
+        .game_images {
+          position: absolute;
+          top: 11px;
+          right: 5px;
+          width: 100px;
+          height: 100px;
+          box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.2);
+
+          .game_image {
+            position: absolute;
+            width: 56.44px;
+            height: 56.44px;
+            border-radius: 9px;
+            border: 1.5px solid #FFFFFF;
+
+            &:nth-child(1) {
+              top: 4.18px;
+              left: 19.18px;
+            }
+
+            &:nth-child(2) {
+              top: 26.5px;
+              left: 38px;
+              width: 61.86px;
+              height: 61.86px;
+            }
+
+            &:nth-child(3) {
+              top: 32.5px;
+              left: 0;
+              width: 62.04px;
+              height: 62.04px;
+            }
+          }
+        }
+
+        // 球局信息标签
+        .game_tags {
+          display: flex;
+          flex-direction: row;
+          gap: 6px;
+          padding: 8px 15px 0;
+
+          .participants_info {
+            display: flex;
+            gap: 4px;
+
+            .avatars {
+              display: flex;
+              align-items: center;
+              gap: -8px;
+
+              .participant_avatar {
+                width: 20px;
+                height: 20px;
+                border-radius: 50%;
+                border: 1px solid #FFFFFF;
+              }
+            }
+
+            .participants_count {
+              background: #FFFFFF;
+              border: 0.5px solid rgba(0, 0, 0, 0.16);
+              border-radius: 999px;
+              padding: 6px;
+              height: 20px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+
+              .count_text {
+                font-family: 'PingFang SC';
+                font-weight: 500;
+                font-size: 11px;
+                line-height: 1.8em;
+                letter-spacing: -2.1%;
+                color: #000000;
+              }
+            }
+          }
+
+          .game_info_tags {
+            display: flex;
+            gap: 4px;
+
+            .info_tag {
+              background: #FFFFFF;
+              border: 0.5px solid rgba(0, 0, 0, 0.16);
+              border-radius: 999px;
+              padding: 6px 8px;
+              height: 20px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+
+              .tag_text {
+                font-family: 'PingFang SC';
+                font-weight: 500;
+                font-size: 11px;
+                line-height: 1.8em;
+                letter-spacing: -2.1%;
+                color: #000000;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// 底部指示器
+.home_indicator {
+  position: absolute;
+  bottom: 21px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 140px;
+  height: 5px;
+  background: #000000;
+  border-radius: 2.5px;
+  z-index: 10;
+} 
\ No newline at end of file
diff --git a/src/pages/userInfo/myself/index.tsx b/src/pages/userInfo/myself/index.tsx
new file mode 100644
index 0000000..d4ca486
--- /dev/null
+++ b/src/pages/userInfo/myself/index.tsx
@@ -0,0 +1,377 @@
+import React, { useState, useEffect } from 'react';
+import { View, Text, Image, ScrollView, Button } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import './index.scss';
+
+// 用户信息接口
+interface UserInfo {
+  id: string;
+  nickname: string;
+  avatar: string;
+  join_date: string;
+  stats: {
+    following: number;
+    friends: number;
+    hosted: number;
+    participated: number;
+  };
+  tags: string[];
+  bio: string;
+  location: string;
+  occupation: string;
+  ntrp_level: string;
+}
+
+// 球局记录接口
+interface GameRecord {
+  id: string;
+  title: string;
+  date: string;
+  time: string;
+  duration: string;
+  location: string;
+  type: string;
+  distance: string;
+  participants: {
+    avatar: string;
+    nickname: string;
+  }[];
+  max_participants: number;
+  current_participants: number;
+  level_range: string;
+  game_type: string;
+  images: string[];
+}
+
+const MyselfPage: React.FC = () => {
+  // 获取页面参数
+  const instance = Taro.getCurrentInstance();
+  const user_id = instance.router?.params?.userid;
+  
+  // 判断是否为当前用户
+  const is_current_user = !user_id;
+  
+  // 模拟用户数据
+  const [user_info] = useState<UserInfo>({
+    id: '1',
+    nickname: '188的王晨',
+    avatar: require('../../../static/userInfo/default_avatar.svg'),
+    join_date: '2025年9月加入',
+    stats: {
+      following: 124,
+      friends: 24,
+      hosted: 7,
+      participated: 24
+    },
+    tags: ['上海黄浦', '互联网从业者', 'NTRP 4.0'],
+    bio: '网球入坑两年，偏好双打，正手进攻型选手\n平时在张江、世纪公园附近活动，欢迎约球！\n不卷分数，但认真对待每一拍，每一场球都想打得开心。有时候也会带相机来拍点照片📸',
+    location: '上海黄浦',
+    occupation: '互联网从业者',
+    ntrp_level: 'NTRP 4.0'
+  });
+
+  // 模拟球局数据
+  const [game_records] = useState<GameRecord[]>([
+    {
+      id: '1',
+      title: '女生轻松双打',
+      date: '明天(周五)',
+      time: '下午5点',
+      duration: '2小时',
+      location: '仁恒河滨花园网球场',
+      type: '室外',
+      distance: '3.5km',
+      participants: [
+        { avatar: require('../../../static/userInfo/user1.svg'), nickname: '用户1' },
+        { avatar: require('../../../static/userInfo/user2.svg'), nickname: '用户2' }
+      ],
+      max_participants: 4,
+      current_participants: 2,
+      level_range: '2.0 至 2.5',
+      game_type: '双打',
+      images: [
+        require('../../../static/userInfo/game1.svg'),
+        require('../../../static/userInfo/game2.svg'),
+        require('../../../static/userInfo/game3.svg')
+      ]
+    }
+  ]);
+
+  // 关注状态
+  const [is_following, setIsFollowing] = useState(false);
+
+  // 当前激活的标签页
+  const [active_tab, setActiveTab] = useState<'hosted' | 'participated'>('hosted');
+
+  // 处理关注/取消关注
+  const handle_follow = () => {
+    setIsFollowing(!is_following);
+    Taro.showToast({
+      title: is_following ? '已取消关注' : '关注成功',
+      icon: 'success',
+      duration: 1500
+    });
+  };
+
+  // 处理分享
+  const handle_share = () => {
+    Taro.showShareMenu({
+      withShareTicket: true
+    });
+  };
+
+  // 处理返回
+  const handle_back = () => {
+    Taro.navigateBack();
+  };
+
+  // 处理编辑资料
+  const handle_edit_profile = () => {
+    Taro.navigateTo({
+      url: '/pages/userInfo/edit/index'
+    });
+  };
+
+  // 处理球局详情
+  const handle_game_detail = (game_id: string) => {
+    Taro.navigateTo({
+      url: `/pages/game/detail/index?id=${game_id}`
+    });
+  };
+
+  // 处理球局订单
+  const handle_game_orders = () => {
+    Taro.navigateTo({
+      url: '/pages/game/orders/index'
+    });
+  };
+
+  // 处理收藏
+  const handle_favorites = () => {
+    Taro.navigateTo({
+      url: '/pages/game/favorites/index'
+    });
+  };
+
+  return (
+    <View className="myself_page">
+      {/* 主要内容 */}
+      <ScrollView className="main_content" scrollY>
+        {/* 用户信息区域 */}
+        <View className="user_info_section">
+          {/* 头像和基本信息 */}
+          <View className="basic_info">
+            <View className="avatar_container">
+              <Image className="avatar" src={user_info.avatar} />
+            </View>
+            <View className="info_container">
+              <Text className="nickname">{user_info.nickname}</Text>
+              <Text className="join_date">{user_info.join_date}</Text>
+            </View>
+          </View>
+
+          {/* 统计数据 */}
+          <View className="stats_section">
+            <View className="stats_container">
+              <View className="stat_item">
+                <Text className="stat_number">{user_info.stats.following}</Text>
+                <Text className="stat_label">关注</Text>
+              </View>
+              <View className="stat_item">
+                <Text className="stat_number">{user_info.stats.friends}</Text>
+                <Text className="stat_label">球友</Text>
+              </View>
+              <View className="stat_item">
+                <Text className="stat_number">{user_info.stats.hosted}</Text>
+                <Text className="stat_label">主办</Text>
+              </View>
+              <View className="stat_item">
+                <Text className="stat_number">{user_info.stats.participated}</Text>
+                <Text className="stat_label">参加</Text>
+              </View>
+            </View>
+            <View className="action_buttons">
+              {/* 只有非当前用户才显示关注按钮 */}
+              {!is_current_user && (
+                <Button 
+                  className={`follow_button ${is_following ? 'following' : ''}`}
+                  onClick={handle_follow}
+                >
+                  <Image 
+                    className="button_icon" 
+                    src={require('../../../static/userInfo/plus.svg')} 
+                  />
+                  <Text className="button_text">
+                    {is_following ? '已关注' : '关注'}
+                  </Text>
+                </Button>
+              )}
+              {/* 只有非当前用户才显示消息按钮 */}
+              {!is_current_user && (
+                <Button className="message_button">
+                  <Image 
+                    className="button_icon" 
+                    src={require('../../../static/userInfo/message.svg')} 
+                  />
+                </Button>
+              )}
+              {/* 只有当前用户才显示编辑按钮 */}
+              {is_current_user && (
+                <Button className="edit_button" onClick={handle_edit_profile}>
+                  <Text className="button_text">编辑</Text>
+                </Button>
+              )}
+              {/* 只有当前用户才显示分享按钮 */}
+              {is_current_user && (
+                <Button className="share_button" onClick={handle_share}>
+                  <Text className="button_text">分享</Text>
+                </Button>
+              )}
+            </View>
+          </View>
+
+          {/* 标签和简介 */}
+          <View className="tags_bio_section">
+            <View className="tags_container">
+              <View className="tag_item">
+                <Image 
+                  className="tag_icon" 
+                  src={require('../../../static/userInfo/location.svg')} 
+                />
+                <Text className="tag_text">{user_info.location}</Text>
+              </View>
+              <View className="tag_item">
+                <Text className="tag_text">{user_info.occupation}</Text>
+              </View>
+              <View className="tag_item">
+                <Text className="tag_text">{user_info.ntrp_level}</Text>
+              </View>
+            </View>
+            <Text className="bio_text">{user_info.bio}</Text>
+          </View>
+
+          {/* 球局订单和收藏功能 */}
+          <View className="quick_actions_section">
+            <View className="action_card">
+              <View className="action_content" onClick={handle_game_orders}>
+                <Image 
+                  className="action_icon" 
+                  src={require('../../../static/userInfo/tennis.svg')} 
+                />
+                <Text className="action_text">球局订单</Text>
+              </View>
+              <View className="action_divider"></View>
+              <View className="action_content" onClick={handle_favorites}>
+                <Image 
+                  className="action_icon" 
+                  src={require('../../../static/userInfo/tennis.svg')} 
+                />
+                <Text className="action_text">收藏</Text>
+              </View>
+            </View>
+          </View>
+        </View>
+
+        {/* 球局类型标签页 */}
+        <View className="game_tabs_section">
+          <View className="tab_container">
+            <View className={`tab_item ${active_tab === 'hosted' ? 'active' : ''}`} onClick={() => setActiveTab('hosted')}>
+              <Text className="tab_text">我主办的</Text>
+            </View>
+            <View className={`tab_item ${active_tab === 'participated' ? 'active' : ''}`} onClick={() => setActiveTab('participated')}>
+              <Text className="tab_text">我参与的</Text>
+            </View>
+          </View>
+        </View>
+
+        {/* 球局列表 */}
+        <View className="game_list_section">
+          <View className="date_header">
+            <Text className="date_text">5月28日</Text>
+            <Text className="separator">/</Text>
+            <Text className="weekday_text">星期三</Text>
+          </View>
+          
+          {/* 球局卡片 */}
+          <View className="game_cards">
+            {game_records.map((game) => (
+              <View 
+                key={game.id} 
+                className="game_card"
+                onClick={() => handle_game_detail(game.id)}
+              >
+                {/* 球局标题和类型 */}
+                <View className="game_header">
+                  <Text className="game_title">{game.title}</Text>
+                  <View className="game_type_icon">
+                    <Image 
+                      className="type_icon" 
+                      src={require('../../../static/userInfo/tennis.svg')} 
+                    />
+                  </View>
+                </View>
+
+                {/* 球局时间 */}
+                <View className="game_time">
+                  <Text className="time_text">
+                    {game.date} {game.time} {game.duration}
+                  </Text>
+                </View>
+
+                {/* 球局地点和类型 */}
+                <View className="game_location">
+                  <Text className="location_text">{game.location}</Text>
+                  <Text className="separator">·</Text>
+                  <Text className="type_text">{game.type}</Text>
+                  <Text className="separator">·</Text>
+                  <Text className="distance_text">{game.distance}</Text>
+                </View>
+
+                {/* 球局图片 */}
+                <View className="game_images">
+                  {game.images.map((image, index) => (
+                    <Image 
+                      key={index} 
+                      className="game_image" 
+                      src={image} 
+                    />
+                  ))}
+                </View>
+
+                {/* 球局信息标签 */}
+                <View className="game_tags">
+                  <View className="participants_info">
+                    <View className="avatars">
+                      {game.participants.map((participant, index) => (
+                        <Image 
+                          key={index} 
+                          className="participant_avatar" 
+                          src={participant.avatar} 
+                        />
+                      ))}
+                    </View>
+                    <View className="participants_count">
+                      <Text className="count_text">
+                        报名人数 {game.current_participants}/{game.max_participants}
+                      </Text>
+                    </View>
+                  </View>
+                  <View className="game_info_tags">
+                    <View className="info_tag">
+                      <Text className="tag_text">{game.level_range}</Text>
+                    </View>
+                    <View className="info_tag">
+                      <Text className="tag_text">{game.game_type}</Text>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            ))}
+          </View>
+        </View>
+      </ScrollView>
+    </View>
+  );
+};
+
+export default MyselfPage;
diff --git a/src/static/userInfo/default_avatar.svg b/src/static/userInfo/default_avatar.svg
new file mode 100644
index 0000000..5cf5917
--- /dev/null
+++ b/src/static/userInfo/default_avatar.svg
@@ -0,0 +1,5 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="40" cy="40" r="40" fill="#E5E7EB"/>
+  <circle cx="40" cy="32" r="16" fill="#9CA3AF"/>
+  <path d="M16 64C16 52.9543 24.9543 44 36 44H44C55.0457 44 64 52.9543 64 64V80H16V64Z" fill="#9CA3AF"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/game1.svg b/src/static/userInfo/game1.svg
new file mode 100644
index 0000000..ca4f985
--- /dev/null
+++ b/src/static/userInfo/game1.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="40" viewBox="0 0 60 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="60" height="40" rx="4" fill="#E5E7EB"/>
+  <circle cx="20" cy="20" r="8" fill="#9CA3AF"/>
+  <circle cx="40" cy="20" r="8" fill="#6B7280"/>
+  <path d="M16 28L44 28" stroke="#9CA3AF" stroke-width="2" stroke-linecap="round"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/game2.svg b/src/static/userInfo/game2.svg
new file mode 100644
index 0000000..ab7fe76
--- /dev/null
+++ b/src/static/userInfo/game2.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="40" viewBox="0 0 60 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="60" height="40" rx="4" fill="#FEF3C7"/>
+  <rect x="15" y="12" width="30" height="16" rx="2" fill="#F59E0B"/>
+  <circle cx="20" cy="20" r="3" fill="#FFFFFF"/>
+  <circle cx="40" cy="20" r="3" fill="#FFFFFF"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/game3.svg b/src/static/userInfo/game3.svg
new file mode 100644
index 0000000..875bdaa
--- /dev/null
+++ b/src/static/userInfo/game3.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="40" viewBox="0 0 60 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="60" height="40" rx="4" fill="#DBEAFE"/>
+  <path d="M20 15L30 25L40 15" stroke="#3B82F6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <circle cx="20" cy="20" r="2" fill="#3B82F6"/>
+  <circle cx="40" cy="20" r="2" fill="#3B82F6"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/location.svg b/src/static/userInfo/location.svg
new file mode 100644
index 0000000..a1c89f9
--- /dev/null
+++ b/src/static/userInfo/location.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8 2C5.79086 2 4 3.79086 4 6C4 8.20914 5.79086 10 8 10C10.2091 10 12 8.20914 12 6C12 3.79086 10.2091 2 8 2Z" stroke="currentColor" stroke-width="2"/>
+  <path d="M8 10V14" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+  <circle cx="8" cy="6" r="1" fill="currentColor"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/message.svg b/src/static/userInfo/message.svg
new file mode 100644
index 0000000..f22ed89
--- /dev/null
+++ b/src/static/userInfo/message.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2 4C2 2.89543 2.89543 2 4 2H12C13.1046 2 14 2.89543 14 4V10C14 11.1046 13.1046 12 12 12H6L2 16V4Z" stroke="currentColor" stroke-width="2" stroke-linejoin="round"/>
+  <circle cx="6" cy="7" r="1" fill="currentColor"/>
+  <circle cx="10" cy="7" r="1" fill="currentColor"/>
+  <circle cx="6" cy="10" r="1" fill="currentColor"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/plus.svg b/src/static/userInfo/plus.svg
new file mode 100644
index 0000000..a4e5876
--- /dev/null
+++ b/src/static/userInfo/plus.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M8 3V13" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+  <path d="M13 8H3" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/tennis.svg b/src/static/userInfo/tennis.svg
new file mode 100644
index 0000000..2405eb1
--- /dev/null
+++ b/src/static/userInfo/tennis.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="8" cy="8" r="6" fill="#FFFFFF" stroke="currentColor" stroke-width="2"/>
+  <path d="M2 8H14" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
+  <path d="M8 2V14" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
+  <path d="M3.5 3.5L12.5 12.5" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
+  <path d="M12.5 3.5L3.5 12.5" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/user1.svg b/src/static/userInfo/user1.svg
new file mode 100644
index 0000000..605867e
--- /dev/null
+++ b/src/static/userInfo/user1.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="20" cy="20" r="20" fill="#F3F4F6"/>
+  <circle cx="20" cy="16" r="8" fill="#6B7280"/>
+  <path d="M8 32C8 26.4772 12.4772 22 18 22H22C27.5228 22 32 26.4772 32 32V40H8V32Z" fill="#6B7280"/>
+</svg> 
\ No newline at end of file
diff --git a/src/static/userInfo/user2.svg b/src/static/userInfo/user2.svg
new file mode 100644
index 0000000..86e660b
--- /dev/null
+++ b/src/static/userInfo/user2.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="20" cy="20" r="20" fill="#FEF3C7"/>
+  <circle cx="20" cy="16" r="8" fill="#F59E0B"/>
+  <path d="M8 32C8 26.4772 12.4772 22 18 22H22C27.5228 22 32 26.4772 32 32V40H8V32Z" fill="#F59E0B"/>
+</svg> 
\ No newline at end of file

From b14985d8dd98abd8487ba7e075a7f711878530ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Sun, 24 Aug 2025 23:48:02 +0800
Subject: [PATCH 13/22] feat: upload cover not over yet

---
 src/app.config.ts                             |   2 +-
 src/components/UploadCover/index.scss         | 127 ++++++++++++++
 src/components/UploadCover/index.tsx          | 122 ++++++++++++-
 .../UploadCover/upload-from-wx.scss           |  11 ++
 src/components/UploadCover/upload-from-wx.tsx |  47 +++++
 .../UploadCover/upload-source-popup.scss      | 156 +++++++++++++++++
 .../UploadCover/upload-source-popup.tsx       | 161 ++++++++++++++++++
 src/components/index.ts                       |  20 ++-
 src/config/images.js                          |   9 +-
 src/pages/detail/index.scss                   |  14 +-
 src/pages/detail/index.tsx                    |  13 +-
 src/pages/publishBall/publishForm.tsx         |  24 +--
 src/scss/images.scss                          |  15 +-
 src/services/detailApi.ts                     |  41 +++++
 src/services/httpService.ts                   |  23 +--
 src/services/publishService.ts                |  68 +++++++-
 src/services/uploadFiles.ts                   |  75 ++++++++
 .../icon-arrow-left.svg                       |   0
 .../icon-logo-go.svg}                         |   0
 src/static/emptyStatus/comment-empty.png      | Bin 0 -> 11448 bytes
 src/static/emptyStatus/comment-failed.png     | Bin 0 -> 17514 bytes
 src/static/emptyStatus/publish-empty.png      | Bin 0 -> 13137 bytes
 src/static/emptyStatus/publish-failed.png     | Bin 0 -> 17756 bytes
 .../publishBall/icon-circle-select-arrow.svg  |   3 +
 .../publishBall/icon-circle-select-ring.svg   |   3 +
 .../publishBall/icon-circle-unselect.svg      |   3 +
 26 files changed, 881 insertions(+), 56 deletions(-)
 create mode 100644 src/components/UploadCover/upload-from-wx.scss
 create mode 100644 src/components/UploadCover/upload-from-wx.tsx
 create mode 100644 src/components/UploadCover/upload-source-popup.scss
 create mode 100644 src/components/UploadCover/upload-source-popup.tsx
 create mode 100644 src/services/detailApi.ts
 create mode 100644 src/services/uploadFiles.ts
 rename src/static/{publishBall => detail}/icon-arrow-left.svg (100%)
 rename src/static/{publishBall/icon-logo-go!.svg => detail/icon-logo-go.svg} (100%)
 create mode 100644 src/static/emptyStatus/comment-empty.png
 create mode 100644 src/static/emptyStatus/comment-failed.png
 create mode 100644 src/static/emptyStatus/publish-empty.png
 create mode 100644 src/static/emptyStatus/publish-failed.png
 create mode 100644 src/static/publishBall/icon-circle-select-arrow.svg
 create mode 100644 src/static/publishBall/icon-circle-select-ring.svg
 create mode 100644 src/static/publishBall/icon-circle-unselect.svg

diff --git a/src/app.config.ts b/src/app.config.ts
index 29bdd35..6ea5cc9 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -3,7 +3,7 @@ export default defineAppConfig({
     'pages/login/index/index',
     'pages/login/verification/index',
     'pages/login/terms/index',
-    // 'pages/publishBall/index',
+    'pages/publishBall/index',
     // 'pages/mapDisplay/index',
     // 'pages/list/index',
     'pages/index/index',
diff --git a/src/components/UploadCover/index.scss b/src/components/UploadCover/index.scss
index e69de29..ff76d06 100644
--- a/src/components/UploadCover/index.scss
+++ b/src/components/UploadCover/index.scss
@@ -0,0 +1,127 @@
+@use '~@/scss/images.scss' as img;
+@use '~@/scss/themeColor.scss' as theme;
+
+.upload-cover-root {
+  display: flex;
+  width: 100%;
+  height: 112px;
+  margin-bottom: 8px;
+  position: relative;
+  align-items: flex-end;
+
+  &.upload-cover-act-center {
+    justify-content: center;
+  }
+
+  .upload-cover-act {
+    display: flex;
+    width: 108px;
+    height: 108px;
+    padding: 16px 12px 10px 12px;
+    margin-top: 4px;
+    box-sizing: border-box;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+    border-radius: 20px;
+    border: 1px dashed rgba(0, 0, 0, 0.12);
+    background: theme.$page-background-color;
+    box-shadow: 0 4px 36px 0 rgba(0, 0, 0, 0.06);
+    z-index: 1;
+
+    .upload-cover-act-icon {
+      width: 20px;
+      height: 20px;
+    }
+
+    .upload-cover-text {
+      color: var(--Labels-Secondary, var(--Labels-Secondary, rgba(60, 60, 67, 0.60)));
+      font-feature-settings: 'liga' off, 'clig' off;
+      font-family: "PingFang SC";
+      font-size: 12px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 20px; /* 166.667% */
+    }
+  }
+
+  .cover-image-list-container {
+    position: absolute;
+    left: 114px;
+    top: 0;
+    width: calc(100% - 114px);
+    overflow-x: scroll;
+    height: 112px;
+
+    &.full {
+      left: 0;
+      width: 100%;
+    }
+
+    .cover-image-list {
+      width: auto;
+      height: 112px;
+      display: flex;
+      gap: 6px;
+      justify-content: flex-start;
+      align-items: flex-end;
+      flex-wrap: nowrap;
+      flex-shrink: 0;
+      flex-grow: 0;
+
+      .cover-image-item {
+        display: flex;
+        width: 108px;
+        height: 108px;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        gap: 8px;
+        border-radius: 20px;
+        position: relative;
+        border: 1px solid rgba(0, 0, 0, 0.12);
+        box-sizing: border-box;
+
+        .cover-image-item-image {
+          width: 100%;
+          height: 100%;
+          aspect-ratio: 1/1;
+          border-radius: 20px;
+        }
+
+        .cover-image-item-delete {
+          position: absolute;
+          top: -4px;
+          right: -4px;
+          width: 16px;
+          height: 16px;
+        }
+      }
+    }
+  }
+}
+
+.upload-source-popup-container {
+  width: 100%;
+  height: auto;
+  display: flex;
+  flex-direction: column;
+  padding: 26px 0;
+  box-sizing: border-box;
+}
+
+.upload-source-popup-item {
+  display: flex;
+  width: 100%;
+  height: 56px;
+  padding: 16px 24px;
+  box-sizing: border-box;
+  justify-content: center;
+  align-items: center;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
\ No newline at end of file
diff --git a/src/components/UploadCover/index.tsx b/src/components/UploadCover/index.tsx
index 426b037..5698f0a 100644
--- a/src/components/UploadCover/index.tsx
+++ b/src/components/UploadCover/index.tsx
@@ -1,22 +1,128 @@
-import React, { useState } from 'react'
-import { Popup } from "@nutui/nutui-react-taro";
+import React, { useCallback, useState } from 'react'
+import { Image, View, Text } from '@tarojs/components'
+import img from '../../config/images'
+import UploadSourcePopup from './upload-source-popup'
+import UploadFromWx from './upload-from-wx'
+import { CommonPopup } from '../'
 
 import './index.scss'
+import { uploadFileResponseData } from '@/services/uploadFiles'
 
-export default function UploadCover(props) {
-  const { value = [], onChange = () => {} } = props
+export type sourceType = 'album' | 'history' | 'preset'
+
+export type source = sourceType[]
+
+export type CoverImageValue = {
+  id: string
+  url: string
+  tempFilePath?: string
+}
+
+export interface UploadCoverProps {
+  value: CoverImageValue[]
+  onChange: (value: CoverImageValue[] | ((prev: CoverImageValue[]) => CoverImageValue[])
+) => void
+  source: source
+  maxCount: number
+}
+
+// const values = [
+//   'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/1a35ebbf-2361-44da-b338-7608561d0b31.png',
+//   'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/cf5a82ba-90af-4138-a1b3-9119adcde9e0.png',
+//   'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/49d7cdf0-b03c-4a0f-91c6-e7778080cfcd.png'
+// ]
+
+const mergeCoverImages = (value: CoverImageValue[], images: CoverImageValue[]) => {
+  console.log(value, images, 11111)
+  // 根据id来更新url, 如果id不存在，则添加到value中
+  const newImages = images
+  const updatedValue = value.map(item => {
+    const index = images.findIndex(image => image.id === item.id)
+    if (index !== -1) {
+      newImages.splice(index, 1)
+      return { ...item, url: images[index].url }
+    }
+    return item
+  })
+  return [...updatedValue, ...newImages]
+}
+
+export default function UploadCover(props: UploadCoverProps) {
+  const {
+    value = [],
+    onChange = () => void 0,
+    source = ['album', 'history', 'preset'],
+    maxCount = 9,
+  } = props
   const [visible, setVisible] = useState(false)
 
+  const onAdd = useCallback((images: CoverImageValue[]) => {
+    onChange(prev => mergeCoverImages(prev, images))
+    setVisible(false)
+  }, [value])
+
+  const onWxAdd = useCallback((images: CoverImageValue[], onFileUploaded: Promise<{ id: string, data: uploadFileResponseData }[]>) => {
+    onAdd(images)
+    onFileUploaded.then(res => {
+      console.log(res, 11111)
+      onAdd(res.map(item => ({
+        id: item.id,
+        url: item.data.file_path,
+      })))
+    })
+  }, [onAdd])
+  const onDelete = (image: CoverImageValue) => {
+    onChange(value.filter(item => item.id !== image.id))
+  }
+
   return (
     <>
-      <Popup
+      <CommonPopup
         visible={visible}
         onClose={() => setVisible(false)}
         round
-        closeable
+        position="bottom"
+        hideFooter
       >
-      <div className="upload-cover-popup" onClick={}>
-        <div className="upload-cover-popup-title">上传封面</div>
+        <View className="upload-source-popup-container" style={{ height: source.length * 56 + 52 + 'px' }}>
+          {
+            source.map((item) => {
+              return (
+                <View className="upload-source-popup-item" key={item}>
+                  {
+                    item === 'album' ? (
+                      <UploadFromWx onAdd={onWxAdd} maxCount={maxCount - value.length} />
+                    ) : (
+                      <UploadSourcePopup sourceType={item} onAdd={onAdd} maxCount={maxCount - value.length} />
+                    )
+                  }
+                </View>
+              )
+            })
+          }
+        </View>
+      </CommonPopup>
+      <div className={`upload-cover-root ${value.length === 0 ? 'upload-cover-act-center' : ''}`}>
+        {value.length < maxCount && (
+          <div className="upload-cover-act" onClick={() => setVisible(true)}>
+            <Image className='upload-cover-act-icon' src={img.ICON_ADD} />
+            <div className="upload-cover-text">添加活动封面</div>
+          </div>
+        )}
+        <div className={`cover-image-list-container ${value.length === maxCount ? 'full' : ''}`}>
+          <div className="cover-image-list">
+            {
+              value.map((item) => {
+                return (
+                  <View className="cover-image-item" key={item.id}>
+                    <Image className="cover-image-item-image" src={item.url} />
+                    <Image className="cover-image-item-delete" src={img.ICON_REMOVE} onClick={() => onDelete(item)} />
+                  </View>
+                )
+              })
+            }
+          </div>
+        </div>
       </div>
     </>
   );
diff --git a/src/components/UploadCover/upload-from-wx.scss b/src/components/UploadCover/upload-from-wx.scss
new file mode 100644
index 0000000..195c5b6
--- /dev/null
+++ b/src/components/UploadCover/upload-from-wx.scss
@@ -0,0 +1,11 @@
+.upload-from-wx-text {
+  width: 100%;
+  height: 56px;
+  padding: 16px 24px;
+  box-sizing: border-box;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 24px;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/src/components/UploadCover/upload-from-wx.tsx b/src/components/UploadCover/upload-from-wx.tsx
new file mode 100644
index 0000000..05c0351
--- /dev/null
+++ b/src/components/UploadCover/upload-from-wx.tsx
@@ -0,0 +1,47 @@
+import React from 'react'
+import { View, Text } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import uploadApi from '@/services/uploadFiles'
+import './upload-from-wx.scss'
+import { CoverImageValue } from '.'
+import { uploadFileResponseData } from '@/services/uploadFiles'
+
+export interface UploadFromWxProps {
+  onAdd: (images: CoverImageValue[], onFileUploaded: Promise<{ id: string, data: uploadFileResponseData }[]>) => void
+  maxCount: number
+}
+
+export default function UploadFromWx(props: UploadFromWxProps) {
+  const {
+    onAdd = () => void 0,
+    maxCount = 9, // calc from parent
+  } = props
+  const handleImportFromWx = () => {
+    Taro.chooseImage({
+      count: maxCount,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+    }).then(async (res) => {
+      // TODO: compress image
+      // TODO: cropping image to const size
+      let count = 0
+      const files = res.tempFiles.map(item => ({
+        filePath: item.path,
+        description: 'test',
+        tags: 'test',
+        is_public: 1 as unknown as 0 | 1,
+        id: (Date.now() + count++).toString(),
+      }))
+      const onFileUploaded = uploadApi.batchUpload(files)
+      onAdd(res.tempFiles.map(item => ({
+        id: Date.now().toString(),
+        url: item.path,
+      })), onFileUploaded) // TODO: add loading state
+    })
+  }
+  return (
+    <View onClick={handleImportFromWx}>
+      <Text className="upload-from-wx-text">从相册添加</Text>
+    </View>
+  )
+}
\ No newline at end of file
diff --git a/src/components/UploadCover/upload-source-popup.scss b/src/components/UploadCover/upload-source-popup.scss
new file mode 100644
index 0000000..999c934
--- /dev/null
+++ b/src/components/UploadCover/upload-source-popup.scss
@@ -0,0 +1,156 @@
+@use '~@/scss/themeColor.scss' as theme;
+
+.upload-source-popup-text {
+  width: 100%;
+  height: 56px;
+  padding: 16px 24px;
+  box-sizing: border-box;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 24px;
+  text-align: center;
+}
+
+.upload-popup {
+  width: 100%;
+  padding: 26px 0;
+  box-sizing: border-box;
+
+  .upload-popup-title {
+    display: flex;
+    padding: 18px 20px 10px 20px;
+    align-items: center;
+    align-self: stretch;
+    font-family: "PingFang SC";
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 24px; /* 150% */
+    letter-spacing: -0.23px;
+  }
+
+  .upload-popup-scroll-view {
+    max-height: calc(100vh - 260px);
+    overflow-y: auto;
+
+    .upload-popup-image-list {
+      width: 100%;
+      padding: 0 16px;
+      box-sizing: border-box;
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      gap: 10px 10px;
+
+      .upload-popup-image-item {
+        aspect-ratio: 1/1;
+        border-radius: 9px;
+        border: 1px solid rgba(0, 0, 0, 0.12);
+        box-sizing: border-box;
+        background: rgba(0, 0, 0, 0.06);
+        margin: 0;
+        position: relative;
+
+        &:not(.selected) {
+          &.disabled {
+            opacity: 0.5;
+            pointer-events: none;
+            cursor: not-allowed;
+          }
+        }
+
+        .upload-popup-image-item-image {
+          width: 100%;
+          height: 100%;
+          border-radius: 9px;
+          margin: 0;
+        }
+
+        .upload-popup-image-item-select {
+          position: absolute;
+          top: 5px;
+          right: 5px;
+          width: 14px;
+          height: 14px;
+          color: #fff;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          &.selected {
+            background: rgba(0, 0, 0, 0.5);
+
+            .select-image-icon {
+              width: 7px;
+              height: 7px;
+            }
+          }
+        }
+
+        .select-image-icon {
+          width: 14px;
+          height: 14px;
+        }
+      }
+    }
+
+    .upload-popup-image-list-empty {
+      width: 100%;
+      height: 60vh;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      gap: 20px;
+    }
+
+    .upload-popup-image-list-empty-image {
+      width: 80%;
+      aspect-ratio: 4/3;
+      height: auto;
+    }
+
+    .upload-popup-image-list-empty-text {
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 24px; /* 150% */
+      letter-spacing: -0.23px;
+    }
+  }
+
+  .upload-popup-footer {
+    display: flex;
+    width: 100%;
+    height: 62px;
+    padding: 8px 10px 10px 10px;
+    box-sizing: border-box;
+    justify-content: center;
+    align-items: flex-start;
+    gap: 8px;
+
+    .upload-popup-footer-cancel, .upload-popup-footer-confirm {
+      font-feature-settings: 'liga' off, 'clig' off;
+      font-family: "PingFang SC";
+      box-sizing: border-box;
+      height: 44px;
+      border-radius: 12px;
+      border: 1px solid rgba(0, 0, 0, 0.12);
+      flex: 1;
+    }
+
+    .upload-popup-footer-cancel {
+      background: theme.$page-background-color;
+    }
+
+    .upload-popup-footer-confirm {
+      background: theme.$primary-color;
+      color: rgba(255, 255, 255, 0.5);
+
+      &.active {
+        color: #fff;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/UploadCover/upload-source-popup.tsx b/src/components/UploadCover/upload-source-popup.tsx
new file mode 100644
index 0000000..ccb156f
--- /dev/null
+++ b/src/components/UploadCover/upload-source-popup.tsx
@@ -0,0 +1,161 @@
+import React, { useState, useEffect } from 'react'
+import { Image, View, Text, ScrollView, Button } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import img from '../../config/images'
+import publishService from '../../services/publishService'
+import { CommonPopup } from '../'
+import emptyStatus from '../../static/emptyStatus/publish-empty.png'
+
+import './upload-source-popup.scss'
+
+type SourceType = 'history' | 'preset'
+
+type ImageItem = {
+  id: string
+  url: string
+  tempFilePath?: string
+}
+
+interface UploadImageProps {
+  sourceType: SourceType
+  onAdd: (images: ImageItem[]) => void
+  maxCount: number
+}
+
+const sourceMap = new Map<SourceType, string>([
+  ['history', '历史图库'],
+  ['preset', '预设图库']
+])
+
+const checkImageSelected = (images: ImageItem[], image: ImageItem) => {
+  return images.some(item => item.id === image.id)
+}
+
+export default function UploadImage(props: UploadImageProps) {
+  const {
+    sourceType = 'history',
+    onAdd = () => void 0,
+    maxCount = 9,
+  } = props
+  const [visible, setVisible] = useState(false)
+  const [images, setImages] = useState<ImageItem[]>([])
+  const [selectedImages, setSelectedImages] = useState<ImageItem[]>([])
+
+  const handleImageClick = (image: ImageItem) => {
+    if (checkImageSelected(selectedImages, image)) {
+      setSelectedImages(selectedImages.filter(item => item.id !== image.id))
+    } else if (!outOfMax) {
+      setSelectedImages([...selectedImages, image])
+    } else {
+      Taro.showToast({
+        title: `最多选择${maxCount}张图片`,
+        icon: 'none'
+      })
+    }
+  }
+
+  useEffect(() => {
+    if (visible) {
+      publishService.getPictures({
+        pageOption: {
+          page: 1,
+          pageSize: 100,
+        },
+        seachOption: {
+          tag: '',
+          resource_type: 'image',
+          dateRange: [],
+        },
+      }).then(res => {
+        if (res.success) {
+          setImages(res.data.data.rows.map(item => ({
+            id: Date.now().toString(),
+            url: item.thumbnail_url,
+          })))
+        } else {
+          // TODO: 显示错误信息
+          Taro.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+        }
+      })
+    } else {
+      setSelectedImages([])
+    }
+  }, [visible])
+
+  const handleConfirm = () => {
+    if (selectedImages.length > 0) {
+      onAdd(selectedImages)
+      setVisible(false)
+    } else {
+      Taro.showToast({
+        title: '请选择图片',
+        icon: 'none'
+      })
+    }
+  }
+
+  const outOfMax = selectedImages.length >= maxCount
+
+  return (
+    <>
+      <CommonPopup
+        visible={visible}
+        onClose={() => setVisible(false)}
+        round
+        hideFooter
+        position='bottom'
+      >
+        <View className="upload-popup">
+          <View className="upload-popup-title">{sourceMap.get(sourceType)}</View>
+          {/* TODO: 分页 加载更多 */}
+          {/* TODO: 图片加载失败 */}
+          {/* TODO: 图片加载中 */}
+          <ScrollView
+            scrollY
+            className="upload-popup-scroll-view"
+          >
+            {images.length > 0 ? (
+            <View className="upload-popup-image-list">
+              {images.map(item => {
+                const isSelected = checkImageSelected(selectedImages, item)
+                return (
+                  <View className={`upload-popup-image-item ${outOfMax ? 'disabled' : ''} ${isSelected ? 'selected' : ''}`} onClick={() => handleImageClick(item)}>
+                    <Image className="upload-popup-image-item-image" src={item.url} />
+                    <View className={`upload-popup-image-item-select ${isSelected ? 'selected' : ''}`}>
+                      {isSelected ? (
+                        <Image className="select-image-icon" src={img.ICON_CIRCLE_SELECT_ARROW} />
+                      ) : (
+                        <Image className="select-image-icon" src={img.ICON_CIRCLE_UNSELECT} />
+                      )}
+                    </View>
+                  </View>
+                )
+              })}
+            </View>
+            ) : (
+              <View className="upload-popup-image-list-empty">
+                <Image className="upload-popup-image-list-empty-image" src={emptyStatus} />
+                <Text className="upload-popup-image-list-empty-text">暂无内容</Text>
+              </View>
+            )}
+          </ScrollView>
+          {images.length > 0 ? (
+          <View className="upload-popup-footer">
+            <Button className="upload-popup-footer-cancel" onClick={() => setVisible(false)}>取消</Button>
+            <Button className={`upload-popup-footer-confirm ${selectedImages.length > 0 ? 'active' : ''}`} type='primary' onClick={handleConfirm}>完成</Button>
+          </View>
+          ) : (
+            <View className="upload-popup-footer">
+              <Button className="upload-popup-footer-cancel" onClick={() => setVisible(false)}>取消</Button>
+            </View>
+          )}
+        </View>
+      </CommonPopup>
+      <View className="upload-source-popup-text" onClick={() => setVisible(true)}>{sourceMap.get(sourceType)}选取</View>
+    </>
+  );
+};
+
diff --git a/src/components/index.ts b/src/components/index.ts
index cc5f816..6adf6c5 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -9,19 +9,21 @@ import { SelectStadium, StadiumDetail } from './SelectStadium'
 import TimeSelector from './TimeSelector'
 import TitleInput from './TitleInput'
 import CommonPopup from './CommonPopup'
+import UploadCover from './UploadCover'
 
-export { 
-    ActivityTypeSwitch, 
-    TextareaTag, 
+export {
+    ActivityTypeSwitch,
+    TextareaTag,
     FormSwitch,
-    ImageUpload, 
+    ImageUpload,
     FormBasicInfo,
-    Range, 
-    NumberInterval, 
-    SelectStadium, 
-    TimeSelector, 
+    Range,
+    NumberInterval,
+    SelectStadium,
+    TimeSelector,
     TitleInput,
     StadiumDetail,
-    CommonPopup
+    CommonPopup,
+    UploadCover
 }
 
diff --git a/src/config/images.js b/src/config/images.js
index 2c7d7b0..7d8921a 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -8,8 +8,8 @@ export default {
     ICON_COST: require('@/static/publishBall/icon-cost.svg'),
     ICON_TIPS: require('@/static/publishBall/icon-tips.svg'),
     ICON_ARROW_RIGHT: require('@/static/publishBall/icon-arrow-right.svg'),
-    ICON_ARROW_LEFT: require('@/static/publishBall/icon-arrow-left.svg'),
-    ICON_LOGO_GO: require('@/static/publishBall/icon-logo-go.svg'),
+    ICON_ARROW_LEFT: require('@/static/detail/icon-arrow-left.svg'),
+    ICON_LOGO_GO: require('@/static/detail/icon-logo-go.svg'),
     ICON_SEARCH: require('@/static/publishBall/icon-search.svg'),
     ICON_MAP: require('@/static/publishBall/icon-map.svg'),
     ICON_STADIUM: require('@/static/publishBall/icon-stadium.svg'),
@@ -18,5 +18,8 @@ export default {
     ICON_HEART_CIRCLE: require('@/static/publishBall/icon-heartcircle.png'),
     ICON_ADD: require('@/static/publishBall/icon-add.svg'),
     ICON_COPY: require('@/static/publishBall/icon-arrow-right.svg'),
-    ICON_DELETE: require('@/static/publishBall/icon-delete.svg')
+    ICON_DELETE: require('@/static/publishBall/icon-delete.svg'),
+    ICON_CIRCLE_UNSELECT: require('@/static/publishBall/icon-circle-unselect.svg'),
+    ICON_CIRCLE_SELECT: require('@/static/publishBall/icon-circle-select-ring.svg'),
+    ICON_CIRCLE_SELECT_ARROW: require('@/static/publishBall/icon-circle-select-arrow.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
index ce17fc4..267fa4a 100644
--- a/src/pages/detail/index.scss
+++ b/src/pages/detail/index.scss
@@ -1,3 +1,5 @@
+@use '~@/scss/images.scss' as img;
+
 .detail-page {
   width: 100%;
   height: 100%;
@@ -24,6 +26,10 @@
     display: flex;
     align-items: center;
 
+    .detail-navigator-back {
+      border-right: 1px solid #444;
+    }
+
     .detail-navigator-back, .detail-navigator-icon {
       height: 20px;
       width: 50%;
@@ -31,7 +37,13 @@
       display: flex;
       justify-content: center;
 
-      & > svg {
+      & > .detail-navigator-back-icon {
+        width: 20px;
+        height: 20px;
+        color: #fff;
+      }
+
+      & > .detail-navigator-logo-icon {
         width: 20px;
         height: 20px;
         color: #fff;
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index 7c94d32..7693a67 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -9,6 +9,7 @@ import {
   useUserStats,
   useUserActions
 } from '../../store/userStore'
+import img from '../../config/images'
 import { getTextColorOnImage } from '../../utils/processImage'
 import './index.scss'
 
@@ -66,18 +67,10 @@ function Index() {
       <view className="custom-navbar">
         <View className='detail-navigator'>
           <View className='detail-navigator-back'>
-            <svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 1L1 7L7 13" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
-
+            <Image className='detail-navigator-back-icon' src={img.ICON_ARROW_LEFT} />
           </View>
           <View className='detail-navigator-icon'>
-            <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.9106 10.4998L16.7487 6.92161C16.7208 6.30199 17.1953 5.79401 17.8708 5.79401C18.5462 5.79401 19.0319 6.30199 18.9984 6.92161L18.8197 10.4998C18.7862 11.0413 18.3787 11.3985 17.8652 11.3985C17.3404 11.3985 16.9329 11.019 16.9106 10.4998ZM16.7599 12.822C16.7599 12.2135 17.2623 11.8395 17.8763 11.8395C18.4848 11.8395 18.9816 12.2135 18.9816 12.822C18.9816 13.4361 18.4848 13.8101 17.8763 13.8101C17.2623 13.8101 16.7599 13.4361 16.7599 12.822Z" fill="white"/>
-<path d="M8.65674 10.3268V9.50059C8.65674 7.27329 9.93506 5.93914 12.1512 5.93914C14.3673 5.93914 15.6401 7.27887 15.6401 9.50059V10.3268C15.6401 12.5373 14.3673 13.8603 12.1512 13.8603C9.93506 13.8603 8.65674 12.5317 8.65674 10.3268ZM10.8617 9.48384V10.3212C10.8617 11.4432 11.3362 12.0907 12.1512 12.0907C12.9662 12.0907 13.4351 11.4432 13.4351 10.3212V9.48384C13.4351 8.36182 12.9662 7.7087 12.1512 7.7087C11.3362 7.7087 10.8617 8.36182 10.8617 9.48384Z" fill="white"/>
-<path d="M1 10.3323V9.41127C1 7.29562 2.32857 5.93914 4.45539 5.93914C5.2983 5.93914 6.07981 6.16243 6.6492 6.52527C7.20742 6.87137 7.56468 7.34586 7.56468 7.83151C7.56468 8.34507 7.20184 8.70233 6.68269 8.70233C6.4594 8.70233 6.27519 8.63535 6.1133 8.5237C5.66115 8.22226 5.30388 7.78127 4.62844 7.78127C3.67388 7.78127 3.20497 8.36182 3.20497 9.5285V10.3268C3.20497 11.4767 3.67388 12.0852 4.57261 12.0852C5.24248 12.0852 5.69464 11.6944 5.69464 11.1306V10.9743H5.35412C4.80148 10.9743 4.50005 10.7063 4.50005 10.2207C4.50005 9.73504 4.7959 9.48384 5.35412 9.48384H6.56546C7.40279 9.48384 7.76564 9.83552 7.76564 10.6338V10.9352C7.76564 12.7048 6.47057 13.8603 4.47772 13.8603C2.28949 13.8603 1 12.5373 1 10.3323Z" fill="white"/>
-</svg>
-
+            <Image className='detail-navigator-logo-icon' src={img.ICON_LOGO_GO} />
           </View>
         </View>
         {/* <view className="navbar-title">我的自定义标题</view> */}
diff --git a/src/pages/publishBall/publishForm.tsx b/src/pages/publishBall/publishForm.tsx
index cc7e1cc..eaae5bb 100644
--- a/src/pages/publishBall/publishForm.tsx
+++ b/src/pages/publishBall/publishForm.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
 import { View, Text } from '@tarojs/components'
 
 import Taro from '@tarojs/taro'
-import { ImageUpload, Range, TimeSelector, TextareaTag, SelectStadium, NumberInterval, TitleInput, FormBasicInfo, FormSwitch } from '../../components'
+import { ImageUpload, Range, TimeSelector, TextareaTag, SelectStadium, NumberInterval, TitleInput, FormBasicInfo, FormSwitch, UploadCover } from '../../components'
 import { type Stadium, type CoverImage } from '../../components/index.types'
 import { FormFieldConfig, FieldType } from '../../config/formSchema/publishBallFormSchema'
 import { PublishBallFormData } from '../../../types/publishBall';
@@ -21,17 +21,21 @@ const componentMap = {
     [FieldType.CHECKBOX]: FormSwitch,
 }
 
-const PublishForm: React.FC<{ 
-    formData: PublishBallFormData, 
-    onChange: (key: keyof PublishBallFormData, value: any, index?: number) => void, 
+const PublishForm: React.FC<{
+    formData: PublishBallFormData,
+    onChange: (key: keyof PublishBallFormData, value: any, index?: number) => void,
     optionsConfig: FormFieldConfig[] }> = ({ formData, onChange, optionsConfig }) => {
   const [coverImages, setCoverImages] = useState<CoverImage[]>([])
   const [showStadiumSelector, setShowStadiumSelector] = useState(false)
   const [selectedStadium, setSelectedStadium] = useState<Stadium | null>(null)
 
   // 处理封面图片变化
-  const handleCoverImagesChange = (images: CoverImage[]) => {
-    setCoverImages(images)
+  const handleCoverImagesChange = (fn: (images: CoverImage[]) => CoverImage[]) => {
+    if (fn instanceof Function) {
+      setCoverImages(fn(coverImages))
+    } else {
+      setCoverImages(fn)
+    }
   }
 
   // 更新表单数据
@@ -80,7 +84,7 @@ const PublishForm: React.FC<{
 
     // TODO: 实现提交逻辑
     console.log('提交数据:', { coverImages, formData })
-    
+
     Taro.showToast({
       title: '发布成功',
       icon: 'success'
@@ -102,8 +106,8 @@ const PublishForm: React.FC<{
                 console.log(optionProps, item.label, formData[item.key]);
                 if (item.type === FieldType.UPLOADIMAGE) {
                     /* 活动封面 */
-                    return  <ImageUpload 
-                      images={coverImages}
+                    return  <UploadCover
+                      value={coverImages}
                       onChange={handleCoverImagesChange}
                       {...item.props}
                     />
@@ -149,7 +153,7 @@ const PublishForm: React.FC<{
                                 value={formData[item.key]}
                                 onChange={(value) => updateFormData(item.key as keyof PublishBallFormData, value)}
                                 {...optionProps}
-                                placeholder={item.placeholder} 
+                                placeholder={item.placeholder}
                             />
                         </View>
                     </View>
diff --git a/src/scss/images.scss b/src/scss/images.scss
index 32d40b4..a863e16 100644
--- a/src/scss/images.scss
+++ b/src/scss/images.scss
@@ -16,7 +16,20 @@ $-images: (
   'icon-personal': '/publishBall/icon-personal.svg',
   'icon-changda': '/publishBall/icon-changda.svg',
   'icon-cost': '/publishBall/icon-cost.svg',
-  'icon-remove': '/publishBall/icon-remove.svg'
+  'icon-remove': '/publishBall/icon-remove.svg',
+  'icon-arrow-left': '/detail/icon-arrow-left.svg',
+  'icon-logo-go': '/detail/icon-logo-go.svg',
+  'icon-search': '/publishBall/icon-search.svg',
+  'icon-map': '/publishBall/icon-map.svg',
+  'icon-stadium': '/publishBall/icon-stadium.svg',
+  'icon-arrow-small': '/publishBall/icon-arrow-small.svg',
+  'icon-map-search': '/publishBall/icon-map-search.svg',
+  'icon-heartcircle': '/publishBall/icon-heartcircle.png',
+  'icon-copy': '/publishBall/icon-arrow-right.svg',
+  'icon-delete': '/publishBall/icon-delete.svg',
+  'icon-circle-unselect': '/publishBall/icon-circle-unselect.svg',
+  'icon-circle-select-ring': '/publishBall/icon-circle-select-ring.svg',
+  'icon-circle-select-arrow': '/publishBall/icon-circle-select-arrow.svg',
 ) !default;
 
 // 图片获取函数
diff --git a/src/services/detailApi.ts b/src/services/detailApi.ts
new file mode 100644
index 0000000..e971bf0
--- /dev/null
+++ b/src/services/detailApi.ts
@@ -0,0 +1,41 @@
+import httpService from './httpService'
+import type { ApiResponse } from './httpService'
+
+// 用户接口
+export interface GameDetail {
+  id: number,
+  title: string,
+  venue_id: number,
+  creator_id: number,
+  game_date: string,
+  start_time: string,
+  end_time: string,
+  max_participants: number,
+  current_participants: number,
+  ntrp_level: string,
+  play_style: string,
+  description: string,
+  status: string,
+  created_at: string,
+  updated_at: string,
+}
+
+// 响应接口
+export interface Response {
+  code: string
+  message: string
+  data: GameDetail
+}
+
+// 发布球局类
+class GameDetailService {
+  // 用户登录
+  async getDetail(id: number): Promise<ApiResponse<Response>> {
+    return httpService.post('/games/detail', { id }, {
+      showLoading: true,
+    })
+  }
+}
+
+// 导出认证服务实例
+export default new GameDetailService()
\ No newline at end of file
diff --git a/src/services/httpService.ts b/src/services/httpService.ts
index 9b7a5fd..fcee8f3 100644
--- a/src/services/httpService.ts
+++ b/src/services/httpService.ts
@@ -15,6 +15,7 @@ export interface RequestConfig {
   needAuth?: boolean // 是否需要token认证
   showLoading?: boolean // 是否显示加载提示
   loadingText?: string // 加载提示文本
+  showToast?: boolean // 是否显示toast
 }
 
 // 响应数据接口
@@ -58,7 +59,7 @@ class HttpService {
   // 构建完整URL
   private buildUrl(url: string, params?: Record<string, any>): string {
     const fullUrl = url.startsWith('http') ? url : `${this.baseURL}${url}`
-    
+
     if (params) {
       const searchParams = new URLSearchParams()
       Object.entries(params).forEach(([key, value]) => {
@@ -69,7 +70,7 @@ class HttpService {
       const queryString = searchParams.toString()
       return queryString ? `${fullUrl}?${queryString}` : fullUrl
     }
-    
+
     return fullUrl
   }
 
@@ -95,7 +96,7 @@ class HttpService {
 
     const logMethod = console[level] || console.log
     const timestamp = new Date().toLocaleTimeString()
-    
+
     if (data) {
       logMethod(`[${timestamp}] HTTP ${level.toUpperCase()}: ${message}`, data)
     } else {
@@ -165,9 +166,9 @@ class HttpService {
   // 处理业务错误
   private handleBusinessError(data: any): void {
     const message = data.message || '操作失败'
-    
+
     this.log('error', `业务错误: ${message}`, data)
-    
+
     Taro.showToast({
       title: message,
       icon: 'none',
@@ -187,7 +188,7 @@ class HttpService {
     } = config
 
     const fullUrl = this.buildUrl(url, method === 'GET' ? params : undefined)
-    
+
     this.log('info', `发起请求: ${method} ${fullUrl}`, {
       data: method !== 'GET' ? data : undefined,
       params: method === 'GET' ? params : undefined
@@ -223,18 +224,18 @@ class HttpService {
       return this.handleResponse<T>(response)
     } catch (error) {
       this.log('error', '请求失败', error)
-      
+
       // 在模拟模式下返回模拟数据
       if (envConfig.enableMock && isDevelopment()) {
         this.log('info', '使用模拟数据')
         return this.getMockResponse<T>(url, method)
       }
-      
+
       Taro.showToast({
         title: '网络连接失败',
         icon: 'none'
       })
-      
+
       throw error
     } finally {
       // 隐藏加载提示
@@ -247,7 +248,7 @@ class HttpService {
   // 获取模拟数据
   private getMockResponse<T>(url: string, method: string): ApiResponse<T> {
     this.log('info', `返回模拟数据: ${method} ${url}`)
-    
+
     return {
       code: 200,
       success: true,
@@ -323,4 +324,4 @@ class HttpService {
 }
 
 // 导出HTTP服务实例
-export default new HttpService() 
\ No newline at end of file
+export default new HttpService()
\ No newline at end of file
diff --git a/src/services/publishService.ts b/src/services/publishService.ts
index 9e73c87..db87e42 100644
--- a/src/services/publishService.ts
+++ b/src/services/publishService.ts
@@ -16,6 +16,12 @@ export interface PublishBallData {
     description: string,
 }
 
+export interface createGameData extends PublishBallData {
+  status: string,
+  created_at: string,
+  updated_at: string,
+}
+
 // 响应接口
 export interface Response {
   code: string
@@ -23,16 +29,74 @@ export interface Response {
   data: any
 }
 
+// export type SourceType = 'history' | 'preset'
+
+export interface getPicturesReq {
+  pageOption: {
+    page: number,
+    pageSize: number,
+  },
+  seachOption: {
+    tag: string,
+    resource_type: string,
+    dateRange: string[],
+  },
+}
+
+export interface getPicturesRes {
+  code: number,
+  message: string,
+  data: {
+    rows: [
+      {
+        user_id: string,
+        resource_type: string,
+        file_name: string,
+        original_name: string,
+        file_path: string,
+        file_url: string,
+        file_size: number,
+        mime_type: string,
+        width: number,
+        height: number,
+        duration: number,
+        thumbnail_url: string,
+        is_public: string,
+        tags: string[],
+        description: string,
+        view_count: number,
+        download_count: number,
+        status: string,
+        last_modify_time: string,
+      }
+    ],
+    count: number,
+    page: number,
+    pageSize: number,
+    totalPages: number,
+  }
+}
+
+function delay(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
 // 发布球局类
 class PublishService {
   // 用户登录
-  async createPersonal(data: PublishBallData): Promise<ApiResponse<Response>> {
+  async createPersonal(data: PublishBallData): Promise<ApiResponse<createGameData>> {
     return httpService.post('/games/create', data, {
       showLoading: true,
       loadingText: '发布中...'
     })
   }
+
+  async getPictures(req: getPicturesReq): Promise<ApiResponse<getPicturesRes>> {
+    return httpService.post('/gallery/sys_img_list', req, {
+      showLoading: true,
+      showToast: false,
+    })
+  }
 }
 
 // 导出认证服务实例
-export default new PublishService() 
\ No newline at end of file
+export default new PublishService()
\ No newline at end of file
diff --git a/src/services/uploadFiles.ts b/src/services/uploadFiles.ts
new file mode 100644
index 0000000..ba5a2eb
--- /dev/null
+++ b/src/services/uploadFiles.ts
@@ -0,0 +1,75 @@
+import httpService from './httpService'
+import type { ApiResponse } from './httpService'
+import Taro from '@tarojs/taro'
+import envConfig from '@/config/env'
+
+// 用户接口
+export interface UploadFilesData {
+  id: string,
+  filePath: string,
+  description?: string,
+  tags?: string,
+  is_public?: 0 | 1,
+}
+
+// {"code":0,"message":"请求成功！","data":{"tags":["test"],"create_time":"2025-08-24 22:51:03","last_modify_time":"2025-08-24 22:51:03","duration":"0","thumbnail_url":"","view_count":"0","download_count":"0","id":16,"user_id":1,"resource_type":"image","file_name":"front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","original_name":"QyoUvEsLG6ci57c7e25cca0845dafed3ee1fde07876d.png","file_path":"http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","file_url":"http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","file_size":17756,"mime_type":"image/png","description":"test","is_public":"1","status":"active","width":0,"height":0,"uploadInfo":{"success":true,"name":"front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","path":"http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","ossPath":"http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png","fileType":"image/png","fileSize":17756,"originalName":"QyoUvEsLG6ci57c7e25cca0845dafed3ee1fde07876d.png","suffix":"png","storagePath":"front/ball/images/63f56978-ffe9-4397-b897-8aca6f4fdcd8.png"}}}
+
+export interface uploadFileResponse {
+  code: number,
+  message: string,
+  data: uploadFileResponseData,
+}
+
+export interface uploadFileResponseData {
+  id: number,
+  user_id: number,
+  file_name: string,
+  original_name: string,
+  file_path: string,
+  file_url: string,
+  file_size: number,
+  resource_type: string,
+  mime_type: string,
+  description: string,
+  tags: string[],
+  is_public: string,
+  view_count: number,
+  download_count: number,
+  created_at: string,
+  updated_at: string,
+}
+
+function delay(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+// 发布球局类
+class UploadApi {
+  async upload(req: UploadFilesData): Promise<{ id: string, data: uploadFileResponseData }> {
+    // return httpService.post('/files/upload', req, {
+    //   showLoading: true,
+    // })
+    const { id, ...rest } = req
+    return Taro.uploadFile({
+      url: `${envConfig.apiBaseURL}/api/gallery/upload`,
+      filePath: rest.filePath,
+      name: 'file',
+      formData: {
+        description: rest.description,
+        tags: rest.tags,
+        is_public: rest.is_public,
+      }
+    }).then(res => {
+      return {
+        id,
+        data: JSON.parse(res.data).data,
+      }
+    })
+  }
+
+  async batchUpload(req: UploadFilesData[]): Promise<{ id: string, data: uploadFileResponseData }[]> {
+    return Promise.all(req.map(item => this.upload(item)))
+  }
+}
+
+// 导出认证服务实例
+export default new UploadApi()
\ No newline at end of file
diff --git a/src/static/publishBall/icon-arrow-left.svg b/src/static/detail/icon-arrow-left.svg
similarity index 100%
rename from src/static/publishBall/icon-arrow-left.svg
rename to src/static/detail/icon-arrow-left.svg
diff --git a/src/static/publishBall/icon-logo-go!.svg b/src/static/detail/icon-logo-go.svg
similarity index 100%
rename from src/static/publishBall/icon-logo-go!.svg
rename to src/static/detail/icon-logo-go.svg
diff --git a/src/static/emptyStatus/comment-empty.png b/src/static/emptyStatus/comment-empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebe1e82b55a2c9711be88cc74a7272831256a8a5
GIT binary patch
literal 11448
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
ZDf#2V?e34V;>KreYN+X|qLpo5{4eYdy(0hs

literal 0
HcmV?d00001

diff --git a/src/static/emptyStatus/comment-failed.png b/src/static/emptyStatus/comment-failed.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c6ff523883e909d34b42471525a0af941bb84b8
GIT binary patch
literal 17514
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
Oh@7;tRJDXj!2bu|<N^Tz

literal 0
HcmV?d00001

diff --git a/src/static/emptyStatus/publish-empty.png b/src/static/emptyStatus/publish-empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b41a267da987f0b47aa7aabf036b050a4d876e8
GIT binary patch
literal 13137
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
M6f}_Kau%=tAOE*o1^@s6

literal 0
HcmV?d00001

diff --git a/src/static/emptyStatus/publish-failed.png b/src/static/emptyStatus/publish-failed.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b8777c904af9c4871d68e1509046629226a236
GIT binary patch
literal 17756
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

literal 0
HcmV?d00001

diff --git a/src/static/publishBall/icon-circle-select-arrow.svg b/src/static/publishBall/icon-circle-select-arrow.svg
new file mode 100644
index 0000000..196e4ed
--- /dev/null
+++ b/src/static/publishBall/icon-circle-select-arrow.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="7" viewBox="0 0 8 7" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M0.756715 3.24011C1.0258 2.96252 1.46896 2.95563 1.74654 3.22471L3.19002 4.62398L6.228 0.32133C6.45099 0.00551998 6.88777 -0.0697295 7.20358 0.153256C7.51939 0.376242 7.59464 0.813022 7.37165 1.12883L3.8619 6.09963C3.74393 6.26671 3.55878 6.37384 3.35514 6.39285C3.15149 6.41186 2.94972 6.34085 2.80286 6.19849L0.772108 4.22994C0.494524 3.96085 0.487632 3.51769 0.756715 3.24011Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/src/static/publishBall/icon-circle-select-ring.svg b/src/static/publishBall/icon-circle-select-ring.svg
new file mode 100644
index 0000000..61d19c5
--- /dev/null
+++ b/src/static/publishBall/icon-circle-select-ring.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
+  <circle cx="7" cy="7" r="7" fill="#161823"/>
+</svg>
\ No newline at end of file
diff --git a/src/static/publishBall/icon-circle-unselect.svg b/src/static/publishBall/icon-circle-unselect.svg
new file mode 100644
index 0000000..aae86ec
--- /dev/null
+++ b/src/static/publishBall/icon-circle-unselect.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
+  <circle cx="7" cy="7" r="6.475" stroke="#161823" stroke-opacity="0.34" stroke-width="1.05"/>
+</svg>
\ No newline at end of file

From 01d3acb6d90f51c0faf3da090ec133886d3f11ba Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sun, 24 Aug 2025 23:56:03 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bubble/index.tsx               |   2 +-
 src/components/CourtType/index.module.scss    |   3 +
 src/components/CourtType/index.tsx            |  31 ++++
 src/components/CustomNavbar/index.module.scss |  47 ++++++
 src/components/CustomNavbar/index.tsx         |  73 +++++++++
 src/components/GamePlayType/index.module.scss |   3 +
 src/components/GamePlayType/index.tsx         |  33 +++-
 src/components/ListCard/index.scss            |   4 +
 src/components/ListCard/index.tsx             |   1 -
 src/components/SearchBar/index.module.scss    |   1 -
 src/config/images.js                          |   4 +-
 src/pages/list/FilterPopup.tsx                |  27 +++-
 src/pages/list/index.config.ts                |   3 +-
 src/pages/list/index.tsx                      | 141 ++++++++++--------
 src/static/list/icon-change.svg               |   6 +
 src/static/logo.svg                           |   3 +
 src/store/global.ts                           |  61 ++++++++
 src/store/listStore.ts                        |  15 +-
 src/utils/getNavbarHeight.ts                  |  13 ++
 types/list/types.ts                           |   7 +-
 20 files changed, 393 insertions(+), 85 deletions(-)
 create mode 100644 src/components/CourtType/index.module.scss
 create mode 100644 src/components/CourtType/index.tsx
 create mode 100644 src/components/CustomNavbar/index.module.scss
 create mode 100644 src/components/CustomNavbar/index.tsx
 create mode 100644 src/static/list/icon-change.svg
 create mode 100644 src/static/logo.svg
 create mode 100644 src/store/global.ts
 create mode 100644 src/utils/getNavbarHeight.ts

diff --git a/src/components/Bubble/index.tsx b/src/components/Bubble/index.tsx
index 8f07166..30dee30 100644
--- a/src/components/Bubble/index.tsx
+++ b/src/components/Bubble/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import styles from "./index.module.scss";
 import BubbleItem from "./BubbleItem";
-import {BubbleProps} from '../../../types/list/types'
+import {BubbleOption, BubbleProps} from '../../../types/list/types'
 
 const Bubble: React.FC<BubbleProps> = ({
   options,
diff --git a/src/components/CourtType/index.module.scss b/src/components/CourtType/index.module.scss
new file mode 100644
index 0000000..f7a1246
--- /dev/null
+++ b/src/components/CourtType/index.module.scss
@@ -0,0 +1,3 @@
+.courtTypeWrapper {
+  margin-bottom: 18px;
+}
\ No newline at end of file
diff --git a/src/components/CourtType/index.tsx b/src/components/CourtType/index.tsx
new file mode 100644
index 0000000..7f8b163
--- /dev/null
+++ b/src/components/CourtType/index.tsx
@@ -0,0 +1,31 @@
+import { View, Image } from "@tarojs/components";
+import TitleComponent from "@/components/Title";
+import img from "@/config/images";
+import Bubble from "../Bubble";
+import { BubbleOption } from "types/list/types";
+import styles from './index.module.scss'
+
+interface IProps {
+  name: string;
+  options: BubbleOption[];
+  value: string;
+  onChange: (name: string, value: string) => void;
+}
+const GamePlayType = (props: IProps) => {
+  const { name, onChange , options, value} = props;
+  return (
+    <View className={styles.courtTypeWrapper}>
+      <TitleComponent title="场地类型" icon={<Image src={img.ICON_SITE} />} />
+      <Bubble
+        options={options}
+        value={value}
+        onChange={onChange}
+        layout="grid"
+        size="small"
+        columns={3}
+        name={name}
+      />
+    </View>
+  );
+};
+export default GamePlayType;
diff --git a/src/components/CustomNavbar/index.module.scss b/src/components/CustomNavbar/index.module.scss
new file mode 100644
index 0000000..b3a7de1
--- /dev/null
+++ b/src/components/CustomNavbar/index.module.scss
@@ -0,0 +1,47 @@
+.customerNavbar {
+  // background-color: red;
+
+  .container {
+    padding-left: 17px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .line {
+    width: 1px;
+    height: 25px;
+    background-color: #0000000F;
+  }
+
+  .logo {
+    width: 60px;
+    height: 34px;
+  }
+
+  .change {
+    width: 12px;
+    height: 12px;
+  }
+
+  .cityWrapper {
+    line-height: 20px;
+  }
+
+  .city {
+    font-weight: 600;
+    font-size: 13px;
+    line-height: 20px;
+  }
+
+  .infoWrapper {
+    line-height: 12px;
+  }
+
+  .info {
+    font-weight: 400;
+    font-size: 10px;
+    line-height: 12px;
+    color: #3C3C4399;
+  }
+}
\ No newline at end of file
diff --git a/src/components/CustomNavbar/index.tsx b/src/components/CustomNavbar/index.tsx
new file mode 100644
index 0000000..4d2e368
--- /dev/null
+++ b/src/components/CustomNavbar/index.tsx
@@ -0,0 +1,73 @@
+import { View, Text, Image } from "@tarojs/components";
+import img from "@/config/images";
+import { getCurrentLocation } from "@/utils/locationUtils";
+import { getNavbarHeight } from "@/utils/getNavbarHeight";
+import styles from "./index.module.scss";
+import { useEffect } from "react";
+import { useGlobalState } from "@/store/global";
+import { useListState } from "@/store/listStore";
+
+const ListHeader = () => {
+  const { statusBarHeight, navbarHeight, totalHeight } = getNavbarHeight();
+  const {
+    updateState,
+    location,
+    getLocationText,
+    getLocationLoading,
+    getNavbarHeightInfo,
+  } = useGlobalState();
+  const { gamesNum } = useListState();
+
+  // 获取位置信息
+  const getCurrentLocal = () => {
+    updateState({
+      getLocationLoading: true,
+    });
+    getCurrentLocation().then((res) => {
+      updateState({
+        getLocationLoading: false,
+        location: res || {},
+      });
+    });
+  };
+  useEffect(() => {
+    getNavbarHeightInfo();
+    getCurrentLocal();
+  }, []);
+
+  const currentAddress = getLocationLoading
+    ? getLocationText
+    : location?.address;
+
+  return (
+    <View
+      className={styles.customerNavbar}
+      style={{ height: `${totalHeight}px` }}
+    >
+      <View
+        className={styles.container}
+        style={{
+          height: `${navbarHeight}px`,
+          paddingTop: `${statusBarHeight}px`,
+        }}
+      >
+        {/* logo */}
+        <Image src={img.ICON_LOGO} className={styles.logo} />
+        <View className={styles.line} />
+        <View className={styles.content}>
+          <View className={styles.cityWrapper}>
+            {/* 位置 */}
+            <Text className={styles.city}>{currentAddress}</Text>
+            {!getLocationLoading && (
+              <Image src={img.ICON_CHANGE} className={styles.change} />
+            )}
+          </View>
+          <View className={styles.infoWrapper}>
+            <Text className={styles.info}>附近${gamesNum}场球局</Text>
+          </View>
+        </View>
+      </View>
+    </View>
+  );
+};
+export default ListHeader;
diff --git a/src/components/GamePlayType/index.module.scss b/src/components/GamePlayType/index.module.scss
index e69de29..2eebf1e 100644
--- a/src/components/GamePlayType/index.module.scss
+++ b/src/components/GamePlayType/index.module.scss
@@ -0,0 +1,3 @@
+.gamePlayWrapper {
+  margin-bottom: 18px;
+}
\ No newline at end of file
diff --git a/src/components/GamePlayType/index.tsx b/src/components/GamePlayType/index.tsx
index d426d8b..7a70de0 100644
--- a/src/components/GamePlayType/index.tsx
+++ b/src/components/GamePlayType/index.tsx
@@ -1,13 +1,31 @@
-import PopupGameplay from "../../pages/publishBall/components/PopupGameplay";
-import { View, Text, Image } from "@tarojs/components";
+// import PopupGameplay from "../../pages/publishBall/components/PopupGameplay";
+import { View, Image } from "@tarojs/components";
 import TitleComponent from "@/components/Title";
 import img from "@/config/images";
-
-const GamePlayType = () => {
+import Bubble from "../Bubble";
+import styles from "./index.module.scss";
+import { BubbleOption } from "types/list/types";
+interface IProps {
+  name: string;
+  value: string;
+  options: BubbleOption[];
+  onChange: (name: string, value: string) => void;
+}
+const GamePlayType = (props: IProps) => {
+  const { name, onChange, value, options } = props;
   return (
-    <View>
+    <View className={styles.gamePlayWrapper}>
       <TitleComponent title="玩法" icon={<Image src={img.ICON_SITE} />} />
-      <PopupGameplay
+      <Bubble
+        options={options}
+        value={value}
+        onChange={onChange}
+        layout="grid"
+        size="small"
+        columns={3}
+        name={name}
+      />
+      {/* <PopupGameplay
         onClose={() => {
           console.log("onClose");
         }}
@@ -19,9 +37,10 @@ const GamePlayType = () => {
           { label: "不限", value: "不限" },
           { label: "单打", value: "单打" },
           { label: "双打", value: "双打" },
+          { label: "娱乐", value: "娱乐" },
           { label: "拉球", value: "拉球" },
         ]}
-      />
+      /> */}
     </View>
   );
 };
diff --git a/src/components/ListCard/index.scss b/src/components/ListCard/index.scss
index 23ed8af..3cf2e16 100644
--- a/src/components/ListCard/index.scss
+++ b/src/components/ListCard/index.scss
@@ -38,6 +38,10 @@
 .location {
   display: flex;
   align-items: center;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 18px;
+  color: #3C3C4399;
 }
 
 .location-position {
diff --git a/src/components/ListCard/index.tsx b/src/components/ListCard/index.tsx
index 56bbc42..a5f5f28 100644
--- a/src/components/ListCard/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -59,7 +59,6 @@ const ListCard: React.FC<ListCardProps> = ({
       </View>
     );
   };
-  console.log("===ttt", !title);
   return (
     <View className="list-item">
       {/* 左侧内容区域 */}
diff --git a/src/components/SearchBar/index.module.scss b/src/components/SearchBar/index.module.scss
index cc20edd..fc822f1 100644
--- a/src/components/SearchBar/index.module.scss
+++ b/src/components/SearchBar/index.module.scss
@@ -1,5 +1,4 @@
 .searchBar {
-  --nutui-searchbar-padding: 10px 15px;
   --nutui-searchbar-font-size: 16px;
   --nutui-searchbar-input-height: 44px;
   --nutui-searchbar-content-border-radius: 44px;
diff --git a/src/config/images.js b/src/config/images.js
index f647a3d..d730514 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -25,5 +25,7 @@ export default {
     ICON_HEART_CIRCLE: require('@/static/publishBall/icon-heartcircle.png'),
     ICON_ADD: require('@/static/publishBall/icon-add.svg'),
     ICON_COPY: require('@/static/publishBall/icon-arrow-right.svg'),
-    ICON_DELETE: require('@/static/publishBall/icon-delete.svg')
+    ICON_DELETE: require('@/static/publishBall/icon-delete.svg'),
+    ICON_LOGO: require('@/static/logo.svg'),
+    ICON_CHANGE: require('@/static/list/icon-change.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index 8beea3a..382d862 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -8,6 +8,9 @@ import { Image } from "@tarojs/components";
 import img from "../../config/images";
 import { useListStore } from "src/store/listStore";
 import { FilterPopupProps } from "../../../types/list/types";
+// 场地
+import CourtType from "@/components/CourtType";
+// 玩法
 import GamePlayType from "@/components/GamePlayType";
 
 const FilterPopup = (props: FilterPopupProps) => {
@@ -20,10 +23,11 @@ const FilterPopup = (props: FilterPopupProps) => {
     onClear,
     visible,
     onClose,
+    statusNavbarHeigh,
   } = props;
 
   const store = useListStore() || {};
-  const { timeBubbleData, locationOptions } = store;
+  const { timeBubbleData, locationOptions, gamePlayOptions } = store;
 
   const handleFilterChange = (name, value) => {
     onChange({ [name]: value });
@@ -42,7 +46,8 @@ const FilterPopup = (props: FilterPopupProps) => {
         round
         visible={visible}
         onClose={onClose}
-        // closeOnOverlayClick={true}
+        style={{ marginTop: statusNavbarHeigh + "px" }}
+        overlayStyle={{ marginTop: statusNavbarHeigh + "px" }}
       >
         <div className={styles.filterPopupWrapper}>
           {/* 时间气泡选项 */}
@@ -68,7 +73,7 @@ const FilterPopup = (props: FilterPopupProps) => {
           />
 
           {/* 场次气泡选项 */}
-          <div>
+          {/* <div>
             <TitleComponent
               title="场地类型"
               icon={<Image src={img.ICON_SITE} />}
@@ -82,9 +87,21 @@ const FilterPopup = (props: FilterPopupProps) => {
               columns={3}
               name="site"
             />
-          </div>
+          </div> */}
+          {/* CourtType */}
+          <CourtType
+            onChange={handleFilterChange}
+            name="court_type"
+            options={locationOptions}
+            value={filterOptions?.site}
+          />
           {/* 玩法 */}
-          <GamePlayType />
+          <GamePlayType
+            onChange={handleFilterChange}
+            name="game_play"
+            options={gamePlayOptions}
+            value={filterOptions?.game_play}
+          />
           {/* 按钮 */}
           <div className={styles.filterPopupBtnWrapper}>
             <Button
diff --git a/src/pages/list/index.config.ts b/src/pages/list/index.config.ts
index 17f6db0..d49b1ea 100644
--- a/src/pages/list/index.config.ts
+++ b/src/pages/list/index.config.ts
@@ -1,5 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
   enablePullDownRefresh: true,
-  backgroundTextStyle: 'dark'
+  backgroundTextStyle: 'dark',
+  navigationStyle: 'custom',
 })
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 9d5a251..7c12b7f 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -7,14 +7,19 @@ import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
 import styles from "./index.module.scss";
 import { useEffect } from "react";
-import Taro from "@tarojs/taro";
-import { useListStore } from "../../store/listStore";
+import Taro, { useReachBottom } from "@tarojs/taro";
+import { useListStore } from "@/store/listStore";
+import {useGlobalState} from '@/store/global'
 import { View } from "@tarojs/components";
+import CustomerNavBar from "@/components/CustomNavbar";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
   const store = useListStore() || {};
-  console.log("===store===", store);
+  
+    const {statusNavbarHeightInfo } = useGlobalState() || {}
+    // console.log("===store===", store);
+    // console.log('===statusNavbarHeightInfo', statusNavbarHeightInfo)
   const {
     isShowFilterPopup,
     error,
@@ -33,6 +38,12 @@ const ListPage = () => {
     distanceQuickFilter,
   } = store;
 
+  useReachBottom(() => {
+    console.log("触底了");
+    // 调用 store 的加载更多方法
+    // loadMoreMatches();
+  });
+
   useEffect(() => {
     // 页面加载时获取数据
     fetchMatches();
@@ -143,10 +154,6 @@ const ListPage = () => {
     updateState({ isShowFilterPopup: !isShowFilterPopup });
   };
 
-  const updateFilterSelect = (params) => {
-    updateState(params);
-  };
-
   /**
    * @description 更新筛选条件
    * @param {Record<string, any>} params 筛选项
@@ -166,69 +173,75 @@ const ListPage = () => {
       },
     });
   };
-  console.log("===visible", isShowFilterPopup);
+
   return (
-    <View className={styles.listPage}>
-      <View className={styles.listTopSearchWrapper}>
-        <SearchBar
-          handleFilterIcon={toggleShowPopup}
-          isSelect={filterCount > 0}
-          filterCount={filterCount}
-          onChange={handleSearchChange}
-        />
-        {/* 综合筛选 */}
-        {isShowFilterPopup && (
-          <div>
-            <FilterPopup
-              loading={loading}
-              onCancel={toggleShowPopup}
-              onConfirm={toggleShowPopup}
-              onChange={handleUpdateFilterOptions}
-              filterOptions={filterOptions}
-              onClear={clearFilterOptions}
-              visible={isShowFilterPopup}
-              onClose={toggleShowPopup}
+    <>
+      <CustomerNavBar />
+
+      <View className={styles.listPage}>
+        <View className={styles.listTopSearchWrapper}>
+          <SearchBar
+            handleFilterIcon={toggleShowPopup}
+            isSelect={filterCount > 0}
+            filterCount={filterCount}
+            onChange={handleSearchChange}
+          />
+          {/* 综合筛选 */}
+          {isShowFilterPopup && (
+            <div>
+              <FilterPopup
+                loading={loading}
+                onCancel={toggleShowPopup}
+                onConfirm={toggleShowPopup}
+                onChange={handleUpdateFilterOptions}
+                filterOptions={filterOptions}
+                onClear={clearFilterOptions}
+                visible={isShowFilterPopup}
+                onClose={toggleShowPopup}
+                statusNavbarHeigh={statusNavbarHeightInfo?.totalHeight}
+              />
+            </div>
+          )}
+          {/* 筛选 */}
+          <div className={styles.listTopFilterWrapper}>
+            {/* 全城筛选 */}
+            <CityFilter
+              options={distanceData}
+              value={distanceQuickFilter?.distance}
+              wrapperClassName={styles.menuFilter}
+              onChange={handleDistanceOrQuickChange}
+              name="distance"
+            />
+            {/* 智能排序 */}
+            <Menu
+              options={quickFilterData}
+              value={distanceQuickFilter?.quick}
+              onChange={handleDistanceOrQuickChange}
+              wrapperClassName={styles.menuFilter}
+              name="quick"
             />
           </div>
-        )}
-        {/* 筛选 */}
-        <div className={styles.listTopFilterWrapper}>
-          {/* 全城筛选 */}
-          <CityFilter
-            options={distanceData}
-            value={distanceQuickFilter?.distance}
-            wrapperClassName={styles.menuFilter}
-            onChange={handleDistanceOrQuickChange}
-            name="distance"
-          />
-          {/* 智能排序 */}
-          <Menu
-            options={quickFilterData}
-            value={distanceQuickFilter?.quick}
-            onChange={handleDistanceOrQuickChange}
-            wrapperClassName={styles.menuFilter}
-            name="quick"
-          />
-        </div>
-      </View>
+        </View>
 
-      <View className={styles.listContentWrapper}>
-        {/* 列表内容 */}
-        <List>
-          {!loading &&
-            matches.length > 0 &&
-            matches.map((match, index) => (
-              <ListCard key={match.id || index} {...match} />
-            ))}
-        </List>
+        <View className={styles.listContentWrapper}>
+          {/* 列表内容 */}
+          <List>
+            {!loading &&
+              matches.length > 0 &&
+              matches.map((match, index) => (
+                <ListCard key={match.id || index} {...match} />
+              ))}
+          </List>
 
-        {/* 空状态 */}
-        {loading &&
-          new Array(10).fill(0).map(() => {
-            return <ListCardSkeleton />;
-          })}
+          {/* 空状态 */}
+          {loading &&
+            matches.length === 0 &&
+            new Array(10).fill(0).map(() => {
+              return <ListCardSkeleton />;
+            })}
+        </View>
       </View>
-    </View>
+    </>
   );
 };
 
diff --git a/src/static/list/icon-change.svg b/src/static/list/icon-change.svg
new file mode 100644
index 0000000..dcd21d3
--- /dev/null
+++ b/src/static/list/icon-change.svg
@@ -0,0 +1,6 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5 4.75H1.5" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.5 1.75L10.5 4.75" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.69977 7.25H10.6998" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.69971 7.25L4.69972 10.25" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/logo.svg b/src/static/logo.svg
new file mode 100644
index 0000000..63be4ce
--- /dev/null
+++ b/src/static/logo.svg
@@ -0,0 +1,3 @@
+<svg width="58" height="26" viewBox="0 0 58 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.354376 14.418V11.5176C0.354376 4.85547 4.53797 0.583984 11.2352 0.583984C13.8895 0.583984 16.3505 1.28711 18.1434 2.42969C19.9013 3.51953 21.0263 5.01367 21.0263 6.54297C21.0263 8.16016 19.8837 9.28516 18.2489 9.28516C17.5458 9.28516 16.9657 9.07422 16.4559 8.72266C15.0321 7.77344 13.9071 6.38477 11.7802 6.38477C8.7743 6.38477 7.29774 8.21289 7.29774 11.8867V14.4004C7.29774 18.0215 8.7743 19.9375 11.6044 19.9375C13.7138 19.9375 15.1376 18.707 15.1376 16.9316V16.4395H14.0653C12.3251 16.4395 11.3759 15.5957 11.3759 14.0664C11.3759 12.5371 12.3075 11.7461 14.0653 11.7461H17.8798C20.5165 11.7461 21.6591 12.8535 21.6591 15.3672V16.3164C21.6591 21.8887 17.5809 25.5273 11.3055 25.5273C4.41492 25.5273 0.354376 21.3613 0.354376 14.418ZM24.4648 14.4004V11.7988C24.4648 4.78516 28.4902 0.583984 35.4688 0.583984C42.4473 0.583984 46.4551 4.80273 46.4551 11.7988V14.4004C46.4551 21.3613 42.4473 25.5273 35.4688 25.5273C28.4902 25.5273 24.4648 21.3438 24.4648 14.4004ZM31.4082 11.7461V14.3828C31.4082 17.916 32.9023 19.9551 35.4688 19.9551C38.0352 19.9551 39.5117 17.916 39.5117 14.3828V11.7461C39.5117 8.21289 38.0352 6.15625 35.4688 6.15625C32.9023 6.15625 31.4082 8.21289 31.4082 11.7461ZM50.4562 14.9453L49.9464 3.67773C49.8585 1.72656 51.3527 0.126953 53.4796 0.126953C55.6066 0.126953 57.1359 1.72656 57.0304 3.67773L56.4679 14.9453C56.3624 16.6504 55.0792 17.7754 53.462 17.7754C51.8097 17.7754 50.5265 16.5801 50.4562 14.9453ZM49.9816 22.2578C49.9816 20.3418 51.5636 19.1641 53.4972 19.1641C55.4132 19.1641 56.9777 20.3418 56.9777 22.2578C56.9777 24.1914 55.4132 25.3691 53.4972 25.3691C51.5636 25.3691 49.9816 24.1914 49.9816 22.2578Z" fill="black"/>
+</svg>
diff --git a/src/store/global.ts b/src/store/global.ts
new file mode 100644
index 0000000..40d07b2
--- /dev/null
+++ b/src/store/global.ts
@@ -0,0 +1,61 @@
+import { create } from 'zustand'
+import { getNavbarHeight } from '@/utils/getNavbarHeight'
+
+interface GlobalState {
+  location: Record<string, any>
+  getLocationLoading: boolean
+  getLocationText: string
+  statusNavbarHeightInfo: {
+    statusBarHeight: number
+    navbarHeight: number
+    totalHeight: number
+  }
+}
+
+interface GlobalActions {
+  updateState: (payload: Record<string, any>) => void
+  getNavbarHeightInfo: () => void
+}
+// 完整的 Store 类型
+type GlobalStore = GlobalState & GlobalActions
+
+// 创建 store
+export const useGlobalStore = create<GlobalStore>()((set, get) => ({
+  // 位置信息
+  location: {},
+  // 正在获取位置信息
+  getLocationLoading: false,
+  // 获取位置信息文本
+  getLocationText: '定位中...',
+
+  // 状态栏和导航栏高度信息
+  statusNavbarHeightInfo: {
+    statusBarHeight: 0,
+    navbarHeight: 0,
+    totalHeight: 0
+  },
+
+  // 获取导航栏高度信息
+  getNavbarHeightInfo: () => {
+    const { statusBarHeight, navbarHeight } = getNavbarHeight();
+    set({
+      statusNavbarHeightInfo: {
+        statusBarHeight,
+        navbarHeight,
+        totalHeight: statusBarHeight + navbarHeight
+      }
+    })
+  },
+
+  // 更新store数据
+  updateState: (payload: Record<string, any>) => {
+    const state = get();
+    set({
+      ...state,
+      ...(payload || {})
+    })
+  }
+}))
+
+// 导出便捷的 hooks
+export const useGlobalState = () => useGlobalStore((state) => state)
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index b5eb210..b3fe98e 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -9,8 +9,8 @@ const defaultFilterOptions: IFilterOptions = {
   location: '', // 位置
   time: '', // 时间
   ntrp: [1.0, 5.0], // NTRP 水平区间
-  site: '', // 场地类型
-  wanfa: '', // 玩法
+  court_type: '', // 场地类型
+  game_play: '', // 玩法
 };
 
 const defaultDistance = 'all'; // 默认距离
@@ -65,6 +65,16 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     { id: 2, label: "室外", value: "2" },
     { id: 3, label: "半室外", value: "3" },
   ],
+  // 玩法数据
+  gamePlayOptions: [
+    { id: 1, label: "不限", value: "不限" },
+    { id: 2, label: "单打", value: "单打" },
+    { id: 3, label: "双打", value: "双打" },
+    { id: 4, label: "娱乐", value: "娱乐" },
+    { id: 5, label: "拉球", value: "拉球" },
+  ],
+  // 球局数量
+  gamesNum: 124,
 
   // 获取比赛数据
   fetchMatches: async (params) => {
@@ -106,6 +116,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
 
   // 更新综合筛选项
   updateFilterOptions: (payload: Record<string, any>) => {
+    console.log('===更新综合筛选项', payload)
     const preFilterOptions = get()?.filterOptions || {}
     const filterOptions = { ...preFilterOptions, ...payload }
     const filterCount = Object.values(filterOptions).filter(Boolean).length
diff --git a/src/utils/getNavbarHeight.ts b/src/utils/getNavbarHeight.ts
new file mode 100644
index 0000000..0332c5b
--- /dev/null
+++ b/src/utils/getNavbarHeight.ts
@@ -0,0 +1,13 @@
+import Taro from "@tarojs/taro";
+
+export const getNavbarHeight = (): { statusBarHeight: number; navbarHeight: number; totalHeight: number; } => {
+  const systemInfo = Taro.getSystemInfoSync();
+  const statusBarHeight = systemInfo?.statusBarHeight || 0;
+  const isIOS = systemInfo.platform === "ios";
+  const navbarHeight = isIOS ? 44 : 48;
+  return {
+    statusBarHeight,
+    navbarHeight,
+    totalHeight: statusBarHeight + navbarHeight,
+  };
+};
\ No newline at end of file
diff --git a/types/list/types.ts b/types/list/types.ts
index 789164c..6d71c50 100644
--- a/types/list/types.ts
+++ b/types/list/types.ts
@@ -16,8 +16,8 @@ export interface IFilterOptions {
   location: string
   time: string
   ntrp: [number, number]
-  site: string
-  wanfa: string
+  court_type: string
+  game_play: string
 }
 export interface ListState {
   matches: TennisMatch[]
@@ -37,6 +37,8 @@ export interface ListState {
   }
   timeBubbleData: BubbleOption[]
   locationOptions: BubbleOption[]
+  gamePlayOptions: BubbleOption[]
+  gamesNum: number
 }
 
 export interface ListState {
@@ -139,6 +141,7 @@ export interface FilterPopupProps {
   onClear: () => void;
   visible: boolean;
   onClose: () => void;
+  statusNavbarHeigh: number
 }
 
 // 列表卡片

From 1e158e111c439f1151442b44e32b6bc8b632e492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Mon, 25 Aug 2025 08:56:44 +0800
Subject: [PATCH 15/22] feat: uploadCover

---
 src/components/UploadCover/index.tsx          | 12 +++++----
 src/components/UploadCover/upload-from-wx.tsx |  6 ++---
 .../SelectStadium/StadiumDetail.tsx           | 27 ++++++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/components/UploadCover/index.tsx b/src/components/UploadCover/index.tsx
index 5698f0a..e2982b3 100644
--- a/src/components/UploadCover/index.tsx
+++ b/src/components/UploadCover/index.tsx
@@ -22,8 +22,9 @@ export interface UploadCoverProps {
   value: CoverImageValue[]
   onChange: (value: CoverImageValue[] | ((prev: CoverImageValue[]) => CoverImageValue[])
 ) => void
-  source: source
-  maxCount: number
+  source?: source
+  maxCount?: number
+  align?: 'center' | 'left'
 }
 
 // const values = [
@@ -51,9 +52,11 @@ export default function UploadCover(props: UploadCoverProps) {
   const {
     value = [],
     onChange = () => void 0,
-    source = ['album', 'history', 'preset'],
+    source = ['album', 'history', 'preset'] as source,
     maxCount = 9,
+    align = 'center',
   } = props
+
   const [visible, setVisible] = useState(false)
 
   const onAdd = useCallback((images: CoverImageValue[]) => {
@@ -64,7 +67,6 @@ export default function UploadCover(props: UploadCoverProps) {
   const onWxAdd = useCallback((images: CoverImageValue[], onFileUploaded: Promise<{ id: string, data: uploadFileResponseData }[]>) => {
     onAdd(images)
     onFileUploaded.then(res => {
-      console.log(res, 11111)
       onAdd(res.map(item => ({
         id: item.id,
         url: item.data.file_path,
@@ -102,7 +104,7 @@ export default function UploadCover(props: UploadCoverProps) {
           }
         </View>
       </CommonPopup>
-      <div className={`upload-cover-root ${value.length === 0 ? 'upload-cover-act-center' : ''}`}>
+      <div className={`upload-cover-root ${value.length === 0 && align === 'center' ? 'upload-cover-act-center' : ''}`}>
         {value.length < maxCount && (
           <div className="upload-cover-act" onClick={() => setVisible(true)}>
             <Image className='upload-cover-act-icon' src={img.ICON_ADD} />
diff --git a/src/components/UploadCover/upload-from-wx.tsx b/src/components/UploadCover/upload-from-wx.tsx
index 05c0351..841c27b 100644
--- a/src/components/UploadCover/upload-from-wx.tsx
+++ b/src/components/UploadCover/upload-from-wx.tsx
@@ -33,9 +33,9 @@ export default function UploadFromWx(props: UploadFromWxProps) {
         id: (Date.now() + count++).toString(),
       }))
       const onFileUploaded = uploadApi.batchUpload(files)
-      onAdd(res.tempFiles.map(item => ({
-        id: Date.now().toString(),
-        url: item.path,
+      onAdd(files.map(item => ({
+        id: item.id,
+        url: item.filePath,
       })), onFileUploaded) // TODO: add loading state
     })
   }
diff --git a/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx b/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx
index 07d8f98..85bf43c 100644
--- a/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx
+++ b/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx
@@ -3,7 +3,8 @@ import Taro from '@tarojs/taro'
 import { View, Text, Image } from '@tarojs/components'
 import images from '@/config/images'
 import TextareaTag from '@/components/TextareaTag'
-import CoverImageUpload, { type CoverImage } from '@/components/ImageUpload'
+// import CoverImageUpload, { type CoverImage } from '@/components/ImageUpload'
+import UploadCover, { type CoverImageValue } from '@/components/UploadCover'
 import { useDictionaryActions } from '@/store/dictionaryStore'
 import './StadiumDetail.scss'
 
@@ -18,7 +19,7 @@ export interface Stadium {
   court_surface?: string
   description?: string
   description_tag?: string[]
-  venue_image_list?: CoverImage[]
+  venue_image_list?: CoverImageValue[]
 }
 
 interface StadiumDetailProps {
@@ -103,7 +104,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
     court_type: court_type[0] || '',
     court_surface: court_surface[0] || '',
     additionalInfo: '',
-    venue_image_list: [] as CoverImage[],
+    venue_image_list: [] as CoverImageValue[],
     description:{
       description: '',
       description_tag: []
@@ -208,9 +209,21 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
         if (item.type === 'image') {
           return (
             <SectionContainer key={item.label} title={item.label} prop={item.prop}>
-              <CoverImageUpload
-                images={formData[item.prop]}
-                onChange={(images) => updateFormData(item.prop, images)}
+              <UploadCover
+                value={formData[item.prop]}
+                onChange={(value) => {
+                  console.log(value, 'value')
+                  if (value instanceof Function) {
+                    const newValue = value(formData[item.prop])
+                    console.log(newValue, 'newValue')
+                    updateFormData(item.prop, newValue)
+                  } else {
+                    updateFormData(item.prop, value)
+                  }
+                }}
+                maxCount={9}
+                source={['album', 'history', 'preset']}
+                align='left'
               />
             </SectionContainer>
           )
@@ -222,4 +235,4 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
   )
 })
 
-export default StadiumDetail 
\ No newline at end of file
+export default StadiumDetail
\ No newline at end of file

From f184624c33566474283de1ddaa0d14e2cc172c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Tue, 26 Aug 2025 00:02:42 +0800
Subject: [PATCH 16/22] feat: detail static

---
 src/components/UploadCover/index.tsx          |   1 +
 src/config/images.js                          |   8 +
 src/pages/detail/index.scss                   | 853 +++++++++++++++++-
 src/pages/detail/index.tsx                    | 394 +++++++-
 src/scss/images.scss                          |   8 +
 .../{detailApi.ts => detailService.ts}        |   0
 src/services/publishService.ts                |   2 +-
 src/static/detail/icon-application-add.svg    |   4 +
 src/static/detail/icon-arrow-right.svg        |   3 +
 src/static/detail/icon-comment-dark.svg       |   7 +
 src/static/detail/icon-comment.svg            |   7 +
 src/static/detail/icon-map.svg                |   7 +
 src/static/detail/icon-notice.svg             |   5 +
 src/static/detail/icon-share-dark.svg         |   3 +
 src/static/detail/icon-weather-sun.svg        |  18 +
 15 files changed, 1291 insertions(+), 29 deletions(-)
 rename src/services/{detailApi.ts => detailService.ts} (100%)
 create mode 100644 src/static/detail/icon-application-add.svg
 create mode 100644 src/static/detail/icon-arrow-right.svg
 create mode 100644 src/static/detail/icon-comment-dark.svg
 create mode 100644 src/static/detail/icon-comment.svg
 create mode 100644 src/static/detail/icon-map.svg
 create mode 100644 src/static/detail/icon-notice.svg
 create mode 100644 src/static/detail/icon-share-dark.svg
 create mode 100644 src/static/detail/icon-weather-sun.svg

diff --git a/src/components/UploadCover/index.tsx b/src/components/UploadCover/index.tsx
index e2982b3..08927d0 100644
--- a/src/components/UploadCover/index.tsx
+++ b/src/components/UploadCover/index.tsx
@@ -60,6 +60,7 @@ export default function UploadCover(props: UploadCoverProps) {
   const [visible, setVisible] = useState(false)
 
   const onAdd = useCallback((images: CoverImageValue[]) => {
+    // FIXME: prev is not latest value
     onChange(prev => mergeCoverImages(prev, images))
     setVisible(false)
   }, [value])
diff --git a/src/config/images.js b/src/config/images.js
index d5800c0..13c69c9 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -33,4 +33,12 @@ export default {
     ICON_CIRCLE_SELECT_ARROW: require('@/static/publishBall/icon-circle-select-arrow.svg'),
     ICON_LOGO: require('@/static/logo.svg'),
     ICON_CHANGE: require('@/static/list/icon-change.svg'),
+    ICON_WEATHER_SUN: require('@/static/detail/icon-weather-sun.svg'),
+    ICON_DETAIL_MAP: require('@/static/detail/icon-map.svg'),
+    ICON_DETAIL_ARROW_RIGHT: require('@/static/detail/icon-arrow-right.svg'),
+    ICON_DETAIL_NOTICE: require('@/static/detail/icon-notice.svg'),
+    ICON_DETAIL_APPLICATION_ADD: require('@/static/detail/icon-application-add.svg'),
+    ICON_DETAIL_COMMENT: require('@/static/detail/icon-comment.svg'),
+    ICON_DETAIL_COMMENT_DARK: require('@/static/detail/icon-comment-dark.svg'),
+    ICON_DETAIL_SHARE: require('@/static/detail/icon-share-dark.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
index 267fa4a..4f7fa63 100644
--- a/src/pages/detail/index.scss
+++ b/src/pages/detail/index.scss
@@ -3,6 +3,7 @@
 .detail-page {
   width: 100%;
   height: 100%;
+  // padding-bottom: env(safe-area-inset-bottom);
 
   .custom-navbar {
     height: 56px; /* 通常与原生导航栏高度一致 */
@@ -11,7 +12,10 @@
     justify-content: center;
     // background-color: #fff;
     color: #000;
-    padding-top: 36px; /* 适配状态栏 */
+    padding-top: 44px; /* 适配状态栏 */
+    position: sticky;
+    top: 0;
+    z-index: 100;
   }
 
   .detail-navigator {
@@ -94,9 +98,848 @@
     }
   }
 
-  .detail-text {
-      font-size: 40rpx;
-      margin-top: 20px;
-      transition: color 0.3s ease-in;
+  .detail-page-content {
+
+    &-avatar-tags {
+      padding: 20px 20px 0;
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      gap: 6px;
+
+      &-avatar {
+        width: 28px;
+        height: 28px;
+        border-radius: 50%;
+        overflow: hidden;
+
+        &-image {
+          width: 28px;
+          height: 28px;
+          border-radius: 50%;
+        }
+      }
+
+      &-tags {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+
+        &-tag {
+          display: flex;
+          height: 28px;
+          padding: 6px 12px;
+          box-sizing: border-box;
+          align-items: center;
+          gap: 4px;
+          border-radius: 999px;
+          border: 0.5px solid rgba(255, 255, 255, 0.08);
+          background: rgba(255, 255, 255, 0.25);
+          color: #fff;
+          font-size: 13px;
+          font-weight: 500;
+          line-height: 20px;
+          letter-spacing: -0.23px;
+          text-align: center;
+        }
+      }
     }
+
+    &-title {
+      padding: 20px 20px 0;
+      box-sizing: border-box;
+
+      &-text {
+        overflow: hidden;
+        color: #FFF;
+        font-feature-settings: 'liga' off, 'clig' off;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 22px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 32px; /* 145.455% */
+      }
+    }
+
+    &-game-info {
+      &-date-weather {
+        padding: 20px 20px 0;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        // gap: 12px;
+
+        &-calendar-date {
+          width: 60%;
+          display: flex;
+          align-items: center;
+          gap: 16px;
+
+          &-calendar {
+            display: flex;
+            width: 48px;
+            height: 48px;
+            padding-bottom: 6px;
+            box-sizing: border-box;
+            flex-direction: column;
+            align-items: center;
+            gap: 4px;
+            border-radius: 12px;
+            // border: 0.5px solid rgba(255, 255, 255, 0.08);
+            background: rgba(255, 255, 255, 0.25);
+            overflow: hidden;
+            color: #FFF;
+
+            .month {
+              width: 100%;
+              height: 18px;
+              font-size: 10px;
+              display: flex;
+              padding: 1px auto;
+              box-sizing: border-box;
+              justify-content: center;
+              align-items: center;
+              border-bottom: 1px solid rgba(255, 255, 255, 0.08);
+              background: #7B828B;
+            }
+
+            .day {
+              display: flex;
+              width: 48px;
+              padding-bottom: 6px;
+              box-sizing: border-box;
+              flex-direction: column;
+              align-items: center;
+              gap: 4px;
+              // border: 0.5px solid rgba(255, 255, 255, 0.08);
+              // background: rgba(255, 255, 255, 0.25);
+            }
+          }
+
+          &-date {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+            justify-content: space-evenly;
+            gap: 4px;
+            align-self: stretch;
+            color: #FFF;
+
+            .date {
+              color: #FFF;
+              font-feature-settings: 'liga' off, 'clig' off;
+              font-family: "PingFang SC";
+              font-size: 16px;
+              font-style: normal;
+              font-weight: 600;
+              line-height: 24px; /* 150% */
+            }
+
+            .venue-time {
+              color: rgba(255, 255, 255, 0.80);
+              font-feature-settings: 'liga' off, 'clig' off;
+              font-family: "PingFang SC";
+              font-size: 12px;
+              font-style: normal;
+              font-weight: 400;
+              line-height: 20px; /* 166.667% */
+            }
+          }
+        }
+
+        &-weather {
+          display: flex;
+          align-items: flex-end;
+          flex-direction: column;
+          gap: 4px;
+
+          &-icon {
+            width: 20px;
+            height: 20px;
+
+            .weather-icon {
+              width: 20px;
+              height: 20px;
+            }
+          }
+          &-text-temperature {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            color: rgba(255, 255, 255, 0.80);
+            font-feature-settings: 'liga' off, 'clig' off;
+            font-family: "PingFang SC";
+            font-size: 12px;
+            font-style: normal;
+            font-weight: 400;
+            line-height: 20px; /* 166.667% */
+          }
+        }
+      }
+
+      &-place {
+        .location-message {
+          padding: 20px 20px 0;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          gap: 12px;
+
+          &-icon {
+            width: 48px;
+            height: 48px;
+            border-radius: 12px;
+            padding: 14px;
+            box-sizing: border-box;
+            background: #4D5865;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            overflow: hidden;
+            // border: 0.5px solid rgba(255, 255, 255, 0.08);
+            background: rgba(255, 255, 255, 0.25);
+
+            &-image {
+              width: 20px;
+              height: 20px;
+            }
+          }
+
+          &-text {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+            justify-content: space-evenly;
+            gap: 4px;
+            align-self: stretch;
+
+            &-name-distance {
+              display: flex;
+              align-items: center;
+              gap: 4px;
+              color: #FFF;
+              text-align: center;
+              font-feature-settings: 'liga' off, 'clig' off;
+              font-family: "PingFang SC";
+              font-size: 16px;
+              font-style: normal;
+              font-weight: 600;
+              line-height: 24px; /* 150% */
+
+              &-arrow {
+                width: 16px;
+                height: 16px;
+              }
+            }
+
+            &-address {
+              color: rgba(255, 255, 255, 0.80);
+              text-align: center;
+              font-feature-settings: 'liga' off, 'clig' off;
+              font-family: "PingFang SC";
+              font-size: 12px;
+              font-style: normal;
+              font-weight: 400;
+              line-height: 20px; /* 166.667% */
+            }
+          }
+        }
+
+        .location-map {
+          width: 100%;
+          padding: 20px 20px 0;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          overflow: hidden;
+
+          &-map {
+            width: 100%;
+            height: 95px;
+          }
+        }
+      }
+    }
+
+    &-detail {
+      padding: 24px 15px 0;
+      box-sizing: border-box;
+
+      .venue-detail-title {
+        display: flex;
+        height: 31px;
+        align-items: center;
+        justify-content: flex-start;
+        gap: 4px;
+        padding-bottom: 6px;
+        color: #FFF;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 24px;
+        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+
+        &-notice-icon {
+          width: 14px;
+          height: 14px;
+        }
+      }
+
+      .venue-detail-content {
+        padding: 16px 0 0;
+        box-sizing: border-box;
+
+        &-tags {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          flex-wrap: wrap;
+
+          &-tag {
+            overflow: hidden;
+            color: #FFF;
+            font-feature-settings: 'liga' off, 'clig' off;
+            text-overflow: ellipsis;
+            font-family: "PingFang SC";
+            font-size: 15px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 24px; /* 160% */
+          }
+        }
+
+        &-remarks {
+          overflow: hidden;
+          color: rgba(255, 255, 255, 0.65);
+          // font-feature-settings: 'liga' off, 'clig' off;
+          // text-overflow: ellipsis;
+          // white-space: nowrap;
+          font-family: "PingFang SC";
+          font-size: 15px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 24px; /* 160% */
+        }
+      }
+    }
+
+    &-gameplay-requirements {
+      padding: 24px 15px 0;
+      box-sizing: border-box;
+
+      .gameplay-requirements-title {
+        overflow: hidden;
+        color: #FFF;
+        height: 24px;
+        padding-bottom: 6px;
+        font-feature-settings: 'liga' off, 'clig' off;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 24px; /* 150% */
+        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+      }
+
+      .gameplay-requirements {
+        padding: 12px 0 0;
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+
+        &-item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          gap: 2px;
+          align-self: stretch;
+
+          &-title {
+            color: rgba(255, 255, 255, 0.80);
+            font-feature-settings: 'liga' off, 'clig' off;
+            font-family: "PingFang SC";
+            font-size: 14px;
+            font-style: normal;
+            font-weight: 400;
+            line-height: 24px; /* 171.429% */
+          }
+
+          &-desc {
+            color: #FFF;
+            font-feature-settings: 'liga' off, 'clig' off;
+            font-family: "PingFang SC";
+            font-size: 15px;
+            font-style: normal;
+            font-weight: 600;
+            line-height: 24px; /* 160% */
+          }
+        }
+      }
+    }
+
+    &-participants {
+      padding: 24px 15px 0;
+      box-sizing: border-box;
+
+      .participants-title {
+        display: flex;
+        padding-bottom: 6px;
+        align-items: center;
+        overflow: hidden;
+        color: #FFF;
+        font-feature-settings: 'liga' off, 'clig' off;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 24px; /* 150% */
+        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+      }
+
+      .participants-list {
+        padding: 10px 0 0;
+        height: 162px;
+        display: flex;
+        flex-direction: row;
+        gap: 8px;
+
+        &-application {
+          display: flex;
+          width: 108px;
+          height: 162px;
+          padding: 16px 12px 10px 12px;
+          box-sizing: border-box;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          gap: 8px;
+          align-self: stretch;
+          border-radius: 20px;
+          border: 1px dashed rgba(255, 255, 255, 0.20);
+          background: rgba(255, 255, 255, 0.16);
+          flex: 0 0 auto;
+
+          &-icon {
+            width: 28px;
+            height: 28px;
+          }
+
+          &-text {
+            color: rgba(255, 255, 255, 0.60);
+            font-feature-settings: 'liga' off, 'clig' off;
+            font-family: "PingFang SC";
+            font-size: 12px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 20px; /* 166.667% */
+          }
+        }
+
+        &-scroll {
+          flex: 0 0 auto;
+
+          &-content {
+            display: flex;
+            flex-direction: row;
+            gap: 8px;
+            height: 162px;
+            flex-wrap: nowrap;
+
+            .participants-list-item {
+              display: flex;
+              width: 108px;
+              padding: 16px 12px 10px 12px;
+              box-sizing: border-box;
+              flex-direction: column;
+              justify-content: center;
+              align-items: center;
+              gap: 4px;
+              border-radius: 20px;
+              border: 0.5px solid rgba(255, 255, 255, 0.20);
+              background: rgba(255, 255, 255, 0.16);
+              flex: 0 0 auto;
+
+              &-avatar {
+                width: 60px;
+                height: 60px;
+              }
+
+              &-name {
+                color: rgba(255, 255, 255, 0.85);
+                text-align: center;
+                font-feature-settings: 'liga' off, 'clig' off;
+                font-family: "PingFang SC";
+                font-size: 13px;
+                font-style: normal;
+                font-weight: 500;
+                line-height: 24px; /* 184.615% */
+              }
+
+              &-level {
+                color: rgba(255, 255, 255, 0.45);
+                text-align: center;
+                font-feature-settings: 'liga' off, 'clig' off;
+                font-family: "PingFang SC";
+                font-size: 12px;
+                font-style: normal;
+                font-weight: 400;
+                line-height: 20px; /* 166.667% */
+              }
+
+              &-role {
+                color: #FFF;
+                text-align: center;
+                font-feature-settings: 'liga' off, 'clig' off;
+                font-family: "PingFang SC";
+                font-size: 12px;
+                font-style: normal;
+                font-weight: 500;
+                line-height: 20px; /* 166.667% */
+              }
+            }
+          }
+        }
+      }
+    }
+
+    &-supplemental-notes {
+      padding: 24px 15px 0;
+
+      .supplemental-notes-title {
+        overflow: hidden;
+        padding-bottom: 7px;
+        height: 24px;
+        color: #FFF;
+        font-feature-settings: 'liga' off, 'clig' off;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 24px; /* 150% */
+        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+      }
+
+      .supplemental-notes-content {
+        padding: 12px 0 0;
+        display: flex;
+        flex-direction: column;
+        gap: 6px;
+
+        &-tags {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          flex-wrap: wrap;
+
+          &-tag {
+            overflow: hidden;
+            color: #FFF;
+            font-feature-settings: 'liga' off, 'clig' off;
+            text-overflow: ellipsis;
+            font-family: "PingFang SC";
+            font-size: 15px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 24px; /* 160% */
+          }
+        }
+
+        &-text {
+          overflow: hidden;
+          color: rgba(255, 255, 255, 0.65);
+          font-feature-settings: 'liga' off, 'clig' off;
+          font-family: "PingFang SC";
+          font-size: 15px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 24px; /* 160% */
+        }
+      }
+    }
+
+    &-organizer-recommend-games {
+      padding: 24px 15px 0;
+
+      .organizer-title {
+        overflow: hidden;
+        padding-bottom: 6px;
+        height: 24px;
+        color: #FFF;
+        font-feature-settings: 'liga' off, 'clig' off;
+        text-overflow: ellipsis;
+        font-family: "PingFang SC";
+        font-size: 16px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 24px; /* 150% */
+        border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+      }
+
+      .organizer-avatar-name {
+        display: flex;
+        align-items: center;
+        padding: 16px 0 0;
+        align-items: center;
+        gap: 8px;
+        justify-content: flex-start;
+
+        &-avatar {
+          width: 40px;
+          height: 40px;
+        }
+
+        &-message {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+
+          &-name {
+            color: rgba(255, 255, 255, 0.85);
+            font-size: 13px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 24px; /* 184.615% */
+          }
+
+          &-stats {
+            display: flex;
+            align-items: center;
+            gap: 5px;
+            color: rgba(255, 255, 255, 0.60);
+            font-size: 12px;
+            font-style: normal;
+            font-weight: 400;
+            line-height: 16px; /* 133.333% */
+            letter-spacing: 0.06px;
+
+            &-separator {
+              width: 1px;
+              height: 10px;
+              color: rgba(255, 255, 255, 0.20);
+            }
+          }
+        }
+
+        .organizer-actions {
+          display: flex;
+          align-items: center;
+          gap: 8px;
+          margin-left: auto;
+
+          .organizer-actions-follow, .organizer-actions-comment {
+            display: flex;
+            height: 32px;
+            box-sizing: border-box;
+            align-items: center;
+            gap: 4px;
+            border-radius: 999px;
+            // border: 0.5px solid rgba(255, 255, 255, 0.10);
+            background: rgba(255, 255, 255, 0.16);
+            box-shadow: 0 4px 48px 0 rgba(0, 0, 0, 0.08);
+
+            & > image {
+              width: 16px;
+              height: 16px;
+            }
+          }
+
+          .organizer-actions-follow {
+            padding: 8px 12px 8px;
+            &-text {
+              color: #FFF;
+              font-size: 13px;
+              font-style: normal;
+              font-weight: 500;
+              line-height: 20px; /* 153.846% */
+              letter-spacing: -0.23px;
+            }
+          }
+
+          .organizer-actions-comment {
+            padding: 8px 10px;
+          }
+        }
+      }
+
+      .organizer-recommend-games {
+        padding-top: 20px;
+
+        .organizer-recommend-games-title {
+          overflow: hidden;
+          color: rgba(255, 255, 255, 0.65);
+          font-family: "PingFang SC";
+          font-size: 15px;
+          font-style: normal;
+          font-weight: 500;
+          line-height: 24px; /* 160% */
+          display: flex;
+          align-items: center;
+          gap: 2px;
+          align-self: stretch;
+
+          &-arrow {
+            width: 12px;
+            height: 12px;
+          }
+        }
+
+        .recommend-games-list {
+          padding: 10px 0;
+          display: flex;
+          gap: 8px;
+          flex-wrap: nowrap;
+
+          &-content {
+            display: flex;
+            gap: 8px;
+            flex-wrap: nowrap;
+
+            .recommend-games-list-item {
+              width: 246px;
+              height: 122px;
+              display: flex;
+              flex-direction: column;
+              gap: 6px;
+              flex: 0 0 auto;
+              border-radius: 20px;
+              border: 1px solid rgba(33, 178, 0, 0.20);
+              background: rgba(255, 255, 255, 0.16);
+              padding: 12px 15px;
+              box-sizing: border-box;
+
+              &-title {
+                display: flex;
+                align-items: center;
+                height: 24px;
+                gap: 2px;
+                overflow: hidden;
+                color: rgba(255, 255, 255, 0.85);
+                text-overflow: ellipsis;
+                font-size: 16px;
+                font-style: normal;
+                font-weight: 600;
+                line-height: 24px; /* 150% */
+
+                &-arrow {
+                  width: 12px;
+                  height: 12px;
+                }
+              }
+
+              &-time-range {
+                overflow: hidden;
+                color: rgba(255, 255, 255, 0.45);
+                text-overflow: ellipsis;
+                font-size: 12px;
+                font-style: normal;
+                font-weight: 400;
+                line-height: 18px; /* 150% */
+              }
+
+              &-location-venue-distance {
+                display: flex;
+                align-items: center;
+                gap: 2px;
+                overflow: hidden;
+                color: rgba(255, 255, 255, 0.45);
+                font-feature-settings: 'liga' off, 'clig' off;
+                text-overflow: ellipsis;
+                font-family: "PingFang SC";
+                font-size: 12px;
+                font-style: normal;
+                font-weight: 400;
+                line-height: 18px; /* 150% */
+              }
+
+              &-addon {
+                display: flex;
+                align-items: center;
+                gap: 4px;
+
+                &-avatar {
+                  width: 20px;
+                  height: 20px;
+                }
+
+                &-message {
+                  display: flex;
+                  gap: 4px;
+
+                  &-applications, &-level-requirements, &-play-type {
+                    color: rgba(255, 255, 255, 0.85);
+                    font-size: 11px;
+                    font-style: normal;
+                    font-weight: 500;
+                    line-height: 20px; /* 181.818% */
+                    letter-spacing: -0.23px;
+                    display: flex;
+                    height: 20px;
+                    padding: 6px 8px;
+                    box-sizing: border-box;
+                    align-items: center;
+                    gap: 4px;
+                    border-radius: 999px;
+                    // border: 0.5px solid rgba(0, 0, 0, 0.16);
+                    background: rgba(255, 255, 255, 0.12);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .sticky-bottom-bar {
+      position: sticky;
+      bottom: 0;
+      padding: 10px 10px env(safe-area-inset-bottom);
+      box-sizing: border-box;
+      width: 100%;
+      height: calc(52px + env(safe-area-inset-bottom));
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 6px;
+
+      &-share-and-comment {
+        display: flex;
+        align-items: center;
+        height: 52px;
+        width: 113px;
+        box-sizing: border-box;
+        padding: 2px 20px;
+        justify-content: center;
+        gap: 16px;
+        border-radius: 16px;
+        border: 1px solid rgba(255, 255, 255, 0.06);
+        background: #FFF;
+      }
+
+      &-join-game {
+        display: flex;
+        align-items: center;
+        height: 52px;
+        width: auto;
+        padding: 2px 6px;
+        box-sizing: border-box;
+        justify-content: center;
+        gap: 12px;
+        flex: 1 0 0;
+        border-radius: 16px;
+        border: 1px solid rgba(0, 0, 0, 0.06);
+        background: #FFF;
+      }
+    }
+  }
 }
+
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index 7693a67..ee52196 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -1,10 +1,9 @@
 import React, { useState, useEffect } from 'react'
-import { View, Text, Button, Swiper, SwiperItem, Image } from '@tarojs/components'
-import { Cell, Avatar, Progress } from '@nutui/nutui-react-taro'
-import Taro from '@tarojs/taro'
+import { View, Text, Button, Swiper, SwiperItem, Image, Map, ScrollView } from '@tarojs/components'
+import { Cell, Avatar, Progress, Popover } from '@nutui/nutui-react-taro'
+import Taro, { useRouter } from '@tarojs/taro'
 // 导入API服务
-import demoApi from '../../services/demoApi'
-import commonApi from '../../services/commonApi'
+import DetailService from '../../services/detailService'
 import {
   useUserStats,
   useUserActions
@@ -19,7 +18,9 @@ const images = [
   'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/49d7cdf0-b03c-4a0f-91c6-e7778080cfcd.png'
 ]
 
-
+function insertDotInTags(tags: string[]) {
+  return tags.join('-·-').split('-')
+}
 
 function Index() {
   // 使用Zustand store
@@ -28,28 +29,24 @@ function Index() {
 
   const [current, setCurrent] = useState(0)
   const [colors, setColors] = useState<string []>([])
+  const [detail, setDetail] = useState<any>(null)
+  const { params } = useRouter()
+  const { id, share } = params
 
   // 本地状态管理
   const [loading, setLoading] = useState(false)
-  const [userProfile, setUserProfile] = useState<any>(null)
-  const [interests, setInterests] = useState<string[]>([])
 
   // 页面加载时获取数据
   useEffect(() => {
-    initializeData()
+    fetchDetail()
     calcBgMainColors()
   }, [])
 
-  // 初始化数据
-  const initializeData = async () => {
-    try {
-      // 获取推荐的兴趣爱好
-      const interestsRes = await demoApi.getRecommendedInterests()
-      if (interestsRes.success) {
-        setInterests(interestsRes.data || [])
-      }
-    } catch (error) {
-      console.log('获取初始数据失败:', error)
+  const fetchDetail = async () => {
+    const res = await DetailService.getDetail(Number(id))
+    if (res.code === 0) {
+      console.log(res.data)
+      setDetail(res.data)
     }
   }
 
@@ -62,8 +59,84 @@ function Index() {
     setColors(textcolors)
   }
 
+  const tags = [{
+    name: '🕙 急招',
+    icon: '',
+  }, {
+    name: '🔥 本周热门',
+    icon: '',
+  }, {
+    name: '🎉 新活动',
+    icon: '',
+  }, {
+    name: '官方组织',
+    icon: '',
+  }]
+
+  const detailTags = ['室内', '硬地', '2号场', '有停车场', '有淋浴间', '有更衣室']
+
+  const { title, longitude, latitude } = detail || {}
+
+  const requirements = [{
+    title: 'NTRP水平要求',
+    desc: '2.0 - 4.5 之间',
+  }, {
+    title: '活动玩法',
+    desc: '双打',
+  }, {
+    title: '人员构成',
+    desc: '个人球局 · 组织者参与活动',
+  }]
+
+  const participants = detail?.participants || []
+
+  const supplementalNotesTags = ['仅限男生', '装备自备', '其他']
+
+  const recommendGames = [
+    {
+      title: '黄浦日场对拉',
+      time: '2025-08-25 9:00',
+      timeLength: '2小时',
+      venue: '上海体育场',
+      veuneType: '室外',
+      distance: '1.2km',
+      avatar: 'https://img.yzcdn.cn/vant/cat.jpeg',
+      applications: 10,
+      checkedApplications: 3,
+      levelRequirements: 'NTRP 3.5',
+      playType: '双打',
+    },
+    {
+      title: '黄浦夜场对拉',
+      time: '2025-08-25 19:00',
+      timeLength: '2小时',
+      venue: '上海体育场',
+      veuneType: '室外',
+      distance: '1.2km',
+      avatar: 'https://img.yzcdn.cn/vant/cat.jpeg',
+      applications: 10,
+      checkedApplications: 3,
+      levelRequirements: 'NTRP 3.5',
+      playType: '双打',
+    },
+    {
+      title: '黄浦全天对拉',
+      time: '2025-08-25 9:00',
+      timeLength: '12小时',
+      venue: '上海体育场',
+      veuneType: '室外',
+      distance: '1.2km',
+      avatar: 'https://img.yzcdn.cn/vant/cat.jpeg',
+      applications: 10,
+      checkedApplications: 3,
+      levelRequirements: 'NTRP 3.5',
+      playType: '双打',
+    },
+  ]
+
   return (
     <View className='detail-page'>
+      {/* custom navbar */}
       <view className="custom-navbar">
         <View className='detail-navigator'>
           <View className='detail-navigator-back'>
@@ -73,10 +146,10 @@ function Index() {
             <Image className='detail-navigator-logo-icon' src={img.ICON_LOGO_GO} />
           </View>
         </View>
-        {/* <view className="navbar-title">我的自定义标题</view> */}
       </view>
       <View className='detail-page-bg' style={{ backgroundImage: `url(${images[current]})` }} />
       <View className='detail-page-bg-text' />
+      {/* swiper */}
       <Swiper
         className='detail-swiper'
         indicatorDots={false}
@@ -100,9 +173,284 @@ function Index() {
           </SwiperItem>
         ))}
       </Swiper>
-      <Text className='detail-text' style={{ color: colors[current] }}>
-        Five feet from the bed was an earthen wall that had suffered from numerous cracks due to the passage of time. From the other side of the wall came the nagging voice of his mother and the occasional deep breathing of his father who was smoking his pipe.
-      </Text>
+      {/* content */}
+      <View className='detail-page-content'>
+        {/* avatar and tags */}
+        <View className='detail-page-content-avatar-tags'>
+          <View className='detail-page-content-avatar-tags-avatar'>
+            {/* network image mock */}
+            <Image className='detail-page-content-avatar-tags-avatar-image' src="https://img.yzcdn.cn/vant/cat.jpeg" />
+          </View>
+          <View className='detail-page-content-avatar-tags-tags'>
+            {tags.map((tag, index) => (
+              <View key={index} className='detail-page-content-avatar-tags-tags-tag'>
+                {tag.icon && <Image src={tag.icon} />}
+                <Text>{tag.name}</Text>
+              </View>
+            ))}
+          </View>
+        </View>
+        {/* title */}
+        <View className='detail-page-content-title'>
+          <Text className='detail-page-content-title-text'>{title}</Text>
+        </View>
+        {/* Date and Place and weather */}
+        <View className='detail-page-content-game-info'>
+          {/* Date and Weather */}
+          <View className='detail-page-content-game-info-date-weather'>
+            {/* Calendar and Date time */}
+            <View className='detail-page-content-game-info-date-weather-calendar-date'>
+              {/* Calendar */}
+              <View className='detail-page-content-game-info-date-weather-calendar-date-calendar'>
+                <View className="month">3月</View>
+                <View className="day">25</View>
+              </View>
+              {/* Date time */}
+              <View className='detail-page-content-game-info-date-weather-calendar-date-date'>
+                <View className="date">3月25日 周一</View>
+                <View className="venue-time">19:00-21:00 （2小时）</View>
+              </View>
+            </View>
+            {/* Weather */}
+            <View className='detail-page-content-game-info-date-weather-weather'>
+              {/* Weather icon */}
+              <View className='detail-page-content-game-info-date-weather-weather-icon'>
+                <Image className="weather-icon" src={img.ICON_WEATHER_SUN} />
+              </View>
+              {/* Weather text and temperature */}
+              <View className='detail-page-content-game-info-date-weather-weather-text-temperature'>
+                <Text>28℃ - 32℃</Text>
+              </View>
+            </View>
+          </View>
+          {/* Place */}
+          <View className='detail-page-content-game-info-place'>
+            {/* venue location message */}
+            <View className='location-message'>
+              {/* location icon */}
+              <View className='location-message-icon'>
+                <Image className='location-message-icon-image' src={img.ICON_DETAIL_MAP} />
+              </View>
+              {/* location message */}
+              <View className='location-message-text'>
+                {/* venue name and distance */}
+                <View className='location-message-text-name-distance'>
+                  <Text>上海体育场</Text>
+                  <Text>·</Text>
+                  <Text>1.2km</Text>
+                  <Image className='location-message-text-name-distance-arrow' src={img.ICON_DETAIL_ARROW_RIGHT} />
+                </View>
+                {/* venue address */}
+                <View className='location-message-text-address'>
+                  <Text>上海市徐汇区肇嘉浜路128号</Text>
+                </View>
+              </View>
+            </View>
+            {/* venue map */}
+            <View className='location-map'>
+              <Map
+                className='location-map-map'
+                longitude={longitude}
+                latitude={latitude}
+                onError={() => {}}
+                // hide business msg
+                showLocation
+                theme='dark'
+              />
+            </View>
+          </View>
+        </View>
+        {/* detail */}
+        <View className='detail-page-content-detail'>
+          {/* venue detail title and venue ordered status */}
+          <View className='venue-detail-title'>
+            <Text>场馆详情</Text>
+            <Text>·</Text>
+            <Text>已订场</Text>
+            <Popover
+              title="场地预定截图"
+              description={<View>
+                <Image src="https://img.yzcdn.cn/vant/cat.jpeg" />
+              </View>}
+              location='top'
+              visible={false}
+            >
+              <Image className='venue-detail-title-notice-icon' src={img.ICON_DETAIL_NOTICE} />
+            </Popover>
+          </View>
+          {/* venue detail content */}
+          <View className='venue-detail-content'>
+            {/* venue detail tags */}
+            <View className='venue-detail-content-tags'>
+              {insertDotInTags(detailTags).map((tag, index) => (
+                <View key={index} className='venue-detail-content-tags-tag'>
+                  <Text>{tag}</Text>
+                </View>
+              ))}
+            </View>
+            {/* venue remarks */}
+            <View className='venue-detail-content-remarks'>
+              <Text>其他这是用户在场地补充描述里自己写的东西啦啦啦啦啦啦啦啦啦啦啦啦</Text>
+            </View>
+          </View>
+        </View>
+        {/* gameplay requirements */}
+        <View className='detail-page-content-gameplay-requirements'>
+          {/* title */}
+          <View className="gameplay-requirements-title">
+            <Text>玩法要求</Text>
+          </View>
+          {/* requirements */}
+          <View className='gameplay-requirements'>
+            {requirements.map((item, index) => (
+              <View key={index} className='gameplay-requirements-item'>
+                <Text className='gameplay-requirements-item-title'>{item.title}</Text>
+                <Text className='gameplay-requirements-item-desc'>{item.desc}</Text>
+              </View>
+            ))}
+          </View>
+        </View>
+        {/* participants */}
+        <View className='detail-page-content-participants'>
+          <View className='participants-title'>
+            <Text>参与者</Text>
+            <Text>·</Text>
+            <Text>剩余空位 3</Text>
+          </View>
+          <View className='participants-list'>
+            {/* application */}
+            <View className='participants-list-application' onClick={() => { Taro.showToast({ title: 'To be continued', icon: 'none' }) }}>
+              <Image className='participants-list-application-icon' src={img.ICON_DETAIL_APPLICATION_ADD} />
+              <Text className='participants-list-application-text'>申请加入</Text>
+            </View>
+            {/* participants list */}
+            <ScrollView className='participants-list-scroll' scrollX>
+              <View className='participants-list-scroll-content' style={{ width: `${(participants.length + 1) * 108 + (participants.length) * 8 - 30}px` }}>
+                {participants.map((participant) => (
+                  <View key={participant.id} className='participants-list-item'>
+                    {/* <Avatar className='participants-list-item-avatar' src={participant.user.avatar_url} /> */}
+                    {/* network image mock random */}
+                    <Avatar className='participants-list-item-avatar' src={`https://picsum.photos/800/600?random=${participant.id}`} />
+                    <Text className='participants-list-item-name'>{participant.user.nickname || '未知'}</Text>
+                    <Text className='participants-list-item-level'>{participant.level || '未知'}</Text>
+                    <Text className='participants-list-item-role'>{participant.role || '参与者'}</Text>
+                  </View>
+                ))}
+              </View>
+            </ScrollView>
+          </View>
+        </View>
+        {/* supplemental notes */}
+        <View className='detail-page-content-supplemental-notes'>
+          <View className='supplemental-notes-title'>
+            <Text>补充说明</Text>
+          </View>
+          <View className='supplemental-notes-content'>
+            {/* supplemental notes tags */}
+            <View className='supplemental-notes-content-tags'>
+              {insertDotInTags(supplementalNotesTags).map((tag, index) => (
+                <View key={index} className='supplemental-notes-content-tags-tag'>
+                  <Text>{tag}</Text>
+                </View>
+              ))}
+            </View>
+            {/* supplemental notes content */}
+            <View className='supplemental-notes-content-text'>
+              <Text>其他这是用户在补充说明里自己写的东西啦啦啦啦啦啦啦啦啦啦啦啦其他这是用户在补充说明里自己写的东西啦啦啦啦啦啦啦啦啦啦啦啦</Text>
+            </View>
+          </View>
+        </View>
+        {/* organizer and recommend games by organizer */}
+        <View className='detail-page-content-organizer-recommend-games'>
+          {/* orgnizer title */}
+          <View className='organizer-title'>
+            <Text>组织者</Text>
+          </View>
+          {/* organizer avatar and name */}
+          <View className='organizer-avatar-name'>
+            <Avatar className='organizer-avatar-name-avatar' src="https://img.yzcdn.cn/vant/cat.jpeg" />
+            <View className='organizer-avatar-name-message'>
+              <Text className='organizer-avatar-name-message-name'>Light</Text>
+              <View className='organizer-avatar-name-message-stats'>
+                <Text>已组织 8 次</Text>
+                <View className='organizer-avatar-name-message-stats-separator' />
+                <Text>NTRP 3.5</Text>
+              </View>
+            </View>
+            <View className="organizer-actions">
+              <View className="organizer-actions-follow">
+                <Image className='organizer-actions-follow-icon' src={img.ICON_DETAIL_APPLICATION_ADD} />
+                <Text className='organizer-actions-follow-text'>关注</Text>
+              </View>
+              <View className="organizer-actions-comment">
+                <Image className='organizer-actions-comment-icon' src={img.ICON_DETAIL_COMMENT} />
+              </View>
+            </View>
+          </View>
+          {/* recommend games by organizer */}
+          <View className='organizer-recommend-games'>
+            <View className='organizer-recommend-games-title'>
+              <Text>TA的更多活动</Text>
+              <Image className='organizer-recommend-games-title-arrow' src={img.ICON_DETAIL_ARROW_RIGHT} />
+            </View>
+            <ScrollView className='recommend-games-list' scrollX>
+              <View className='recommend-games-list-content'>
+                {recommendGames.map((game, index) => (
+                  <View key={index} className='recommend-games-list-item'>
+                    {/* game title */}
+                    <View className='recommend-games-list-item-title'>
+                      <Text>{game.title}</Text>
+                      <Image className='recommend-games-list-item-title-arrow' src={img.ICON_DETAIL_ARROW_RIGHT} />
+                    </View>
+                    {/* game time and range */}
+                    <View className='recommend-games-list-item-time-range'>
+                      <Text>{game.time}</Text>
+                      <Text>{game.timeLength}</Text>
+                    </View>
+                    {/* game location、vunue、distance */}
+                    <View className='recommend-games-list-item-location-venue-distance'>
+                      <Text>{game.venue}</Text>
+                      <Text>·</Text>
+                      <Text>{game.veuneType}</Text>
+                      <Text>·</Text>
+                      <Text>{game.distance}</Text>
+                    </View>
+                    {/* organizer avatar、applications、level requirements、play type */}
+                    <View className='recommend-games-list-item-addon'>
+                      <Avatar className='recommend-games-list-item-addon-avatar' src={game.avatar} />
+                      <View className='recommend-games-list-item-addon-message'>
+                        <View className='recommend-games-list-item-addon-message-applications'>
+                          <Text>报名人数 {game.checkedApplications} / {game.applications}</Text>
+                        </View>
+                        <View className='recommend-games-list-item-addon-message-level-requirements'>
+                          <Text>{game.levelRequirements}</Text>
+                        </View>
+                        <View className='recommend-games-list-item-addon-message-play-type'>
+                          <Text>{game.playType}</Text>
+                        </View>
+                      </View>
+                    </View>
+                  </View>
+                ))}
+              </View>
+            </ScrollView>
+          </View>
+        </View>
+        {/* sticky bottom action bar */}
+        <View className="sticky-bottom-bar">
+          <View className="sticky-bottom-bar-share-and-comment">
+            <View></View>
+            <View></View>
+          </View>
+          <View className="sticky-bottom-bar-join-game">
+            <Text>🎾</Text>
+            <Text>立即加入</Text>
+            <View className='game-price'>
+              <Text>¥ 65</Text>
+            </View>
+          </View>
+        </View>
+      </View>
     </View>
   )
 }
diff --git a/src/scss/images.scss b/src/scss/images.scss
index a863e16..3527d5a 100644
--- a/src/scss/images.scss
+++ b/src/scss/images.scss
@@ -30,6 +30,14 @@ $-images: (
   'icon-circle-unselect': '/publishBall/icon-circle-unselect.svg',
   'icon-circle-select-ring': '/publishBall/icon-circle-select-ring.svg',
   'icon-circle-select-arrow': '/publishBall/icon-circle-select-arrow.svg',
+  'icon-weather-sun': '/detail/icon-weather-sun.svg',
+  'icon-detail-map': '/detail/icon-map.svg',
+  'icon-detail-arrow-right': '/detail/icon-arrow-right.svg',
+  'icon-detail-notice': '/detail/icon-notice.svg',
+  'icon-detail-application-add': '/detail/icon-application-add.svg',
+  'icon-detail-comment': '/detail/icon-comment.svg',
+  'icon-detail-comment-dark': '/detail/icon-comment-dark.svg',
+  'icon-detail-share': '/detail/icon-share-dark.svg',
 ) !default;
 
 // 图片获取函数
diff --git a/src/services/detailApi.ts b/src/services/detailService.ts
similarity index 100%
rename from src/services/detailApi.ts
rename to src/services/detailService.ts
diff --git a/src/services/publishService.ts b/src/services/publishService.ts
index 63ea809..778ca2d 100644
--- a/src/services/publishService.ts
+++ b/src/services/publishService.ts
@@ -124,7 +124,7 @@ class PublishService {
   }
   async getPictures(req: getPicturesReq): Promise<ApiResponse<getPicturesRes>> {
     return httpService.post('/gallery/sys_img_list', req, {
-      showLoading: true,
+      showLoading: false,
       showToast: false,
     })
   }
diff --git a/src/static/detail/icon-application-add.svg b/src/static/detail/icon-application-add.svg
new file mode 100644
index 0000000..be4ac42
--- /dev/null
+++ b/src/static/detail/icon-application-add.svg
@@ -0,0 +1,4 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.035 5.83337L14.0137 22.1667" stroke="white" stroke-opacity="0.6" stroke-width="2.22222" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.83333 14H22.1667" stroke="white" stroke-opacity="0.6" stroke-width="2.22222" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/detail/icon-arrow-right.svg b/src/static/detail/icon-arrow-right.svg
new file mode 100644
index 0000000..3d6ef55
--- /dev/null
+++ b/src/static/detail/icon-arrow-right.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.33334 4L10.3333 8L6.33334 12" stroke="white" stroke-opacity="0.8" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/detail/icon-comment-dark.svg b/src/static/detail/icon-comment-dark.svg
new file mode 100644
index 0000000..1787969
--- /dev/null
+++ b/src/static/detail/icon-comment-dark.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.75 15.8333H9.16666V12.5H15V9.16663H18.3333V15.8333H16.25L15 17.0833L13.75 15.8333Z" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.66666 2.5H15V12.5H7.08333L5.41666 14.1667L3.75 12.5H1.66666V2.5Z" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.91666 7.5H8.33333" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round"/>
+<path d="M10.8333 7.5H11.25" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round"/>
+<path d="M5 7.5H5.41667" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round"/>
+</svg>
diff --git a/src/static/detail/icon-comment.svg b/src/static/detail/icon-comment.svg
new file mode 100644
index 0000000..d6b5f7d
--- /dev/null
+++ b/src/static/detail/icon-comment.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 12.6667H7.33334V10H12V7.33337H14.6667V12.6667H13L12 13.6667L11 12.6667Z" stroke="white" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.33334 2H12V10H5.66668L4.33334 11.3333L3.00001 10H1.33334V2Z" stroke="white" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.33334 6H6.66668" stroke="white" stroke-width="1.33333" stroke-linecap="round"/>
+<path d="M8.66666 6H8.99999" stroke="white" stroke-width="1.33333" stroke-linecap="round"/>
+<path d="M4 6H4.33333" stroke="white" stroke-width="1.33333" stroke-linecap="round"/>
+</svg>
diff --git a/src/static/detail/icon-map.svg b/src/static/detail/icon-map.svg
new file mode 100644
index 0000000..9787f48
--- /dev/null
+++ b/src/static/detail/icon-map.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08333 5L1.66667 2.5V15L7.08333 17.5L12.9167 15L18.3333 17.5V5L12.9167 2.5L7.08333 5Z" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.9167 2.5V15" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.08333 5V17.5" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.375 3.75L7.08333 5L12.9167 2.5L15.625 3.75" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.375 16.25L7.08333 17.5L12.9167 15L15.625 16.25" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/detail/icon-notice.svg b/src/static/detail/icon-notice.svg
new file mode 100644
index 0000000..31119b7
--- /dev/null
+++ b/src/static/detail/icon-notice.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5832 9.45002C7.5832 9.77219 7.32203 10.0334 6.99986 10.0334C6.6777 10.0334 6.41653 9.77219 6.41653 9.45002V6.53335C6.41653 6.21119 6.6777 5.95002 6.99986 5.95002C7.32203 5.95002 7.5832 6.21119 7.5832 6.53335V9.45002Z" fill="white" fill-opacity="0.6"/>
+<path d="M6.99997 4.08335C6.64559 4.08335 6.35831 4.37064 6.35831 4.72502C6.35831 5.0794 6.64559 5.36669 6.99997 5.36669C7.35436 5.36669 7.64164 5.0794 7.64164 4.72502C7.64164 4.37064 7.35436 4.08335 6.99997 4.08335Z" fill="white" fill-opacity="0.6"/>
+<path d="M7.00001 12.8334C10.2217 12.8334 12.8333 10.2217 12.8333 7.00002C12.8333 3.77836 10.2217 1.16669 7.00001 1.16669C3.77834 1.16669 1.16667 3.77836 1.16667 7.00002C1.16667 10.2217 3.77834 12.8334 7.00001 12.8334ZM7.00001 11.6667C4.42268 11.6667 2.33334 9.57735 2.33334 7.00002C2.33334 4.42269 4.42268 2.33335 7.00001 2.33335C9.57733 2.33335 11.6667 4.42269 11.6667 7.00002C11.6667 9.57735 9.57733 11.6667 7.00001 11.6667Z" fill="white" fill-opacity="0.6"/>
+</svg>
diff --git a/src/static/detail/icon-share-dark.svg b/src/static/detail/icon-share-dark.svg
new file mode 100644
index 0000000..f2f0cac
--- /dev/null
+++ b/src/static/detail/icon-share-dark.svg
@@ -0,0 +1,3 @@
+<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.83333 1.66663L17.3333 9.16663L9.83333 16.25V11.6666C4 11.6666 1.5 17.9166 1.5 17.9166C1.5 10.8333 3.58333 6.24996 9.83333 6.24996V1.66663Z" stroke="black" stroke-opacity="0.85" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/static/detail/icon-weather-sun.svg b/src/static/detail/icon-weather-sun.svg
new file mode 100644
index 0000000..3851486
--- /dev/null
+++ b/src/static/detail/icon-weather-sun.svg
@@ -0,0 +1,18 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3061_9153)">
+<path d="M3.81265 3.81287L4.74074 4.74096" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.25 10H2.5625" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.81265 16.1873L4.74074 15.2592" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.1873 16.1873L15.2592 15.2592" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.7498 10H17.4373" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.1873 3.81287L15.2592 4.74096" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 1.25V2.5625" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 15C12.7614 15 15 12.7614 15 10C15 7.23858 12.7614 5 10 5C7.23858 5 5 7.23858 5 10C5 12.7614 7.23858 15 10 15Z" fill="white" stroke="white" stroke-width="1.66667" stroke-linejoin="round"/>
+<path d="M10 18.7501V17.4376" stroke="white" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_3061_9153">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>

From 2a38b88d8663f7ebe7ba1a436d5665900d9e26ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Tue, 26 Aug 2025 10:06:48 +0800
Subject: [PATCH 17/22] feat: detail static over

---
 src/pages/detail/index.scss | 46 +++++++++++++++++++++++++++++++++++++
 src/pages/detail/index.tsx  | 15 ++++++++++--
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
index 4f7fa63..d9bbf5b 100644
--- a/src/pages/detail/index.scss
+++ b/src/pages/detail/index.scss
@@ -923,6 +923,52 @@
         border-radius: 16px;
         border: 1px solid rgba(255, 255, 255, 0.06);
         background: #FFF;
+
+        .sticky-bottom-bar-share {
+          display: flex;
+          align-items: center;
+          flex-direction: column;
+          gap: 4px;
+
+          &-icon {
+            width: 16px;
+            height: 16px;
+          }
+
+          &-text {
+            color: rgba(0, 0, 0, 0.85);
+            font-size: 10px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 16px; /* 160% */
+          }
+        }
+
+        &-separator {
+          width: 1px;
+          height: 24px;
+          background: rgba(0, 0, 0, 0.10);
+        }
+
+        .sticky-bottom-bar-comment {
+          display: flex;
+          align-items: center;
+          flex-direction: column;
+          gap: 4px;
+
+          &-icon {
+            width: 16px;
+            height: 16px;
+          }
+
+          &-text {
+            color: rgba(0, 0, 0, 0.85);
+            font-size: 10px;
+            font-style: normal;
+            font-weight: 500;
+            line-height: 16px; /* 160% */
+          }
+        }
       }
 
       &-join-game {
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index ee52196..5d3be38 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -22,6 +22,10 @@ function insertDotInTags(tags: string[]) {
   return tags.join('-·-').split('-')
 }
 
+function handleShare() {
+
+}
+
 function Index() {
   // 使用Zustand store
   // const userStats = useUserStats()
@@ -439,8 +443,15 @@ function Index() {
         {/* sticky bottom action bar */}
         <View className="sticky-bottom-bar">
           <View className="sticky-bottom-bar-share-and-comment">
-            <View></View>
-            <View></View>
+            <View className='sticky-bottom-bar-share' onClick={handleShare}>
+              <Image className='sticky-bottom-bar-share-icon' src={img.ICON_DETAIL_SHARE} />
+              <Text className='sticky-bottom-bar-share-text'>分享</Text>
+            </View>
+            <View className='sticky-bottom-bar-share-and-comment-separator' />
+            <View className='sticky-bottom-bar-comment' onClick={() => { Taro.showToast({ title: 'To be continued', icon: 'none' }) }}>
+              <Image className='sticky-bottom-bar-comment-icon' src={img.ICON_DETAIL_COMMENT_DARK} />
+              <Text className='sticky-bottom-bar-comment-text'>32</Text>
+            </View>
           </View>
           <View className="sticky-bottom-bar-join-game">
             <Text>🎾</Text>

From e51015b447823b9e2cddcf7467ecba2abab83612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Tue, 26 Aug 2025 17:58:01 +0800
Subject: [PATCH 18/22] feat: add router to detail and ignore css order problem

---
 config/index.ts                               |  11 +-
 src/app.config.ts                             |   1 -
 src/app.scss                                  |   4 +
 src/app.ts                                    |   2 +-
 src/components/CommonPopup/CommonPopup.tsx    |   6 +-
 src/components/ListCard/index.tsx             |  10 +-
 src/pages/detail/index.scss                   |  41 +++
 src/pages/detail/index.tsx                    |  97 +++++-
 src/pages/index/index.config.ts               |   3 -
 src/pages/index/index.module.scss             |   1 -
 src/pages/index/index.scss                    | 261 ----------------
 src/pages/index/index.tsx                     | 293 ------------------
 src/pages/publishBall/index.tsx               |  77 ++---
 .../asserts/fonts/PoetsenOne-Regular.ttf      | Bin 0 -> 177704 bytes
 src/utils/index.ts                            |   9 +
 types/list/types.ts                           |   1 +
 16 files changed, 209 insertions(+), 608 deletions(-)
 delete mode 100644 src/pages/index/index.config.ts
 delete mode 100644 src/pages/index/index.module.scss
 delete mode 100644 src/pages/index/index.scss
 delete mode 100644 src/pages/index/index.tsx
 create mode 100644 src/static/asserts/fonts/PoetsenOne-Regular.ttf
 create mode 100644 src/utils/index.ts

diff --git a/config/index.ts b/config/index.ts
index 9e16ab3..56b2b5f 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -16,7 +16,7 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
       750: 1,
       375: 2,
       828: 1.81 / 2,
-      390: 1.92 
+      390: 1.92
     },
     sourceRoot: 'src',
     outputRoot: 'dist',
@@ -66,9 +66,16 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
           }
         }
       },
+      miniCssExtractPluginOption: {
+        ignoreOrder: true,
+        // filename: 'css/[name].[hash].css',
+        // chunkFilename: 'css/[name].[chunkhash].css'
+      },
       webpackChain(chain) {
         chain.resolve.plugin('tsconfig-paths').use(TsconfigPathsPlugin)
-      }
+      },
+      // @ts-expect-error: Taro 类型定义缺少 mini.hot
+      hot: true,
     },
     h5: {
       publicPath: '/',
diff --git a/src/app.config.ts b/src/app.config.ts
index 901708f..ba6d663 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     'pages/login/terms/index',
     'pages/publishBall/index',
     // 'pages/mapDisplay/index',
-    'pages/index/index',
     'pages/detail/index',
   ],
   window: {
diff --git a/src/app.scss b/src/app.scss
index e69de29..3228f0b 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: 'PoetsenOne';
+  src: url('./static/asserts/fonts/PoetsenOne-Regular.ttf') format('truetype');
+}
\ No newline at end of file
diff --git a/src/app.ts b/src/app.ts
index 6ef979c..6544603 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,6 +1,6 @@
 import { Component, ReactNode } from 'react'
-import './app.scss'
 import './nutui-theme.scss'
+import './app.scss'
 import { useDictionaryStore } from './store/dictionaryStore'
 
 interface AppProps {
diff --git a/src/components/CommonPopup/CommonPopup.tsx b/src/components/CommonPopup/CommonPopup.tsx
index a8dbeef..ef8deac 100644
--- a/src/components/CommonPopup/CommonPopup.tsx
+++ b/src/components/CommonPopup/CommonPopup.tsx
@@ -18,6 +18,7 @@ export interface CommonPopupProps {
   zIndex?: number
   children?: React.ReactNode
   className?: string
+  style?: React.CSSProperties
 }
 
 const CommonPopup: React.FC<CommonPopupProps> = ({
@@ -34,6 +35,7 @@ const CommonPopup: React.FC<CommonPopupProps> = ({
   position = 'bottom',
   round = true,
   zIndex,
+  style,
   children
 }) => {
   const handleCancel = () => {
@@ -52,7 +54,7 @@ const CommonPopup: React.FC<CommonPopupProps> = ({
       closeable={false}
       onClose={onClose}
       className={`${styles['common-popup']} ${className ? className : ''}`}
-      style={zIndex ? { zIndex } : undefined}
+      style={{ ...style, zIndex: zIndex ? zIndex : undefined }}
     >
       {showHeader && (
         <View className={styles['common-popup__header']}>
@@ -78,4 +80,4 @@ const CommonPopup: React.FC<CommonPopupProps> = ({
   )
 }
 
-export default CommonPopup 
\ No newline at end of file
+export default CommonPopup
\ No newline at end of file
diff --git a/src/components/ListCard/index.tsx b/src/components/ListCard/index.tsx
index a5f5f28..c91b3d3 100644
--- a/src/components/ListCard/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -1,10 +1,12 @@
 import { View, Text, Image } from "@tarojs/components";
+import Taro from '@tarojs/taro'
 import img from "../../config/images";
 import { ListCardProps } from "../../../types/list/types";
 import "./index.scss";
 // import SkeletonComponent from "../../components/Skeleton";
 
 const ListCard: React.FC<ListCardProps> = ({
+  id,
   title,
   dateTime,
   location,
@@ -20,6 +22,12 @@ const ListCard: React.FC<ListCardProps> = ({
     return <Image src={src} className="image" mode="aspectFill" />;
   };
 
+  const handleViewDetail = () => {
+    Taro.navigateTo({
+      url: `/pages/detail/index?id=${id || 1}&from=list&autoShare=0`
+    })
+  }
+
   // 根据图片数量决定展示样式
   const renderImages = () => {
     if (images.length === 0) return null;
@@ -60,7 +68,7 @@ const ListCard: React.FC<ListCardProps> = ({
     );
   };
   return (
-    <View className="list-item">
+    <View className="list-item" onClick={handleViewDetail}>
       {/* 左侧内容区域 */}
       <View className="content">
         {/* 标题 */}
diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
index d9bbf5b..2ff9ab1 100644
--- a/src/pages/detail/index.scss
+++ b/src/pages/detail/index.scss
@@ -29,6 +29,7 @@
     color: #fff;
     display: flex;
     align-items: center;
+    background: rgba(0, 0, 0, 0.10);
 
     .detail-navigator-back {
       border-right: 1px solid #444;
@@ -984,8 +985,48 @@
         border-radius: 16px;
         border: 1px solid rgba(0, 0, 0, 0.06);
         background: #FFF;
+
+        &-price {
+          font-family: "PoetsenOne";
+          font-size: 28px;
+          font-weight: 400;
+          line-height: 24px; /* 114.286% */
+          letter-spacing: -0.56px;
+          color: #000;
+        }
       }
     }
   }
 }
 
+.share-popup-content {
+  width: 100%;
+  height: 100%;
+  padding: 20px 16px env(safe-area-inset-bottom);
+  box-sizing: border-box;
+  // padding-bottom: env(safe-area-inset-bottom);
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+
+  & > view {
+    width: 100px;
+    height: 64px;
+    border-radius: 12px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+
+    & > image {
+      width: 24px;
+      height: 24px;
+    }
+
+    & > text {
+      color: rgba(0, 0, 0, 0.85);
+    }
+  }
+}
+
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index 5d3be38..957328b 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react'
 import { View, Text, Button, Swiper, SwiperItem, Image, Map, ScrollView } from '@tarojs/components'
 import { Cell, Avatar, Progress, Popover } from '@nutui/nutui-react-taro'
-import Taro, { useRouter } from '@tarojs/taro'
+import Taro, { useRouter, useShareAppMessage, useShareTimeline } from '@tarojs/taro'
 // 导入API服务
 import DetailService from '../../services/detailService'
 import {
@@ -9,8 +9,9 @@ import {
   useUserActions
 } from '../../store/userStore'
 import img from '../../config/images'
-import { getTextColorOnImage } from '../../utils/processImage'
+import { getTextColorOnImage } from '../../utils'
 import './index.scss'
+import { CommonPopup } from '@/components'
 
 const images = [
   'http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/1a35ebbf-2361-44da-b338-7608561d0b31.png',
@@ -22,9 +23,70 @@ function insertDotInTags(tags: string[]) {
   return tags.join('-·-').split('-')
 }
 
-function handleShare() {
+const SharePopup = forwardRef(({ id, from }: { id: string, from: string }, ref) => {
+  const [visible, setVisible] = useState(false)
 
-}
+  useImperativeHandle(ref, () => ({
+    show: () => {
+      setVisible(true)
+    }
+  }))
+
+  function handleShareToWechat() {
+    useShareAppMessage(() => {
+      return {
+        title: '分享',
+        path: `/pages/detail/index?id=${id}&from=${from}`,
+      }
+    })
+  }
+
+  function handleShareToWechatMoments() {
+    useShareTimeline(() => {
+      return {
+        title: '分享',
+        path: `/pages/detail/index?id=${id}&from=${from}`,
+      }
+    })
+  }
+
+  function handleSaveToLocal() {
+    Taro.saveImageToPhotosAlbum({
+      filePath: images[0],
+      success: () => {
+        Taro.showToast({ title: '保存成功', icon: 'success' })
+      },
+      fail: () => {
+        Taro.showToast({ title: '保存失败', icon: 'none' })
+      },
+    })
+  }
+
+  return (
+    <CommonPopup
+      title="分享"
+      visible={visible}
+      onClose={() => { setVisible(false) }}
+      hideFooter
+      style={{ minHeight: '100px' }}
+    >
+      <View catchMove className='share-popup-content'>
+        <View onClick={handleShareToWechat}>
+          <Image src={img.ICON_DETAIL_SHARE} />
+          <Text>分享到微信</Text>
+        </View>
+        <View onClick={handleShareToWechatMoments}>
+          <Image src={img.ICON_DETAIL_SHARE} />
+          <Text>分享朋友圈</Text>
+        </View>
+        <View onClick={handleSaveToLocal}>
+          <Image src={img.ICON_DETAIL_SHARE} />
+          <Text>保存到本地</Text>
+        </View>
+      </View>
+    </CommonPopup>
+  )
+})
 
 function Index() {
   // 使用Zustand store
@@ -35,10 +97,13 @@ function Index() {
   const [colors, setColors] = useState<string []>([])
   const [detail, setDetail] = useState<any>(null)
   const { params } = useRouter()
-  const { id, share } = params
+  const { id, autoShare, from } = params
+
+  console.log('from', from)
 
   // 本地状态管理
   const [loading, setLoading] = useState(false)
+  const sharePopupRef = useRef<any>(null)
 
   // 页面加载时获取数据
   useEffect(() => {
@@ -63,6 +128,20 @@ function Index() {
     setColors(textcolors)
   }
 
+  function handleShare() {
+    sharePopupRef.current.show()
+  }
+
+  const openMap = () => {
+    Taro.openLocation({
+      latitude: detail?.latitude,   // 纬度（必填）
+      longitude: detail?.longitude, // 经度（必填）
+      name: '上海体育场',   // 位置名（可选）
+      address: '上海市徐汇区肇嘉浜路128号', // 地址详情（可选）
+      scale: 15,            // 地图缩放级别（1-28）
+    })
+  }
+
   const tags = [{
     name: '🕙 急招',
     icon: '',
@@ -143,7 +222,7 @@ function Index() {
       {/* custom navbar */}
       <view className="custom-navbar">
         <View className='detail-navigator'>
-          <View className='detail-navigator-back'>
+          <View className='detail-navigator-back' onClick={() => { Taro.navigateBack() }}>
             <Image className='detail-navigator-back-icon' src={img.ICON_ARROW_LEFT} />
           </View>
           <View className='detail-navigator-icon'>
@@ -238,7 +317,7 @@ function Index() {
               {/* location message */}
               <View className='location-message-text'>
                 {/* venue name and distance */}
-                <View className='location-message-text-name-distance'>
+                <View className='location-message-text-name-distance' onClick={openMap}>
                   <Text>上海体育场</Text>
                   <Text>·</Text>
                   <Text>1.2km</Text>
@@ -461,6 +540,8 @@ function Index() {
             </View>
           </View>
         </View>
+        {/* share popup */}
+        <SharePopup ref={sharePopupRef} id={id} from={from} />
       </View>
     </View>
   )
diff --git a/src/pages/index/index.config.ts b/src/pages/index/index.config.ts
deleted file mode 100644
index 12abc5f..0000000
--- a/src/pages/index/index.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '首页'
-})
diff --git a/src/pages/index/index.module.scss b/src/pages/index/index.module.scss
deleted file mode 100644
index 0519ecb..0000000
--- a/src/pages/index/index.module.scss
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss
deleted file mode 100644
index 282231f..0000000
--- a/src/pages/index/index.scss
+++ /dev/null
@@ -1,261 +0,0 @@
-.index-page {
-  padding: 20px;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  min-height: 100vh;
-  
-  .page-header {
-    text-align: center;
-    margin-bottom: 24px;
-    
-    .page-title {
-      font-size: 28px;
-      font-weight: bold;
-      color: white;
-      display: block;
-      margin-bottom: 8px;
-    }
-    
-    .page-subtitle {
-      font-size: 16px;
-      color: rgba(255, 255, 255, 0.8);
-      display: block;
-    }
-  }
-  
-  .user-card {
-    background: white;
-    border-radius: 16px;
-    padding: 20px;
-    margin-bottom: 20px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-    
-    .user-header {
-      display: flex;
-      align-items: center;
-      gap: 16px;
-      
-      .user-info {
-        flex: 1;
-        
-        .username {
-          font-size: 20px;
-          font-weight: bold;
-          color: #333;
-          display: block;
-          margin-bottom: 4px;
-        }
-        
-        .user-level {
-          font-size: 14px;
-          color: #666;
-          display: block;
-          margin-bottom: 4px;
-        }
-        
-        .join-date {
-          font-size: 12px;
-          color: #999;
-          display: block;
-        }
-      }
-    }
-  }
-  
-  .stats-section {
-    background: white;
-    border-radius: 16px;
-    padding: 20px;
-    margin-bottom: 20px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-    
-    .section-title {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 16px;
-      display: block;
-    }
-    
-    :global {
-      .nut-cell {
-        background: #f8f9fa;
-        border-radius: 12px;
-        margin-bottom: 8px;
-        border: none;
-        
-        &:last-child {
-          margin-bottom: 0;
-        }
-        
-        .nut-cell__title {
-          font-weight: 500;
-          color: #555;
-        }
-        
-        .nut-cell__value {
-          font-weight: bold;
-          color: #007bff;
-        }
-      }
-    }
-  }
-  
-  .action-section {
-    background: white;
-    border-radius: 16px;
-    padding: 20px;
-    margin-bottom: 20px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-    
-    .section-title {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 16px;
-      display: block;
-    }
-    
-    .button-group {
-      display: flex;
-      flex-direction: column;
-      gap: 12px;
-      
-      .custom-button {
-        border-radius: 12px;
-        font-weight: 500;
-        height: 48px;
-        border: none;
-        margin-bottom: 12px;
-        font-size: 16px;
-        color: white;
-        
-        &.primary-btn {
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        }
-        
-        &.success-btn {
-          background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
-        }
-        
-        &.warning-btn {
-          background: linear-gradient(135deg, #fa709a 0%, #fee140 100%);
-        }
-        
-        &:disabled {
-          opacity: 0.6;
-        }
-      }
-      
-      // 保留 NutUI 按钮样式（备用）
-      :global {
-        .nut-button {
-          border-radius: 12px;
-          font-weight: 500;
-          height: 48px;
-          border: none;
-          
-          &--primary {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          }
-          
-          &--success {
-            background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
-          }
-          
-          &--warning {
-            background: linear-gradient(135deg, #fa709a 0%, #fee140 100%);
-          }
-          
-          &:disabled {
-            opacity: 0.6;
-          }
-        }
-      }
-    }
-  }
-  
-  .loading-section {
-    background: white;
-    border-radius: 16px;
-    padding: 20px;
-    margin-bottom: 20px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-    text-align: center;
-    
-    .loading-text {
-      font-size: 16px;
-      color: #666;
-      margin-bottom: 12px;
-      display: block;
-    }
-    
-    :global {
-      .nut-progress {
-        .nut-progress-outer {
-          background: #f0f0f0;
-          border-radius: 10px;
-        }
-        
-        .nut-progress-inner {
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 10px;
-        }
-      }
-    }
-  }
-  
-  .tips-section {
-    background: rgba(255, 255, 255, 0.95);
-    border-radius: 16px;
-    padding: 20px;
-    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-    
-    .tips-title {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 16px;
-      display: block;
-    }
-    
-    .tips-content {
-      .tip-item {
-        font-size: 14px;
-        color: #666;
-        line-height: 1.6;
-        margin-bottom: 8px;
-        display: block;
-        
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-    }
-  }
-}
-
-// 响应式设计
-@media (max-width: 768px) {
-  .index-page {
-    padding: 16px;
-    
-    .page-header {
-      .page-title {
-        font-size: 24px;
-      }
-      
-      .page-subtitle {
-        font-size: 14px;
-      }
-    }
-    
-    .user-card,
-    .stats-section,
-    .action-section,
-    .loading-section,
-    .tips-section {
-      padding: 16px;
-      margin-bottom: 16px;
-    }
-  }
-}
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
deleted file mode 100644
index 7c4e67b..0000000
--- a/src/pages/index/index.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import { View, Text, Button } from '@tarojs/components'
-import { Cell, Avatar, Progress } from '@nutui/nutui-react-taro'
-import Taro from '@tarojs/taro'
-// 导入API服务
-import demoApi from '../../services/demoApi'
-import commonApi from '../../services/commonApi'
-import {
-  useUserStats,
-  useUserActions
-} from '../../store/userStore'
-import './index.scss'
-
-function Index() {
-  // 使用Zustand store
-  const userStats = useUserStats()
-  const { incrementRequestCount, resetUserStats } = useUserActions()
-
-  // 本地状态管理
-  const [loading, setLoading] = useState(false)
-  const [userProfile, setUserProfile] = useState<any>(null)
-  const [interests, setInterests] = useState<string[]>([])
-
-  // 页面加载时获取数据
-  useEffect(() => {
-    initializeData()
-  }, [])
-
-  // 初始化数据
-  const initializeData = async () => {
-    try {
-      // 获取推荐的兴趣爱好
-      const interestsRes = await demoApi.getRecommendedInterests()
-      if (interestsRes.success) {
-        setInterests(interestsRes.data || [])
-      }
-    } catch (error) {
-      console.log('获取初始数据失败:', error)
-    }
-  }
-
-  // 1. 获取用户信息 API 请求
-  const handleGetUserProfile = async () => {
-    console.log('获取用户信息...');
-    setLoading(true)
-
-    try {
-      const response = await demoApi.getUserProfile()
-
-      if (response.success) {
-        setUserProfile(response.data)
-        incrementRequestCount()
-
-        Taro.showToast({
-          title: '获取用户信息成功',
-          icon: 'success'
-        })
-
-        console.log('用户信息:', response.data)
-      }
-    } catch (error) {
-      console.error('获取用户信息失败:', error)
-      Taro.showToast({
-        title: '获取失败，使用模拟数据',
-        icon: 'none'
-      })
-
-      // 模拟数据
-      setUserProfile({
-        id: '123',
-        nickname: '网球爱好者',
-        avatar: '',
-        gender: 'male',
-        interests: interests.slice(0, 3)
-      })
-      incrementRequestCount()
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 2. 提交统计数据 API 请求
-  const handleSubmitStats = async () => {
-    console.log('提交统计数据...');
-    setLoading(true)
-
-    try {
-      const response = await commonApi.submitForm('userStats', [
-        {
-          type: 'userStats',
-          data: {
-            requestCount: userStats.requestCount,
-            matchesCreated: userStats.matchesCreated,
-            matchesJoined: userStats.matchesJoined,
-            lastActiveTime: userStats.lastActiveTime,
-            userId: userProfile?.id || 'guest'
-          }
-        }
-      ])
-
-      if (response.success) {
-        incrementRequestCount()
-
-        Taro.showToast({
-          title: '统计数据提交成功',
-          icon: 'success'
-        })
-
-        console.log('提交结果:', response.data)
-      }
-    } catch (error) {
-      console.error('提交统计数据失败:', error)
-      incrementRequestCount() // 即使失败也计数，用于演示
-
-      Taro.showToast({
-        title: '网络模拟提交成功',
-        icon: 'success'
-      })
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 3. 提交反馈 API 请求
-  const handleSubmitFeedback = async () => {
-    console.log('提交用户反馈...');
-    setLoading(true)
-
-    try {
-      const response = await demoApi.submitFeedback({
-        matchId: 'demo_match_' + Date.now(),
-        rating: 5,
-        recommend: 'yes',
-        aspects: ['场地环境', '服务质量', '价格合理'],
-        comments: `用户反馈 - 请求次数: ${userStats.requestCount + 1}，体验良好！`
-      })
-
-      if (response.success) {
-        incrementRequestCount()
-
-        Taro.showToast({
-          title: '反馈提交成功',
-          icon: 'success'
-        })
-
-        console.log('反馈结果:', response.data)
-      }
-    } catch (error) {
-      console.error('提交反馈失败:', error)
-      incrementRequestCount() // 即使失败也计数，用于演示
-
-      Taro.showToast({
-        title: '网络模拟提交成功',
-        icon: 'success'
-      })
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  // 重置所有数据
-  const handleResetAllData = () => {
-    console.log('重置所有数据...');
-    resetUserStats()
-    setUserProfile(null)
-
-    Taro.showToast({
-      title: '数据已重置',
-      icon: 'success'
-    })
-  }
-
-  return (
-    <View className='index-page'>
-      {/* 页面标题 */}
-      <View className='page-header'>
-        <Text className='page-title'>API 请求演示</Text>
-        <Text className='page-subtitle'>真实网络请求功能测试</Text>
-      </View>
-
-      {/* 用户信息卡片 */}
-      <View className='user-card'>
-        <View className='user-header'>
-          <Avatar
-            size="large"
-            src={userProfile?.avatar || ''}
-            style={{ backgroundColor: '#fa2c19' }}
-          >
-            {userProfile?.nickname?.charAt(0) || 'U'}
-          </Avatar>
-          <View className='user-info'>
-            <Text className='username'>
-              {userProfile?.nickname || '点击获取用户信息'}
-            </Text>
-            <Text className='user-level'>
-              性别: {userProfile?.gender === 'male' ? '男' : userProfile?.gender === 'female' ? '女' : '未知'}
-            </Text>
-            <Text className='join-date'>
-              兴趣: {userProfile?.interests?.join(', ') || '暂无'}
-            </Text>
-          </View>
-        </View>
-      </View>
-
-      {/* 统计数据 */}
-      <View className='stats-section'>
-        <Text className='section-title'>📊 API 请求统计</Text>
-
-        <Cell title="API 请求次数" extra={userStats.requestCount} />
-        <Cell title="创建的比赛" extra={userStats.matchesCreated} />
-        <Cell title="参加的比赛" extra={userStats.matchesJoined} />
-        <Cell
-          title="最后活跃时间"
-          extra={new Date(userStats.lastActiveTime).toLocaleTimeString()}
-        />
-        {interests.length > 0 && (
-          <Cell
-            title="推荐兴趣"
-            extra={interests.slice(0, 2).join(', ')}
-          />
-        )}
-      </View>
-
-      {/* API 请求按钮区域 */}
-      <View className='action-section'>
-        <Text className='section-title'>🚀 API 请求功能</Text>
-
-        <View className='button-group'>
-          <Button
-            type="primary"
-            loading={loading}
-            onClick={handleGetUserProfile}
-            disabled={loading}
-            className="custom-button primary-btn"
-          >
-            {loading ? '请求中...' : '获取用户信息'}
-          </Button>
-
-          <Button
-            type="default"
-            loading={loading}
-            onClick={handleSubmitStats}
-            disabled={loading}
-            className="custom-button success-btn"
-          >
-            {loading ? '提交中...' : '提交统计数据'}
-          </Button>
-
-          <Button
-            type="default"
-            loading={loading}
-            onClick={handleSubmitFeedback}
-            disabled={loading}
-            className="custom-button warning-btn"
-          >
-            {loading ? '提交中...' : '提交用户反馈'}
-          </Button>
-
-          <Button
-            type="warn"
-            onClick={handleResetAllData}
-            disabled={loading}
-            className="custom-button warning-btn"
-          >
-            重置所有数据
-          </Button>
-        </View>
-      </View>
-
-      {/* 实时进度显示 */}
-      {loading && (
-        <View className='loading-section'>
-          <Text className='loading-text'>正在发送 API 请求...</Text>
-          <Progress percent={100} animated />
-        </View>
-      )}
-
-      {/* 提示信息 */}
-      <View className='tips-section'>
-        <Text className='tips-title'>💡 API 功能说明</Text>
-        <View className='tips-content'>
-          <Text className='tip-item'>• "获取用户信息" - 调用用户资料 API</Text>
-          <Text className='tip-item'>• "提交统计数据" - 发送统计到服务器</Text>
-          <Text className='tip-item'>• "提交用户反馈" - 发送用户评价数据</Text>
-          <Text className='tip-item'>• 所有请求都会增加 API 计数统计</Text>
-          <Text className='tip-item'>• 请求失败时会自动使用模拟数据</Text>
-        </View>
-      </View>
-    </View>
-  )
-}
-
-export default Index
diff --git a/src/pages/publishBall/index.tsx b/src/pages/publishBall/index.tsx
index 71f92e3..ff903a7 100644
--- a/src/pages/publishBall/index.tsx
+++ b/src/pages/publishBall/index.tsx
@@ -6,40 +6,40 @@ import PublishForm from './publishForm'
 import { publishBallFormSchema } from '../../config/formSchema/publishBallFormSchema';
 import { PublishBallFormData } from '../../../types/publishBall';
 import PublishService from '@/services/publishService';
-import { getNextHourTime, getEndTime } from '@/utils/timeUtils';
+import { getNextHourTime, getEndTime, delay } from '@/utils';
 import images from '@/config/images'
 import styles from './index.module.scss'
 
 const defaultFormData: PublishBallFormData = {
-  title: '',   
-  image_list: ['https://static-o.oss-cn-shenzhen.aliyuncs.com/images/tpbj/tpss10.jpg'],  
+  title: '',
+  image_list: ['https://static-o.oss-cn-shenzhen.aliyuncs.com/images/tpbj/tpss10.jpg'],
   timeRange: {
-    start_time: getNextHourTime(), 
+    start_time: getNextHourTime(),
     end_time: getEndTime(getNextHourTime())
   },
-  activityInfo: {   
+  activityInfo: {
     play_type: '不限',
     price: '',
-    venue_id: null, 
+    venue_id: null,
     location_name: '',
-    location: '', 
-    latitude: '', 
+    location: '',
+    latitude: '',
     longitude: '',
-    court_type: '', 
-    court_surface: '', 
-    venue_description_tag: [], 
-    venue_description: '', 
-    venue_image_list: [], 
+    court_type: '',
+    court_surface: '',
+    venue_description_tag: [],
+    venue_description: '',
+    venue_image_list: [],
   },
   players: [1, 4],
   skill_level: [1.0, 5.0],
   descriptionInfo: {
-    description: '', 
-    description_tag: [], 
+    description: '',
+    description_tag: [],
   },
-  is_substitute_supported: true, 
-  is_wechat_contact: true, 
-  wechat_contact: '14223332214' 
+  is_substitute_supported: true,
+  is_wechat_contact: true,
+  wechat_contact: '14223332214'
 }
 
 const PublishBall: React.FC = () => {
@@ -47,7 +47,7 @@ const PublishBall: React.FC = () => {
   const [formData, setFormData] = useState<PublishBallFormData[]>([
     defaultFormData
   ])
-  
+
   // 删除确认弹窗状态
   const [deleteConfirm, setDeleteConfirm] = useState<{
     visible: boolean;
@@ -195,6 +195,13 @@ const PublishBall: React.FC = () => {
           title: '发布成功',
           icon: 'success'
         })
+        delay(1000)
+        // 如果是个人球局，则跳转到详情页，并自动分享
+        // 如果是畅打，则跳转第一个球局详情页，并自动分享 @刘杰
+        Taro.navigateTo({
+          // @ts-expect-error: id
+          url: `/pages/detail/index?id=${res.data.id || 1}&from=publish&autoShare=1`
+        })
       } else {
         Taro.showToast({
           title: res.message,
@@ -208,12 +215,12 @@ const PublishBall: React.FC = () => {
     <View className={styles['publish-ball']}>
       {/* 活动类型切换 */}
       <View className={styles['activity-type-switch']}>
-        <ActivityTypeSwitch 
+        <ActivityTypeSwitch
           value={activityType}
           onChange={handleActivityTypeChange}
         />
       </View>
-      
+
       <View className={styles['publish-ball__scroll']}>
         {
           formData.map((item, index) => (
@@ -223,19 +230,19 @@ const PublishBall: React.FC = () => {
                 <View className={styles['session-header']}>
                   <View className={styles['session-title']}>
                   第{index + 1}场
-                  <View 
-                      className={styles['session-delete']} 
+                  <View
+                      className={styles['session-delete']}
                       onClick={() => showDeleteConfirm(index)}
                     >
                       <Image src={images.ICON_DELETE} className={styles['session-delete-icon']} />
-                      
+
                     </View>
                   </View>
                   <View className={styles['session-actions']}>
-                    
+
                     {index > 0 && (
-                      <View 
-                        className={styles['session-action-btn']} 
+                      <View
+                        className={styles['session-action-btn']}
                         onClick={() => handleCopyPrevious(index)}
                       >
                         复制上一场
@@ -244,10 +251,10 @@ const PublishBall: React.FC = () => {
                   </View>
                 </View>
               )}
-              <PublishForm 
-                formData={item} 
-                onChange={(key, value) => updateFormData(key, value, index)} 
-                optionsConfig={publishBallFormSchema} 
+              <PublishForm
+                formData={item}
+                onChange={(key, value) => updateFormData(key, value, index)}
+                optionsConfig={publishBallFormSchema}
               />
             </View>
           ))
@@ -269,14 +276,14 @@ const PublishBall: React.FC = () => {
             <Text className={styles['delete-modal__title']}>确认移除该场次？</Text>
             <Text className={styles['delete-modal__desc']}>该操作不可恢复</Text>
             <View className={styles['delete-modal__actions']}>
-              <Button 
-                className={styles['delete-modal__btn']} 
+              <Button
+                className={styles['delete-modal__btn']}
                 onClick={closeDeleteConfirm}
               >
                 再想想
               </Button>
-              <Button 
-                className={styles['delete-modal__btn']} 
+              <Button
+                className={styles['delete-modal__btn']}
                 onClick={confirmDelete}
               >
                 确认移除
diff --git a/src/static/asserts/fonts/PoetsenOne-Regular.ttf b/src/static/asserts/fonts/PoetsenOne-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..1a89422d7f8cdde4469cf0f85424f68c1e199476
GIT binary patch
literal 177704
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

literal 0
HcmV?d00001

diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..1192161
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,9 @@
+export * from './getNavbarHeight'
+export * from './locationUtils'
+export * from './processImage'
+export * from './timeUtils'
+export * from './tokenManager'
+
+export function delay(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
\ No newline at end of file
diff --git a/types/list/types.ts b/types/list/types.ts
index 6d71c50..818dd14 100644
--- a/types/list/types.ts
+++ b/types/list/types.ts
@@ -146,6 +146,7 @@ export interface FilterPopupProps {
 
 // 列表卡片
 export interface ListCardProps {
+  id: number;
   title: string;
   dateTime: string;
   location: string;

From 924afbb3cf0134c8d853cfd16a43ac12b4b19862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Tue, 26 Aug 2025 19:29:34 +0800
Subject: [PATCH 19/22] feat: add guide route and message page and empty person
 page

---
 src/app.config.ts                       |  3 +
 src/components/GuideBar/index.scss      | 88 +++++++++++++++++++++++++
 src/components/GuideBar/index.tsx       | 70 ++++++++++++++++++++
 src/config/images.js                    |  2 +
 src/pages/detail/index.tsx              |  8 ++-
 src/pages/list/index.tsx                |  5 +-
 src/pages/message/index.config.ts       |  5 ++
 src/pages/message/index.scss            | 80 ++++++++++++++++++++++
 src/pages/message/index.tsx             | 43 ++++++++++++
 src/pages/orderCheck/index.config.ts    |  4 ++
 src/pages/orderCheck/index.scss         |  1 +
 src/pages/orderCheck/index.tsx          | 12 ++++
 src/pages/personal/index.config.ts      |  5 ++
 src/pages/personal/index.scss           | 35 ++++++++++
 src/pages/personal/index.tsx            | 31 +++++++++
 src/scss/images.scss                    |  2 +
 src/static/common/guide-bar-publish.svg | 22 +++++++
 src/static/common/navigator-back.svg    |  3 +
 18 files changed, 417 insertions(+), 2 deletions(-)
 create mode 100644 src/components/GuideBar/index.scss
 create mode 100644 src/components/GuideBar/index.tsx
 create mode 100644 src/pages/message/index.config.ts
 create mode 100644 src/pages/message/index.scss
 create mode 100644 src/pages/message/index.tsx
 create mode 100644 src/pages/orderCheck/index.config.ts
 create mode 100644 src/pages/orderCheck/index.scss
 create mode 100644 src/pages/orderCheck/index.tsx
 create mode 100644 src/pages/personal/index.config.ts
 create mode 100644 src/pages/personal/index.scss
 create mode 100644 src/pages/personal/index.tsx
 create mode 100644 src/static/common/guide-bar-publish.svg
 create mode 100644 src/static/common/navigator-back.svg

diff --git a/src/app.config.ts b/src/app.config.ts
index ba6d663..e12e2bd 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -8,6 +8,9 @@ export default defineAppConfig({
     'pages/publishBall/index',
     // 'pages/mapDisplay/index',
     'pages/detail/index',
+    'pages/message/index',
+    'pages/personal/index',
+    'pages/orderCheck/index',
   ],
   window: {
     backgroundTextStyle: 'light',
diff --git a/src/components/GuideBar/index.scss b/src/components/GuideBar/index.scss
new file mode 100644
index 0000000..41787e9
--- /dev/null
+++ b/src/components/GuideBar/index.scss
@@ -0,0 +1,88 @@
+@use '~@/scss/images.scss' as img;
+
+.guide-bar-container {
+  padding-top: calc(60px + 20px + env(safe-area-inset-bottom));
+}
+
+.guide-bar {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height: calc(60px + 20px + env(safe-area-inset-bottom));
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 12px env(safe-area-inset-bottom);
+
+  &-pages {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    display: inline-flex;
+    height: 60px;
+    padding: 8px 6px;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    border-radius: 999px;
+    border: 1px solid rgba(255, 255, 255, 0.20);
+    background: rgba(255, 255, 255, 0.40);
+    box-shadow: 0 4px 64px 0 rgba(0, 0, 0, 0.16);
+    backdrop-filter: blur(16px);
+
+    &-item {
+      display: flex;
+      width: 76px;
+      height: 48px;
+      padding: 14px 22px;
+      box-sizing: border-box;
+      justify-content: center;
+      align-items: center;
+      gap: 10px;
+      color: rgba(60, 60, 67, 0.60);
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 20px; /* 125% */
+    }
+
+    &-item-active {
+      display: flex;
+      width: 76px;
+      height: 48px;
+      padding: 14px 22px;
+      box-sizing: border-box;
+      justify-content: center;
+      align-items: center;
+      gap: 10px;
+      border-radius: 999px;
+      border: 0.5px solid rgba(0, 0, 0, 0.06);
+      background: #FFF;
+      box-shadow: 0 4px 48px 0 rgba(0, 0, 0, 0.08);
+      color: #000;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 20px; /* 125% */
+    }
+  }
+
+  &-publish {
+    display: flex;
+    width: 60px;
+    height: 60px;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    border-radius: 999px;
+    // border: 2px solid rgba(0, 0, 0, 0.06);
+    background: radial-gradient(75.92% 98.69% at 26.67% 8.33%, #BDFF4A 16.88%, #95F23E 54.19%, #32D838 100%);
+    box-shadow: 0 4px 48px 0 rgba(0, 0, 0, 0.08);
+    backdrop-filter: blur(16px);
+
+    &-icon {
+      width: 36px;
+      height: 36px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/GuideBar/index.tsx b/src/components/GuideBar/index.tsx
new file mode 100644
index 0000000..d616759
--- /dev/null
+++ b/src/components/GuideBar/index.tsx
@@ -0,0 +1,70 @@
+import React, { useState } from 'react'
+import { View, Text, Image } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import img from '@/config/images'
+import './index.scss'
+
+export type currentPageType = 'games' | 'message' | 'personal'
+
+const GuideBar = (props) => {
+  const { currentPage } = props
+
+  const guideItems = [
+    {
+      code: 'list',
+      text: '球局',
+    },
+    {
+      code: 'message',
+      text: '消息',
+    },
+    {
+      code: 'personal',
+      text: '我的',
+    },
+  ]
+
+  const handlePublish = () => {
+    Taro.navigateTo({
+      url: '/pages/publishBall/index',
+    })
+  }
+
+  const handlePageChange = (code: string) => {
+    if (code === currentPage) {
+      return
+    }
+    Taro.navigateTo({
+      url: `/pages/${code}/index`,
+    }).then(() => {
+      Taro.pageScrollTo({
+        scrollTop: 0,
+        duration: 300,
+      })
+    })
+  }
+
+  return (
+    <View className='guide-bar-container'>
+      <View className='guide-bar'>
+        {/* guide area on the left */}
+        <View className='guide-bar-pages'>
+          {guideItems.map((item) => (
+            <View
+              className={`guide-bar-pages-item ${currentPage === item.code ? 'guide-bar-pages-item-active' : ''}`}
+              onClick={() => handlePageChange(item.code)}
+            >
+              <Text>{item.text}</Text>
+            </View>
+          ))}
+        </View>
+        {/* publish button on the right */}
+        <View className='guide-bar-publish' onClick={handlePublish}>
+          <Image className='guide-bar-publish-icon' src={img.ICON_GUIDE_BAR_PUBLISH} />
+        </View>
+      </View>
+    </View>
+  )
+}
+
+export default GuideBar
\ No newline at end of file
diff --git a/src/config/images.js b/src/config/images.js
index 13c69c9..61d87fe 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -41,4 +41,6 @@ export default {
     ICON_DETAIL_COMMENT: require('@/static/detail/icon-comment.svg'),
     ICON_DETAIL_COMMENT_DARK: require('@/static/detail/icon-comment-dark.svg'),
     ICON_DETAIL_SHARE: require('@/static/detail/icon-share-dark.svg'),
+    ICON_GUIDE_BAR_PUBLISH: require('@/static/common/guide-bar-publish.svg'),
+    ICON_NAVIGATOR_BACK: require('@/static/common/navigator-back.svg'),
   }
\ No newline at end of file
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index 957328b..f0e856a 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -142,6 +142,12 @@ function Index() {
     })
   }
 
+  const handleJoinGame = () => {
+    Taro.navigateTo({
+      url: `/pages/orderCheck/index?id=${id}`,
+    })
+  }
+
   const tags = [{
     name: '🕙 急招',
     icon: '',
@@ -532,7 +538,7 @@ function Index() {
               <Text className='sticky-bottom-bar-comment-text'>32</Text>
             </View>
           </View>
-          <View className="sticky-bottom-bar-join-game">
+          <View className="sticky-bottom-bar-join-game" onClick={handleJoinGame}>
             <Text>🎾</Text>
             <Text>立即加入</Text>
             <View className='game-price'>
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 7c12b7f..220117b 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -12,11 +12,12 @@ import { useListStore } from "@/store/listStore";
 import {useGlobalState} from '@/store/global'
 import { View } from "@tarojs/components";
 import CustomerNavBar from "@/components/CustomNavbar";
+import GuideBar from "@/components/GuideBar";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
   const store = useListStore() || {};
-  
+
     const {statusNavbarHeightInfo } = useGlobalState() || {}
     // console.log("===store===", store);
     // console.log('===statusNavbarHeightInfo', statusNavbarHeightInfo)
@@ -241,6 +242,8 @@ const ListPage = () => {
             })}
         </View>
       </View>
+
+      <GuideBar currentPage='list' />
     </>
   );
 };
diff --git a/src/pages/message/index.config.ts b/src/pages/message/index.config.ts
new file mode 100644
index 0000000..42d7ad1
--- /dev/null
+++ b/src/pages/message/index.config.ts
@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '消息',
+  // navigationBarBackgroundColor: '#FAFAFA',
+  navigationStyle: 'custom',
+})
\ No newline at end of file
diff --git a/src/pages/message/index.scss b/src/pages/message/index.scss
new file mode 100644
index 0000000..092c41b
--- /dev/null
+++ b/src/pages/message/index.scss
@@ -0,0 +1,80 @@
+@use '~@/scss/images.scss' as img;
+
+$--Backgrounds-Primary: '#fff';
+
+.message-container {
+  width: 100%;
+  height: 100vh;
+  background: radial-gradient(227.15% 100% at 50% 0%, #EEFFDC 0%, #FFF 36.58%), var(--Backgrounds-Primary, #FFF);
+  // padding-top: 100px;
+  box-sizing: border-box;
+
+  .custom-navbar {
+    height: 56px; /* 通常与原生导航栏高度一致 */
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    // background-color: #fff;
+    color: #000;
+    padding-top: 44px; /* 适配状态栏 */
+    position: sticky;
+    top: 0;
+    z-index: 100;
+
+    .message-navigator {
+      position: relative;
+      left: 15px;
+      top: -2px;
+      width: 80px;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 10px;
+
+      .message-navigator-avatar {
+        width: 32px;
+        height: 32px;
+      }
+
+      .message-navigator-title {
+        font-size: 16px;
+        font-weight: 500;
+        color: #000;
+      }
+    }
+  }
+
+  .message-content {
+
+    .message-content-list {
+      display: flex;
+      flex-direction: column;
+      padding: 10px 15px;
+      box-sizing: border-box;
+      gap: 12px;
+
+      .message-item {
+        padding: 10px;
+        // border: 1px solid rgba(0, 0, 0, 0.1);
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
+        background-color: rgba(255, 255, 255, 0.5);
+        border-radius: 10px;
+      }
+
+      .message-item-title {
+        font-size: 16px;
+        font-weight: 500;
+        color: #000;
+      }
+
+      .message-item-content {
+        font-size: 14px;
+        color: #666;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/pages/message/index.tsx b/src/pages/message/index.tsx
new file mode 100644
index 0000000..18f4130
--- /dev/null
+++ b/src/pages/message/index.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import { View, Text, ScrollView } from '@tarojs/components'
+import { Avatar } from '@nutui/nutui-react-taro'
+import Taro from '@tarojs/taro'
+import GuideBar from '@/components/GuideBar'
+// import img from '@/config/images'
+import './index.scss'
+
+const Personal = () => {
+  const messageList = Array(10).fill(0).map((_, index) => ({
+    id: index + 1,
+    title: `消息${index + 1}消息${index + 1}消息${index + 1}消息${index + 1}`,
+    content: Array(Math.round(Math.random() * 40)).fill(0).map((_, index) => `消息${index + 1}`).join(''),
+  }))
+
+  return (
+    <View className='message-container'>
+      <View className='custom-navbar'>
+        <View className='message-navigator'>
+          <Avatar className='message-navigator-avatar' src="https://img.yzcdn.cn/vant/cat.jpeg" />
+          <Text className='message-navigator-title'>消息</Text>
+        </View>
+      </View>
+      <ScrollView scrollY className='message-content'>
+        <View className='message-content-list'>
+          {messageList.map((item) => (
+            <View className='message-item' key={item.id}>
+              <View className='message-item-title'>
+                <Text>{item.title}</Text>
+              </View>
+              <View className='message-item-content'>
+                <Text>{item.content}</Text>
+              </View>
+            </View>
+          ))}
+        </View>
+      </ScrollView>
+      <GuideBar currentPage='message' />
+    </View>
+  )
+}
+
+export default Personal
\ No newline at end of file
diff --git a/src/pages/orderCheck/index.config.ts b/src/pages/orderCheck/index.config.ts
new file mode 100644
index 0000000..e8419ed
--- /dev/null
+++ b/src/pages/orderCheck/index.config.ts
@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '订单确认',
+  navigationBarBackgroundColor: '#FAFAFA'
+})
\ No newline at end of file
diff --git a/src/pages/orderCheck/index.scss b/src/pages/orderCheck/index.scss
new file mode 100644
index 0000000..e9e7c6b
--- /dev/null
+++ b/src/pages/orderCheck/index.scss
@@ -0,0 +1 @@
+@use '~@/scss/images.scss' as img;
\ No newline at end of file
diff --git a/src/pages/orderCheck/index.tsx b/src/pages/orderCheck/index.tsx
new file mode 100644
index 0000000..8165946
--- /dev/null
+++ b/src/pages/orderCheck/index.tsx
@@ -0,0 +1,12 @@
+import React from 'react'
+import { View, Text } from '@tarojs/components'
+
+const OrderCheck = () => {
+  return (
+    <View>
+      <Text>OrderCheck</Text>
+    </View>
+  )
+}
+
+export default OrderCheck
\ No newline at end of file
diff --git a/src/pages/personal/index.config.ts b/src/pages/personal/index.config.ts
new file mode 100644
index 0000000..ca1f786
--- /dev/null
+++ b/src/pages/personal/index.config.ts
@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '个人中心',
+  // navigationBarBackgroundColor: '#FAFAFA',
+  navigationStyle: 'custom',
+})
\ No newline at end of file
diff --git a/src/pages/personal/index.scss b/src/pages/personal/index.scss
new file mode 100644
index 0000000..c2475fe
--- /dev/null
+++ b/src/pages/personal/index.scss
@@ -0,0 +1,35 @@
+@use '~@/scss/images.scss' as img;
+
+$--Backgrounds-Primary: '#fff';
+
+.personal-container {
+  width: 100%;
+  height: 100vh;
+  background: radial-gradient(227.15% 100% at 50% 0%, #EEFFDC 0%, #FFF 36.58%), var(--Backgrounds-Primary, #FFF);
+  padding-top: 100px;
+  box-sizing: border-box;
+
+  .personal-navigator {
+    position: fixed;
+    left: 10px;
+    top: 54px;
+    width: 32px;
+    height: 32px;
+
+    .personal-navigator-back {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .personal-content {
+    width: 100%;
+    height: calc(100vh - 300px);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32px;
+    font-weight: 500;
+    color: #000;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/personal/index.tsx b/src/pages/personal/index.tsx
new file mode 100644
index 0000000..042bc8e
--- /dev/null
+++ b/src/pages/personal/index.tsx
@@ -0,0 +1,31 @@
+import React from 'react'
+import { View, Text, Image } from '@tarojs/components'
+import Taro, { useRouter } from '@tarojs/taro'
+import GuideBar from '@/components/GuideBar'
+import img from '@/config/images'
+import './index.scss'
+
+const Personal = () => {
+  const { params } = useRouter()
+  const { id } = params
+
+  const handleBack = () => {
+    Taro.navigateBack()
+  }
+
+  return (
+    <View className='personal-container'>
+      {id && (
+        <View className='personal-navigator' onClick={handleBack}>
+          <Image className='personal-navigator-back' src={img.ICON_NAVIGATOR_BACK} />
+        </View>
+      )}
+      <View className='personal-content'>
+        <Text>Personal</Text>
+      </View>
+      <GuideBar currentPage='personal' />
+    </View>
+  )
+}
+
+export default Personal
\ No newline at end of file
diff --git a/src/scss/images.scss b/src/scss/images.scss
index 3527d5a..28b8db1 100644
--- a/src/scss/images.scss
+++ b/src/scss/images.scss
@@ -38,6 +38,8 @@ $-images: (
   'icon-detail-comment': '/detail/icon-comment.svg',
   'icon-detail-comment-dark': '/detail/icon-comment-dark.svg',
   'icon-detail-share': '/detail/icon-share-dark.svg',
+  'icon-guide-bar-publish': '/common/guide-bar-publish.svg',
+  'icon-navigator-back': '/common/navigator-back.svg',
 ) !default;
 
 // 图片获取函数
diff --git a/src/static/common/guide-bar-publish.svg b/src/static/common/guide-bar-publish.svg
new file mode 100644
index 0000000..133858f
--- /dev/null
+++ b/src/static/common/guide-bar-publish.svg
@@ -0,0 +1,22 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3006_12308)">
+<g filter="url(#filter0_d_3006_12308)">
+<path d="M18.0479 5.5C19.1523 5.50156 20.0464 6.39843 20.0449 7.50293L20.0342 16H28.5C29.6046 16 30.5 16.8954 30.5 18C30.5 19.1046 29.6046 20 28.5 20H20.0283L20.0176 28.5029C20.016 29.6074 19.1191 30.5014 18.0146 30.5C16.9104 30.4982 16.0161 29.6014 16.0176 28.4971L16.0283 20H7.5C6.39543 20 5.5 19.1046 5.5 18C5.5 16.8954 6.39543 16 7.5 16H16.0342L16.0449 7.49707C16.0465 6.39276 16.9435 5.49874 18.0479 5.5Z" fill="white"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_3006_12308" x="-6.5" y="-2.5" width="49" height="49" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="6"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_3006_12308"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_3006_12308" result="shape"/>
+</filter>
+<clipPath id="clip0_3006_12308">
+<rect width="36" height="36" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/static/common/navigator-back.svg b/src/static/common/navigator-back.svg
new file mode 100644
index 0000000..2ac5245
--- /dev/null
+++ b/src/static/common/navigator-back.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <path d="M20.6667 24L12.6667 16L20.6667 8" stroke="black" stroke-width="2.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file

From 425ed50dc55216a32223012ac868badf59492492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= <alecdux@gmail.com>
Date: Tue, 26 Aug 2025 22:24:36 +0800
Subject: [PATCH 20/22] feat: fix CommonPopup nesting use and fix some style
 problem

---
 analyze.js                                    | 50 ++++++++++
 src/components/CommonPopup/CommonPopup.tsx    |  2 +-
 src/components/GuideBar/index.scss            |  5 +-
 src/components/UploadCover/index.tsx          | 13 ++-
 .../UploadCover/upload-source-popup.tsx       | 92 +++++++++++--------
 src/pages/detail/index.scss                   |  4 +-
 src/pages/detail/index.tsx                    |  4 +-
 src/pages/login/index/index.tsx               |  4 +-
 8 files changed, 123 insertions(+), 51 deletions(-)
 create mode 100644 analyze.js

diff --git a/analyze.js b/analyze.js
new file mode 100644
index 0000000..3b3453e
--- /dev/null
+++ b/analyze.js
@@ -0,0 +1,50 @@
+const fs = require('fs');
+const path = require('path');
+
+// dist 目录路径，根据你项目实际情况修改
+const DIST_DIR = path.join(__dirname, 'dist');
+
+// 递归统计文件大小
+function getFiles(dir) {
+  let results = [];
+  const list = fs.readdirSync(dir);
+  list.forEach(file => {
+    const filePath = path.join(dir, file);
+    const stat = fs.statSync(filePath);
+    if (stat && stat.isDirectory()) {
+      results = results.concat(getFiles(filePath));
+    } else {
+      results.push({ path: filePath, size: stat.size });
+    }
+  });
+  return results;
+}
+
+function formatSize(bytes) {
+  if (bytes < 1024) return bytes + ' B';
+  if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + ' KB';
+  return (bytes / (1024 * 1024)).toFixed(2) + ' MB';
+}
+
+function analyze() {
+  if (!fs.existsSync(DIST_DIR)) {
+    console.error('dist 目录不存在，请先执行 taro build --type weapp');
+    return;
+  }
+
+  const files = getFiles(DIST_DIR);
+  const total = files.reduce((sum, f) => sum + f.size, 0);
+
+  console.log('文件大小分析（按从大到小排序）:');
+  files
+    .sort((a, b) => b.size - a.size)
+    .forEach(f => {
+      console.log(
+        `${formatSize(f.size)} | ${(f.size / total * 100).toFixed(2)}% | ${path.relative(DIST_DIR, f.path)}`
+      );
+    });
+
+  console.log(`\n总大小: ${formatSize(total)}`);
+}
+
+analyze();
diff --git a/src/components/CommonPopup/CommonPopup.tsx b/src/components/CommonPopup/CommonPopup.tsx
index ef8deac..26b0a03 100644
--- a/src/components/CommonPopup/CommonPopup.tsx
+++ b/src/components/CommonPopup/CommonPopup.tsx
@@ -54,7 +54,7 @@ const CommonPopup: React.FC<CommonPopupProps> = ({
       closeable={false}
       onClose={onClose}
       className={`${styles['common-popup']} ${className ? className : ''}`}
-      style={{ ...style, zIndex: zIndex ? zIndex : undefined }}
+      style={{ zIndex: zIndex ? zIndex : undefined, ...style }}
     >
       {showHeader && (
         <View className={styles['common-popup__header']}>
diff --git a/src/components/GuideBar/index.scss b/src/components/GuideBar/index.scss
index 41787e9..608a03a 100644
--- a/src/components/GuideBar/index.scss
+++ b/src/components/GuideBar/index.scss
@@ -20,6 +20,7 @@
     justify-content: space-between;
     align-items: center;
     display: inline-flex;
+    width: 240px;
     height: 60px;
     padding: 8px 6px;
     box-sizing: border-box;
@@ -34,7 +35,7 @@
       display: flex;
       width: 76px;
       height: 48px;
-      padding: 14px 22px;
+      // padding: 14px 0;
       box-sizing: border-box;
       justify-content: center;
       align-items: center;
@@ -50,7 +51,7 @@
       display: flex;
       width: 76px;
       height: 48px;
-      padding: 14px 22px;
+      // padding: 14px 22px;
       box-sizing: border-box;
       justify-content: center;
       align-items: center;
diff --git a/src/components/UploadCover/index.tsx b/src/components/UploadCover/index.tsx
index 08927d0..6da8f37 100644
--- a/src/components/UploadCover/index.tsx
+++ b/src/components/UploadCover/index.tsx
@@ -1,7 +1,7 @@
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useRef, useState } from 'react'
 import { Image, View, Text } from '@tarojs/components'
 import img from '../../config/images'
-import UploadSourcePopup from './upload-source-popup'
+import UploadSourcePopup, { sourceMap } from './upload-source-popup'
 import UploadFromWx from './upload-from-wx'
 import { CommonPopup } from '../'
 
@@ -58,6 +58,9 @@ export default function UploadCover(props: UploadCoverProps) {
   } = props
 
   const [visible, setVisible] = useState(false)
+  const uploadSourcePopupRef = useRef<{
+    show: (sourceType: sourceType, maxCount: number) => void
+  }>(null)
 
   const onAdd = useCallback((images: CoverImageValue[]) => {
     // FIXME: prev is not latest value
@@ -86,6 +89,7 @@ export default function UploadCover(props: UploadCoverProps) {
         round
         position="bottom"
         hideFooter
+        zIndex={1000}
       >
         <View className="upload-source-popup-container" style={{ height: source.length * 56 + 52 + 'px' }}>
           {
@@ -96,7 +100,9 @@ export default function UploadCover(props: UploadCoverProps) {
                     item === 'album' ? (
                       <UploadFromWx onAdd={onWxAdd} maxCount={maxCount - value.length} />
                     ) : (
-                      <UploadSourcePopup sourceType={item} onAdd={onAdd} maxCount={maxCount - value.length} />
+                      <View className="upload-source-popup-item-text" onClick={() => uploadSourcePopupRef.current?.show(item, maxCount - value.length)}>
+                        <Text>{sourceMap.get(item)}</Text>
+                      </View>
                     )
                   }
                 </View>
@@ -105,6 +111,7 @@ export default function UploadCover(props: UploadCoverProps) {
           }
         </View>
       </CommonPopup>
+      <UploadSourcePopup ref={uploadSourcePopupRef} onAdd={onAdd} />
       <div className={`upload-cover-root ${value.length === 0 && align === 'center' ? 'upload-cover-act-center' : ''}`}>
         {value.length < maxCount && (
           <div className="upload-cover-act" onClick={() => setVisible(true)}>
diff --git a/src/components/UploadCover/upload-source-popup.tsx b/src/components/UploadCover/upload-source-popup.tsx
index ccb156f..dc72e44 100644
--- a/src/components/UploadCover/upload-source-popup.tsx
+++ b/src/components/UploadCover/upload-source-popup.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react'
 import { Image, View, Text, ScrollView, Button } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import img from '../../config/images'
@@ -17,12 +17,10 @@ type ImageItem = {
 }
 
 interface UploadImageProps {
-  sourceType: SourceType
   onAdd: (images: ImageItem[]) => void
-  maxCount: number
 }
 
-const sourceMap = new Map<SourceType, string>([
+export const sourceMap = new Map<SourceType, string>([
   ['history', '历史图库'],
   ['preset', '预设图库']
 ])
@@ -31,13 +29,13 @@ const checkImageSelected = (images: ImageItem[], image: ImageItem) => {
   return images.some(item => item.id === image.id)
 }
 
-export default function UploadImage(props: UploadImageProps) {
+export default forwardRef(function UploadImage(props: UploadImageProps, ref) {
   const {
-    sourceType = 'history',
     onAdd = () => void 0,
-    maxCount = 9,
   } = props
   const [visible, setVisible] = useState(false)
+  const [sourceType, setSourceType] = useState<SourceType>('history')
+  const [maxCount, setMaxCount] = useState(9)
   const [images, setImages] = useState<ImageItem[]>([])
   const [selectedImages, setSelectedImages] = useState<ImageItem[]>([])
 
@@ -54,36 +52,50 @@ export default function UploadImage(props: UploadImageProps) {
     }
   }
 
-  useEffect(() => {
-    if (visible) {
-      publishService.getPictures({
-        pageOption: {
-          page: 1,
-          pageSize: 100,
-        },
-        seachOption: {
-          tag: '',
-          resource_type: 'image',
-          dateRange: [],
-        },
-      }).then(res => {
-        if (res.success) {
-          setImages(res.data.data.rows.map(item => ({
-            id: Date.now().toString(),
-            url: item.thumbnail_url,
-          })))
-        } else {
-          // TODO: 显示错误信息
-          Taro.showToast({
-            title: res.message,
-            icon: 'none'
-          })
-        }
-      })
-    } else {
-      setSelectedImages([])
+  useImperativeHandle(ref, () => ({
+    show: (sourceType: SourceType, maxCount: number) => {
+      setVisible(true)
+      setSourceType(sourceType)
+      setMaxCount(maxCount)
+      fetchImages()
     }
-  }, [visible])
+  }))
+
+  function fetchImages() {
+    publishService.getPictures({
+      pageOption: {
+        page: 1,
+        pageSize: 100,
+      },
+      seachOption: {
+        tag: '',
+        resource_type: 'image',
+        dateRange: [],
+      },
+    }).then(res => {
+      if (res.success) {
+        let start = 0
+        setImages(res.data.data.rows.map(item => ({
+          id: (Date.now() + start++).toString(),
+          url: item.thumbnail_url,
+        })))
+      } else {
+        // TODO: 显示错误信息
+        Taro.showToast({
+          title: res.message,
+          icon: 'none'
+        })
+      }
+    })
+  }
+
+  function onClose() {
+    setVisible(false)
+    setSelectedImages([])
+    setImages([])
+    setSourceType('history')
+    setMaxCount(9)
+  }
 
   const handleConfirm = () => {
     if (selectedImages.length > 0) {
@@ -103,10 +115,11 @@ export default function UploadImage(props: UploadImageProps) {
     <>
       <CommonPopup
         visible={visible}
-        onClose={() => setVisible(false)}
+        onClose={onClose}
         round
         hideFooter
         position='bottom'
+        zIndex={1001}
       >
         <View className="upload-popup">
           <View className="upload-popup-title">{sourceMap.get(sourceType)}</View>
@@ -154,8 +167,7 @@ export default function UploadImage(props: UploadImageProps) {
           )}
         </View>
       </CommonPopup>
-      <View className="upload-source-popup-text" onClick={() => setVisible(true)}>{sourceMap.get(sourceType)}选取</View>
+      {/* <View className="upload-source-popup-text" onClick={() => setVisible(true)}>{sourceMap.get(sourceType)}选取</View> */}
     </>
   );
-};
-
+});
diff --git a/src/pages/detail/index.scss b/src/pages/detail/index.scss
index 2ff9ab1..fa88e84 100644
--- a/src/pages/detail/index.scss
+++ b/src/pages/detail/index.scss
@@ -124,6 +124,7 @@
       &-tags {
         display: flex;
         align-items: center;
+        flex-wrap: wrap;
         gap: 6px;
 
         &-tag {
@@ -546,6 +547,7 @@
 
         &-scroll {
           flex: 0 0 auto;
+          width: calc(100% - 116px);
 
           &-content {
             display: flex;
@@ -814,7 +816,7 @@
               border-radius: 20px;
               border: 1px solid rgba(33, 178, 0, 0.20);
               background: rgba(255, 255, 255, 0.16);
-              padding: 12px 15px;
+              padding: 12px 0 12px 15px;
               box-sizing: border-box;
 
               &-title {
diff --git a/src/pages/detail/index.tsx b/src/pages/detail/index.tsx
index f0e856a..b1e1626 100644
--- a/src/pages/detail/index.tsx
+++ b/src/pages/detail/index.tsx
@@ -414,7 +414,7 @@ function Index() {
             </View>
             {/* participants list */}
             <ScrollView className='participants-list-scroll' scrollX>
-              <View className='participants-list-scroll-content' style={{ width: `${(participants.length + 1) * 108 + (participants.length) * 8 - 30}px` }}>
+              <View className='participants-list-scroll-content' style={{ width: `${participants.length * 103 + (participants.length - 1) * 8}px` }}>
                 {participants.map((participant) => (
                   <View key={participant.id} className='participants-list-item'>
                     {/* <Avatar className='participants-list-item-avatar' src={participant.user.avatar_url} /> */}
@@ -509,7 +509,7 @@ function Index() {
                       <Avatar className='recommend-games-list-item-addon-avatar' src={game.avatar} />
                       <View className='recommend-games-list-item-addon-message'>
                         <View className='recommend-games-list-item-addon-message-applications'>
-                          <Text>报名人数 {game.checkedApplications} / {game.applications}</Text>
+                          <Text>报名人数 {game.checkedApplications}/{game.applications}</Text>
                         </View>
                         <View className='recommend-games-list-item-addon-message-level-requirements'>
                           <Text>{game.levelRequirements}</Text>
diff --git a/src/pages/login/index/index.tsx b/src/pages/login/index/index.tsx
index 29facb3..ac0cbef 100644
--- a/src/pages/login/index/index.tsx
+++ b/src/pages/login/index/index.tsx
@@ -110,7 +110,7 @@ const LoginPage: React.FC = () => {
       <View className="background_image">
         <Image
           className="bg_img"
-          src={require('../../../static/login/login_bg.png')}
+          src="http://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/2e00dea1-8723-42fe-ae42-84fe38e9ac3f.png"
           mode="aspectFill"
         />
         <View className="bg_overlay"></View>
@@ -229,7 +229,7 @@ const LoginPage: React.FC = () => {
               {agree_terms ? '已同意' : '同意并继续'}
             </Button>
 
-        
+
           </View>
         </View>
       )}

From 1cb303b86d495313ceb5a33ea38029e266f0bec9 Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sat, 30 Aug 2025 13:40:25 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListCard/index.tsx | 18 +++++++-----------
 src/pages/list/index.tsx          |  9 ++++++---
 src/services/listApi.ts           | 10 ++++------
 src/store/listStore.ts            |  8 +++++---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/ListCard/index.tsx b/src/components/ListCard/index.tsx
index c91b3d3..ffaca58 100644
--- a/src/components/ListCard/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -3,7 +3,6 @@ import Taro from '@tarojs/taro'
 import img from "../../config/images";
 import { ListCardProps } from "../../../types/list/types";
 import "./index.scss";
-// import SkeletonComponent from "../../components/Skeleton";
 
 const ListCard: React.FC<ListCardProps> = ({
   id,
@@ -15,7 +14,7 @@ const ListCard: React.FC<ListCardProps> = ({
   maxCount,
   skillLevel,
   matchType,
-  images,
+  images=[],
   shinei,
 }) => {
   const renderItemImage = (src: string) => {
@@ -30,28 +29,25 @@ const ListCard: React.FC<ListCardProps> = ({
 
   // 根据图片数量决定展示样式
   const renderImages = () => {
-    if (images.length === 0) return null;
+    if (images?.length === 0) return null;
 
-    if (images.length === 1) {
+    if (images?.length === 1) {
       return (
         <View className="single-image">
           <View className="image-container">
-            {/* <Image src={images[0]} className="image" mode="aspectFill" /> */}
             {renderItemImage(images[0])}
           </View>
         </View>
       );
     }
 
-    if (images.length === 2) {
+    if (images?.length === 2) {
       return (
         <View className="double-image">
           <View className="image-container">
-            {/* <Image src={images[0]} className="image" mode="aspectFill" /> */}
             {renderItemImage(images[0])}
           </View>
           <View className="image-container">
-            {/* <Image src={images[1]} className="image" mode="aspectFill" /> */}
             {renderItemImage(images[1])}
           </View>
         </View>
@@ -61,9 +57,9 @@ const ListCard: React.FC<ListCardProps> = ({
     // 3张或更多图片
     return (
       <View className="triple-image">
-        <View className="image-container">{renderItemImage(images[0])}</View>
-        <View className="image-container">{renderItemImage(images[1])}</View>
-        <View className="image-container">{renderItemImage(images[2])}</View>
+        <View className="image-container">{renderItemImage(images?.[0])}</View>
+        <View className="image-container">{renderItemImage(images?.[1])}</View>
+        <View className="image-container">{renderItemImage(images?.[2])}</View>
       </View>
     );
   };
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 220117b..3e2794e 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -13,14 +13,17 @@ import {useGlobalState} from '@/store/global'
 import { View } from "@tarojs/components";
 import CustomerNavBar from "@/components/CustomNavbar";
 import GuideBar from "@/components/GuideBar";
+import { useDictionaryActions } from "@/store/dictionaryStore";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
   const store = useListStore() || {};
 
-    const {statusNavbarHeightInfo } = useGlobalState() || {}
-    // console.log("===store===", store);
-    // console.log('===statusNavbarHeightInfo', statusNavbarHeightInfo)
+  const { statusNavbarHeightInfo } = useGlobalState() || {}
+  const { getDictionaryValue } = useDictionaryActions() || {};
+  console.log('===getDictionaryValue', getDictionaryValue('court_type'));
+  // locationOptions 室内
+  // game_play 玩法
   const {
     isShowFilterPopup,
     error,
diff --git a/src/services/listApi.ts b/src/services/listApi.ts
index 77ebd65..eec41ca 100644
--- a/src/services/listApi.ts
+++ b/src/services/listApi.ts
@@ -1,4 +1,5 @@
 import { TennisMatch } from "../store/listStore";
+import httpService from "./httpService";
 
 // 模拟网络延迟
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -91,14 +92,11 @@ export const getTennisMatches = async (params?: {
   pageSize?: number;
   location?: string;
   skillLevel?: string;
-}): Promise<TennisMatch[]> => {
+}) => {
   try {
-    // 生成动态数据
-    const matches = generateDynamicData();
-
-    return matches;
+    return httpService.post('/venues/list', params, { showLoading: false })
   } catch (error) {
-    console.error("API调用失败:", error);
+    console.error("列表数据获取失败:", error);
     throw error;
   }
 };
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index b3fe98e..75454f6 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -81,11 +81,13 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     set({ loading: true, error: null })
 
     try {
-      const matches = await getTennisMatches(params)
+      const resData = await getTennisMatches(params) || {};
+      const { data = {}, code } = resData;
+      const { count, rows } = data;
       set({
-        matches,
+        matches: rows || [],
         loading: false,
-        lastRefreshTime: new Date().toISOString()
+        // lastRefreshTime: new Date().toISOString()
       })
 
     } catch (error) {

From d92419f3c5648a67d1b6857d66d6c92a4bece034 Mon Sep 17 00:00:00 2001
From: juguohong <juguohong@flashhold.com>
Date: Sat, 30 Aug 2025 18:20:50 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.ts                                    |  15 +-
 src/components/CustomNavbar/index.module.scss |   5 +-
 src/components/CustomNavbar/index.tsx         |   8 +-
 src/components/GuideBar/index.scss            |   1 +
 src/components/ListCard/index.scss            |  47 +++++-
 src/components/ListCard/index.tsx             | 155 +++++++++---------
 src/components/ListCardSkeleton/index.tsx     |   1 -
 .../ListLoadError/index.module.scss           |  44 +++++
 src/components/ListLoadError/index.tsx        |  24 +++
 src/components/SearchBar/index.module.scss    |  13 +-
 src/components/SearchBar/index.tsx            |   5 +-
 src/config/images.js                          |   3 +
 src/container/listContainer/index.scss        |   8 +
 src/container/listContainer/index.tsx         |  52 ++++++
 src/pages/list/FilterPopup.tsx                |  19 ++-
 src/pages/list/index.module.scss              |  15 +-
 src/pages/list/index.tsx                      | 128 +++------------
 src/services/listApi.ts                       |  63 -------
 src/static/list/icon-load-error.svg           |  29 ++++
 src/static/list/icon-paying-game.svg          |  34 ++++
 src/static/list/icon-reload.svg               |   4 +
 src/store/listStore.ts                        |  46 +++++-
 types/list/types.ts                           |   3 +-
 23 files changed, 456 insertions(+), 266 deletions(-)
 create mode 100644 src/components/ListLoadError/index.module.scss
 create mode 100644 src/components/ListLoadError/index.tsx
 create mode 100644 src/container/listContainer/index.scss
 create mode 100644 src/container/listContainer/index.tsx
 create mode 100644 src/static/list/icon-load-error.svg
 create mode 100644 src/static/list/icon-paying-game.svg
 create mode 100644 src/static/list/icon-reload.svg

diff --git a/src/app.ts b/src/app.ts
index 6544603..7ce6cd4 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -2,6 +2,9 @@ import { Component, ReactNode } from 'react'
 import './nutui-theme.scss'
 import './app.scss'
 import { useDictionaryStore } from './store/dictionaryStore'
+import { useGlobalStore } from './store/global'
+
+// import { getNavbarHeight } from "@/utils/getNavbarHeight";
 
 interface AppProps {
   children: ReactNode
@@ -11,11 +14,12 @@ class App extends Component<AppProps> {
   componentDidMount() {
     // 初始化字典数据
     this.initDictionaryData()
+    this.getNavBarHeight()
   }
 
-  componentDidShow() {}
+  componentDidShow() { }
 
-  componentDidHide() {}
+  componentDidHide() { }
 
   // 初始化字典数据
   private async initDictionaryData() {
@@ -27,6 +31,13 @@ class App extends Component<AppProps> {
     }
   }
 
+  // 获取导航高度
+  getNavBarHeight = () => {
+    const { getNavbarHeightInfo } = useGlobalStore.getState()
+    getNavbarHeightInfo()
+
+  }
+
   render() {
     // this.props.children 是将要会渲染的页面
     return this.props.children
diff --git a/src/components/CustomNavbar/index.module.scss b/src/components/CustomNavbar/index.module.scss
index b3a7de1..9c921b2 100644
--- a/src/components/CustomNavbar/index.module.scss
+++ b/src/components/CustomNavbar/index.module.scss
@@ -1,5 +1,8 @@
 .customerNavbar {
-  // background-color: red;
+  position: sticky;
+  top: 0;
+  z-index: 999;
+  background-color: #ffffff;
 
   .container {
     padding-left: 17px;
diff --git a/src/components/CustomNavbar/index.tsx b/src/components/CustomNavbar/index.tsx
index 4d2e368..45f96fb 100644
--- a/src/components/CustomNavbar/index.tsx
+++ b/src/components/CustomNavbar/index.tsx
@@ -1,22 +1,22 @@
 import { View, Text, Image } from "@tarojs/components";
 import img from "@/config/images";
 import { getCurrentLocation } from "@/utils/locationUtils";
-import { getNavbarHeight } from "@/utils/getNavbarHeight";
 import styles from "./index.module.scss";
 import { useEffect } from "react";
 import { useGlobalState } from "@/store/global";
 import { useListState } from "@/store/listStore";
 
 const ListHeader = () => {
-  const { statusBarHeight, navbarHeight, totalHeight } = getNavbarHeight();
   const {
     updateState,
     location,
     getLocationText,
     getLocationLoading,
-    getNavbarHeightInfo,
+    statusNavbarHeightInfo,
   } = useGlobalState();
   const { gamesNum } = useListState();
+  console.log("===statusNavbarHeightInfo", statusNavbarHeightInfo);
+  const { statusBarHeight, navbarHeight, totalHeight } = statusNavbarHeightInfo;
 
   // 获取位置信息
   const getCurrentLocal = () => {
@@ -31,7 +31,7 @@ const ListHeader = () => {
     });
   };
   useEffect(() => {
-    getNavbarHeightInfo();
+    // getNavbarHeightInfo();
     getCurrentLocal();
   }, []);
 
diff --git a/src/components/GuideBar/index.scss b/src/components/GuideBar/index.scss
index 608a03a..7cd40b1 100644
--- a/src/components/GuideBar/index.scss
+++ b/src/components/GuideBar/index.scss
@@ -14,6 +14,7 @@
   justify-content: space-between;
   align-items: center;
   padding: 20px 12px env(safe-area-inset-bottom);
+  z-index: 999;
 
   &-pages {
     display: flex;
diff --git a/src/components/ListCard/index.scss b/src/components/ListCard/index.scss
index 3cf2e16..bcb39aa 100644
--- a/src/components/ListCard/index.scss
+++ b/src/components/ListCard/index.scss
@@ -1,4 +1,10 @@
-.list-item {
+.listCard {
+  background: linear-gradient(90deg, rgba(183, 248, 113, 0.5) 0%, rgba(183, 248, 113, 0.1) 100%);
+  border-radius: 20px;
+  border-width: 0.5px;
+}
+
+.listItem {
   display: flex;
   padding: 12px 15px;
   background: #ffffff;
@@ -247,4 +253,43 @@
   width: 100%;
   height: 100%;
   object-fit: cover;
+}
+
+// 底部
+.smoothPlayingGame {
+  padding: 5px 12px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 12px;
+
+  .smoothWrapper,
+  .localAreaWrapper {
+    line-height: 18px;
+    display: flex;
+    align-items: center;
+    gap: 5px;
+  }
+
+  .smoothTitle {
+    font-size: 14px;
+  }
+
+  .line {
+    height: 8px;
+    width: 1px;
+    background: #00000040;
+    border-radius: 99px;
+  }
+
+  .iconListPlayingGame,
+  .localArea {
+    width: 14px;
+    height: 14px;
+  }
+
+  .localArea {
+    border: 0.5px solid #FFFFFFA6;
+    border-radius: 50%;
+  }
 }
\ No newline at end of file
diff --git a/src/components/ListCard/index.tsx b/src/components/ListCard/index.tsx
index ffaca58..df80400 100644
--- a/src/components/ListCard/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -1,5 +1,5 @@
 import { View, Text, Image } from "@tarojs/components";
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";
 import img from "../../config/images";
 import { ListCardProps } from "../../../types/list/types";
 import "./index.scss";
@@ -14,7 +14,7 @@ const ListCard: React.FC<ListCardProps> = ({
   maxCount,
   skillLevel,
   matchType,
-  images=[],
+  images = [],
   shinei,
 }) => {
   const renderItemImage = (src: string) => {
@@ -23,9 +23,9 @@ const ListCard: React.FC<ListCardProps> = ({
 
   const handleViewDetail = () => {
     Taro.navigateTo({
-      url: `/pages/detail/index?id=${id || 1}&from=list&autoShare=0`
-    })
-  }
+      url: `/pages/detail/index?id=${id || 1}&from=list&autoShare=0`,
+    });
+  };
 
   // 根据图片数量决定展示样式
   const renderImages = () => {
@@ -34,9 +34,7 @@ const ListCard: React.FC<ListCardProps> = ({
     if (images?.length === 1) {
       return (
         <View className="single-image">
-          <View className="image-container">
-            {renderItemImage(images[0])}
-          </View>
+          <View className="image-container">{renderItemImage(images[0])}</View>
         </View>
       );
     }
@@ -44,12 +42,8 @@ const ListCard: React.FC<ListCardProps> = ({
     if (images?.length === 2) {
       return (
         <View className="double-image">
-          <View className="image-container">
-            {renderItemImage(images[0])}
-          </View>
-          <View className="image-container">
-            {renderItemImage(images[1])}
-          </View>
+          <View className="image-container">{renderItemImage(images[0])}</View>
+          <View className="image-container">{renderItemImage(images[1])}</View>
         </View>
       );
     }
@@ -64,72 +58,87 @@ const ListCard: React.FC<ListCardProps> = ({
     );
   };
   return (
-    <View className="list-item" onClick={handleViewDetail}>
-      {/* 左侧内容区域 */}
-      <View className="content">
-        {/* 标题 */}
-        <View className="titleWrapper">
-          <Text className="title">{title}</Text>
-          <Image
-            src={img.ICON_LIST_RIGHT_ARROW}
-            className="title-right-arrow"
-            mode="aspectFit"
-          />
-        </View>
-
-        {/* 时间信息 */}
-
-        <View className="date-time">
-          <Text>{dateTime}</Text>
-        </View>
-
-        {/* 地点,室内外,距离 */}
-
-        <View className="location">
-          <Text className="location-text location-position">{location}</Text>
-          <Text className="location-text location-time-distance">
-            {shinei && `・${shinei}`}
-            {distance && `・${distance}`}
-          </Text>
-        </View>
-
-        {/* 底部信息行：头像组、报名人数、技能等级、比赛类型 */}
-        <View className="bottom-info">
-          <View className="left-section">
-            <View className="avatar-group">
-              {Array.from({ length: Math.min(registeredCount, 3) }).map(
-                (_, index) => (
-                  <View key={index} className="avatar">
-                    <Image
-                      className="avatar-image"
-                      src="https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center"
-                      mode="aspectFill"
-                    />
-                  </View>
-                )
-              )}
-            </View>
+    <View className="listCard">
+      <View className="listItem" onClick={handleViewDetail}>
+        {/* 左侧内容区域 */}
+        <View className="content">
+          {/* 标题 */}
+          <View className="titleWrapper">
+            <Text className="title">{title}</Text>
+            <Image
+              src={img.ICON_LIST_RIGHT_ARROW}
+              className="title-right-arrow"
+              mode="aspectFit"
+            />
           </View>
 
-          <View className="tags">
-            <View className="tag">
-              <Text className="tag-text">
-                报名人数 {registeredCount}/
-                <Text className="tag-text-max">{maxCount}</Text>
-              </Text>
+          {/* 时间信息 */}
+
+          <View className="date-time">
+            <Text>{dateTime}</Text>
+          </View>
+
+          {/* 地点,室内外,距离 */}
+
+          <View className="location">
+            <Text className="location-text location-position">{location}</Text>
+            <Text className="location-text location-time-distance">
+              {shinei && `・${shinei}`}
+              {distance && `・${distance}`}
+            </Text>
+          </View>
+
+          {/* 底部信息行：头像组、报名人数、技能等级、比赛类型 */}
+          <View className="bottom-info">
+            <View className="left-section">
+              <View className="avatar-group">
+                {Array.from({ length: Math.min(registeredCount, 3) }).map(
+                  (_, index) => (
+                    <View key={index} className="avatar">
+                      <Image
+                        className="avatar-image"
+                        src="https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center"
+                        mode="aspectFill"
+                      />
+                    </View>
+                  )
+                )}
+              </View>
             </View>
-            <View className="tag">
-              <Text className="tag-text">{skillLevel}</Text>
-            </View>
-            <View className="tag">
-              <Text className="tag-text">{matchType}</Text>
+
+            <View className="tags">
+              <View className="tag">
+                <Text className="tag-text">
+                  报名人数 {registeredCount}/
+                  <Text className="tag-text-max">{maxCount}</Text>
+                </Text>
+              </View>
+              <View className="tag">
+                <Text className="tag-text">{skillLevel}</Text>
+              </View>
+              <View className="tag">
+                <Text className="tag-text">{matchType}</Text>
+              </View>
             </View>
           </View>
         </View>
+
+        {/* 右侧图片区域 */}
+        <View className="image-section">{renderImages()}</View>
+      </View>
+      {/* 畅打球局 */}
+      <View className="smoothPlayingGame">
+        <View className="smoothWrapper">
+          <Image src={img.ICON_LIST_PLAYING_GAME} className="iconListPlayingGame" />
+          <Text className="smoothTitle">畅打球局</Text>
+        </View>
+        <View className="line" />
+        <View>场馆方:</View>
+        <View className="localAreaWrapper">
+          <Image className="localArea" src="https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center" />
+          <Text className="localAreaText">仁恒河滨花园网球场</Text>
+        </View>
       </View>
-
-      {/* 右侧图片区域 */}
-      <View className="image-section">{renderImages()}</View>
     </View>
   );
 };
diff --git a/src/components/ListCardSkeleton/index.tsx b/src/components/ListCardSkeleton/index.tsx
index d19bf56..77441a0 100644
--- a/src/components/ListCardSkeleton/index.tsx
+++ b/src/components/ListCardSkeleton/index.tsx
@@ -13,7 +13,6 @@ const ListCard = () => {
         </View>
 
         {/* 时间信息 */}
-
         <View className="date-time">
           <Skeleton visible={false} style={{ width: "88px", }} />
         </View>
diff --git a/src/components/ListLoadError/index.module.scss b/src/components/ListLoadError/index.module.scss
new file mode 100644
index 0000000..1629275
--- /dev/null
+++ b/src/components/ListLoadError/index.module.scss
@@ -0,0 +1,44 @@
+.listLoadError {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 400px;
+
+  .listLoadErrorImg {
+    width: 154px;
+    height: 154px;
+  }
+
+  .listLoadErrorText {
+    margin-top: 35px;
+    margin-bottom: 12px;
+    font-weight: 500;
+    font-style: Medium;
+    font-size: 14px;
+    line-height: 24px;
+    letter-spacing: 0px;
+  }
+
+  .listLoadErrorBtn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 76px;
+    background: #00000008;
+    border: 0.5px solid #0000001F;
+    border-radius: 12px;
+    padding: 12px 0;
+    font-weight: 500;
+    font-style: Medium;
+    font-size: 14px;
+    line-height: 24px;
+    letter-spacing: 0px;
+
+  }
+
+  .reloadIcon {
+    width: 16px;
+    height: 16px;
+  }
+}
\ No newline at end of file
diff --git a/src/components/ListLoadError/index.tsx b/src/components/ListLoadError/index.tsx
new file mode 100644
index 0000000..420393d
--- /dev/null
+++ b/src/components/ListLoadError/index.tsx
@@ -0,0 +1,24 @@
+import { Image, View, Text, Button } from "@tarojs/components";
+import styles from "./index.module.scss";
+import img from "@/config/images";
+
+const ListLoadError = ({ reload }: { reload: () => void }) => {
+  const handleReload = () => {
+    reload && typeof reload === "function" && reload();
+  };
+
+  return (
+    <View className={styles.listLoadError}>
+      <Image
+        className={styles.listLoadErrorImg}
+        src={img.ICON_LIST_LOAD_ERROR}
+      />
+      <Text className={styles.listLoadErrorText}>加载失败</Text>
+      <Button className={styles.listLoadErrorBtn} onClick={handleReload}>
+        <Image src={img?.ICON_LIST_RELOAD} className={styles.reloadIcon} />
+        重试
+      </Button>
+    </View>
+  );
+};
+export default ListLoadError;
diff --git a/src/components/SearchBar/index.module.scss b/src/components/SearchBar/index.module.scss
index fc822f1..cf5e343 100644
--- a/src/components/SearchBar/index.module.scss
+++ b/src/components/SearchBar/index.module.scss
@@ -5,9 +5,16 @@
   --nutui-searchbar-input-text-color: #000000;
   --nutui-searchbar-input-padding: 0 0 0 10px;
   --nutui-searchbar-padding: 10px 0 0 0;
+
   :global(.nut-searchbar-content) {
     box-shadow: 0 4px 48px #00000014;
   }
+
+  .searchBarLeft {
+    display: flex;
+    align-items: center;
+  }
+
   .searchBarRight {
     position: relative;
     width: 44px;
@@ -18,14 +25,17 @@
     display: flex;
     align-items: center;
     justify-content: center;
+
     &.active {
       background-color: #000000;
     }
   }
+
   .filterIcon {
     width: 20px;
     height: 20px;
   }
+
   .filterCount {
     background-color: #000000;
     position: absolute;
@@ -41,8 +51,9 @@
     justify-content: center;
     font-size: 11px;
   }
+
   .searchIcon {
     width: 20px;
     height: 20px;
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/SearchBar/index.tsx b/src/components/SearchBar/index.tsx
index e4f1fab..8181030 100644
--- a/src/components/SearchBar/index.tsx
+++ b/src/components/SearchBar/index.tsx
@@ -12,6 +12,7 @@ interface IProps {
 
 const SearchBarComponent = (props: IProps) => {
   const { handleFilterIcon, isSelect, filterCount, onChange } = props;
+
   const handleChange = (value: string) => {
     onChange && onChange(value);
   };
@@ -19,9 +20,9 @@ const SearchBarComponent = (props: IProps) => {
     <>
       <SearchBar
         leftIn={
-          <div>
+          <View className={styles.searchBarLeft}>
             <Image className={styles.searchIcon} src={img.ICON_SEARCH} />
-          </div>
+          </View>
         }
         right={
           <View
diff --git a/src/config/images.js b/src/config/images.js
index 61d87fe..fd3c15e 100644
--- a/src/config/images.js
+++ b/src/config/images.js
@@ -43,4 +43,7 @@ export default {
     ICON_DETAIL_SHARE: require('@/static/detail/icon-share-dark.svg'),
     ICON_GUIDE_BAR_PUBLISH: require('@/static/common/guide-bar-publish.svg'),
     ICON_NAVIGATOR_BACK: require('@/static/common/navigator-back.svg'),
+    ICON_LIST_PLAYING_GAME: require('@/static/list/icon-paying-game.svg'),
+    ICON_LIST_LOAD_ERROR: require('@/static/list/icon-load-error.svg'),
+    ICON_LIST_RELOAD: require('@/static/list/icon-reload.svg'),
   }
\ No newline at end of file
diff --git a/src/container/listContainer/index.scss b/src/container/listContainer/index.scss
new file mode 100644
index 0000000..89137be
--- /dev/null
+++ b/src/container/listContainer/index.scss
@@ -0,0 +1,8 @@
+.listContentWrapper {
+  padding: 0 5px;
+  background: #fafafa;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  background-color: red;
+}
\ No newline at end of file
diff --git a/src/container/listContainer/index.tsx b/src/container/listContainer/index.tsx
new file mode 100644
index 0000000..5407c87
--- /dev/null
+++ b/src/container/listContainer/index.tsx
@@ -0,0 +1,52 @@
+import { View } from "@tarojs/components";
+import ListCard from "@/components/ListCard";
+import ListLoadError from "@/components/ListLoadError";
+import ListCardSkeleton from "@/components/ListCardSkeleton";
+// import { useGlobalState } from "@/store/global";
+
+const ListContainer = (props) => {
+  const { loading, data = [], error, reload } = props;
+  // const { statusNavbarHeightInfo } = useGlobalState() || {};
+  // const { totalHeight } = statusNavbarHeightInfo;
+
+  const renderList = () => {
+    if (loading && data.length > 0) {
+      return (
+        <>
+          {new Array(10).fill(0).map(() => {
+            return <ListCardSkeleton />;
+          })}
+        </>
+      );
+    }
+
+    if (error) {
+      return <ListLoadError reload={reload} />;
+    }
+
+    if (loading && data.length === 0) {
+      return null;
+    }
+
+    return (
+      <>
+        {data.map((match, index) => (
+          <ListCard key={match.id || index} {...match} />
+        ))}
+      </>
+    );
+  };
+
+  return (
+    <View
+      className="listContentWrapper"
+      // style={{
+      //   minHeight: `calc(100vh - ${totalHeight}px)`,
+      // }}
+    >
+      {renderList()}
+    </View>
+  );
+};
+
+export default ListContainer;
diff --git a/src/pages/list/FilterPopup.tsx b/src/pages/list/FilterPopup.tsx
index 382d862..05af903 100644
--- a/src/pages/list/FilterPopup.tsx
+++ b/src/pages/list/FilterPopup.tsx
@@ -12,6 +12,8 @@ import { FilterPopupProps } from "../../../types/list/types";
 import CourtType from "@/components/CourtType";
 // 玩法
 import GamePlayType from "@/components/GamePlayType";
+import { useDictionaryActions } from "@/store/dictionaryStore";
+import { useMemo } from "react";
 
 const FilterPopup = (props: FilterPopupProps) => {
   const {
@@ -27,7 +29,22 @@ const FilterPopup = (props: FilterPopupProps) => {
   } = props;
 
   const store = useListStore() || {};
-  const { timeBubbleData, locationOptions, gamePlayOptions } = store;
+  const { getDictionaryValue } = useDictionaryActions() || {};
+  const { timeBubbleData } = store;
+
+  const handleOptions = (dictionaryValue: []) => {
+    return dictionaryValue?.map((item) => ({ label: item, value: item })) || [];
+  };
+
+  const courtType = getDictionaryValue("court_type") || [];
+  const locationOptions = useMemo(() => {
+    return courtType ? handleOptions(courtType) : [];
+  }, [courtType]);
+
+  const gamePlay = getDictionaryValue("game_play") || [];
+  const gamePlayOptions = useMemo(() => {
+    return gamePlay ? handleOptions(gamePlay) : [];
+  }, [gamePlay]);
 
   const handleFilterChange = (name, value) => {
     onChange({ [name]: value });
diff --git a/src/pages/list/index.module.scss b/src/pages/list/index.module.scss
index e1db7c9..7a5f4ac 100644
--- a/src/pages/list/index.module.scss
+++ b/src/pages/list/index.module.scss
@@ -3,20 +3,23 @@
 
   .listTopSearchWrapper {
     padding: 0 15px;
+    position: sticky;
+    background: #fefefe;
+    z-index: 999;
+  }
+
+  .isScroll {
+    border-bottom: 0.5px solid #0000000F;
   }
 
   .listTopFilterWrapper {
     display: flex;
     align-items: center;
-    margin-top: 5px;
-    margin-bottom: 10px;
+    padding-top: 10px;
+    padding-bottom: 10px;
     gap: 5px;
   }
 
-  .listContentWrapper {
-    padding: 0 5px;
-  }
-
   .menuFilter {
     padding: 0;
   }
diff --git a/src/pages/list/index.tsx b/src/pages/list/index.tsx
index 3e2794e..8e7edb6 100644
--- a/src/pages/list/index.tsx
+++ b/src/pages/list/index.tsx
@@ -1,29 +1,22 @@
-import ListCard from "../../components/ListCard";
-import ListCardSkeleton from "../../components/ListCardSkeleton";
-import List from "../../components/List";
 import Menu from "../../components/Menu";
 import CityFilter from "../../components/CityFilter";
 import SearchBar from "../../components/SearchBar";
 import FilterPopup from "./FilterPopup";
 import styles from "./index.module.scss";
 import { useEffect } from "react";
-import Taro, { useReachBottom } from "@tarojs/taro";
+import Taro, { usePageScroll, useReachBottom } from "@tarojs/taro";
 import { useListStore } from "@/store/listStore";
-import {useGlobalState} from '@/store/global'
+import { useGlobalState } from "@/store/global";
 import { View } from "@tarojs/components";
 import CustomerNavBar from "@/components/CustomNavbar";
 import GuideBar from "@/components/GuideBar";
-import { useDictionaryActions } from "@/store/dictionaryStore";
+import ListContainer from "@/container/listContainer";
 
 const ListPage = () => {
   // 从 store 获取数据和方法
   const store = useListStore() || {};
 
-  const { statusNavbarHeightInfo } = useGlobalState() || {}
-  const { getDictionaryValue } = useDictionaryActions() || {};
-  console.log('===getDictionaryValue', getDictionaryValue('court_type'));
-  // locationOptions 室内
-  // game_play 玩法
+  const { statusNavbarHeightInfo } = useGlobalState() || {};
   const {
     isShowFilterPopup,
     error,
@@ -31,7 +24,6 @@ const ListPage = () => {
     loading,
     fetchMatches,
     refreshMatches,
-    clearError,
     updateState,
     filterCount,
     updateFilterOptions, // 更新筛选条件
@@ -40,8 +32,15 @@ const ListPage = () => {
     distanceData,
     quickFilterData,
     distanceQuickFilter,
+    isScrollTop,
   } = store;
 
+  usePageScroll((res) => {
+    if (res?.scrollTop > 0 && !isScrollTop) {
+      updateState({ isScrollTop: true });
+    }
+  });
+
   useReachBottom(() => {
     console.log("触底了");
     // 调用 store 的加载更多方法
@@ -82,78 +81,6 @@ const ListPage = () => {
       });
   });
 
-  // 错误处理
-  useEffect(() => {
-    if (error) {
-      Taro.showToast({
-        title: error,
-        icon: "error",
-        duration: 2000,
-      });
-      // 3秒后自动清除错误
-      setTimeout(() => {
-        clearError();
-      }, 3000);
-    }
-  }, [error, clearError]);
-
-  // 加载状态显示
-  if (loading && matches.length === 0) {
-    return (
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          justifyContent: "center",
-          alignItems: "center",
-          height: "200px",
-          fontSize: "14px",
-          color: "#999",
-        }}
-      >
-        <div style={{ marginBottom: "10px" }}>加载中...</div>
-        <div style={{ fontSize: "12px", color: "#ccc" }}>
-          正在获取网球比赛数据
-        </div>
-      </div>
-    );
-  }
-
-  // 错误状态显示
-  if (error && matches.length === 0) {
-    return (
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          justifyContent: "center",
-          alignItems: "center",
-          height: "200px",
-          fontSize: "14px",
-          color: "#999",
-        }}
-      >
-        <div style={{ marginBottom: "10px" }}>加载失败</div>
-        <div style={{ marginBottom: "15px", fontSize: "12px", color: "#ccc" }}>
-          {error}
-        </div>
-        <button
-          onClick={() => fetchMatches()}
-          style={{
-            padding: "8px 16px",
-            fontSize: "12px",
-            color: "#fff",
-            backgroundColor: "#007aff",
-            border: "none",
-            borderRadius: "4px",
-          }}
-        >
-          重试
-        </button>
-      </div>
-    );
-  }
-
   const toggleShowPopup = () => {
     updateState({ isShowFilterPopup: !isShowFilterPopup });
   };
@@ -183,7 +110,14 @@ const ListPage = () => {
       <CustomerNavBar />
 
       <View className={styles.listPage}>
-        <View className={styles.listTopSearchWrapper}>
+        <View
+          className={`${styles.listTopSearchWrapper} ${
+            isScrollTop ? styles.isScroll : ""
+          }`}
+          style={{
+            top: statusNavbarHeightInfo?.totalHeight,
+          }}
+        >
           <SearchBar
             handleFilterIcon={toggleShowPopup}
             isSelect={filterCount > 0}
@@ -227,26 +161,16 @@ const ListPage = () => {
           </div>
         </View>
 
-        <View className={styles.listContentWrapper}>
           {/* 列表内容 */}
-          <List>
-            {!loading &&
-              matches.length > 0 &&
-              matches.map((match, index) => (
-                <ListCard key={match.id || index} {...match} />
-              ))}
-          </List>
-
-          {/* 空状态 */}
-          {loading &&
-            matches.length === 0 &&
-            new Array(10).fill(0).map(() => {
-              return <ListCardSkeleton />;
-            })}
-        </View>
+          <ListContainer
+            data={matches}
+            loading={loading}
+            error={error}
+            reload={refreshMatches}
+          />
       </View>
 
-      <GuideBar currentPage='list' />
+      <GuideBar currentPage="list" />
     </>
   );
 };
diff --git a/src/services/listApi.ts b/src/services/listApi.ts
index eec41ca..de2be2e 100644
--- a/src/services/listApi.ts
+++ b/src/services/listApi.ts
@@ -63,25 +63,6 @@ const mockTennisMatches: TennisMatch[] = [
   },
 ];
 
-// 模拟数据变化
-const generateDynamicData = (): TennisMatch[] => {
-  Promise.resolve((res) => {
-    setTimeout(res, 3000);
-  });
-  return mockTennisMatches.map((match) => ({
-    ...match,
-    // 随机更新注册人数
-    registeredCount: Math.min(
-      match.maxCount,
-      Math.max(0, match.registeredCount + Math.floor(Math.random() * 3) - 1)
-    ),
-    // 随机更新距离
-    distance: `${(Math.random() * 5 + 1).toFixed(1)}km`,
-    // 随机更新时间
-    dateTime: Math.random() > 0.5 ? match.dateTime : "今天下午3点 2小时",
-  }));
-};
-
 /**
  * 获取网球比赛列表
  * @param params 查询参数
@@ -116,47 +97,3 @@ export const refreshTennisMatches = async (): Promise<TennisMatch[]> => {
   }
 };
 
-/**
- * 获取比赛详情
- * @param id 比赛ID
- * @returns Promise<TennisMatch | null>
- */
-export const getTennisMatchDetail = async (
-  id: string
-): Promise<TennisMatch | null> => {
-  try {
-    console.log("API调用: getTennisMatchDetail", id);
-
-    // 模拟网络延迟
-    await delay(600 + Math.random() * 400);
-
-    // 模拟网络错误
-    if (simulateNetworkError()) {
-      throw new Error("获取详情失败，请稍后重试");
-    }
-
-    const match = mockTennisMatches.find((m) => m.id === id);
-
-    if (!match) {
-      throw new Error("比赛不存在");
-    }
-
-    console.log("API获取详情成功:", match.title);
-    return match;
-  } catch (error) {
-    console.error("API获取详情失败:", error);
-    throw error;
-  }
-};
-
-/**
- * 模拟API统计信息
- */
-export const getApiStats = () => {
-  return {
-    totalCalls: 0,
-    successRate: 0.95,
-    averageResponseTime: 800,
-    lastCallTime: new Date().toISOString(),
-  };
-};
diff --git a/src/static/list/icon-load-error.svg b/src/static/list/icon-load-error.svg
new file mode 100644
index 0000000..3b7ad03
--- /dev/null
+++ b/src/static/list/icon-load-error.svg
@@ -0,0 +1,29 @@
+<svg width="154" height="156" viewBox="0 0 154 156" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M70.5141 58.1865L20.5296 75.5933C18.4077 76.3332 16.5641 77.7066 15.2478 79.5279C13.9315 81.3492 13.2059 83.5306 13.1691 85.7775L12.4468 129.786C12.3598 135.083 17.8131 138.657 22.6311 136.462L101.297 100.624C105.519 98.7 106.861 93.3465 104.045 89.664L82.7893 61.866C81.3916 60.0379 79.4523 58.6979 77.2479 58.0372C75.0436 57.3764 72.6869 57.4287 70.5141 58.1865Z" fill="black"/>
+<path d="M28.16 72.9105L15.1272 79.6335C10.0332 82.581 11.6157 81.888 8.8002 87.084C5.9847 92.2808 4.99695 101.604 3.6147 109.556L0.137695 130.648C0.362921 135.482 1.83934 140.174 4.42245 144.266C7.0077 148.364 9.4917 151.732 13.2942 153.114C17.0967 154.497 20.2084 152.768 20.2084 152.768L40.5965 143.537C45.2787 141.485 45.4594 134.858 40.9024 132.425L29.2459 127.243L30.323 94.644L36.0439 90.4133L28.16 72.9105Z" fill="#D0CDCD"/>
+<path d="M13.194 105.796C18.7672 104.935 24.384 104.348 30.012 103.973L30.3202 94.6448L36.0427 90.4133L28.1595 72.9105L18.48 76.3673C13.455 79.278 11.337 80.5583 8.79971 86.3933C5.98721 91.5 4.99721 101.95 3.95996 107.481C7.41746 106.79 8.99471 106.444 13.194 105.796Z" fill="black"/>
+<path d="M30.085 103.123L30.235 98.148" stroke="black" stroke-width="1.93275" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M46.4077 41.745L53.8664 62.4817C54.4896 64.2142 54.5482 65.9617 54.0787 67.6477C53.4667 70.5217 51.3209 73.0042 48.2961 74.0985C45.3276 75.1725 42.1521 74.6152 39.7394 72.8355C38.4171 71.7982 37.2944 70.4355 36.6711 68.703L29.2124 47.9662L46.4077 41.745Z" fill="#D0CDCD"/>
+<path d="M44.9808 59.8203C55.6915 54.8273 60.4616 42.3451 55.6352 31.9407C50.8088 21.5363 38.2135 17.1496 27.5028 22.1427C16.7921 27.1357 12.0219 39.6179 16.8484 50.0223C21.6748 60.4267 34.2701 64.8134 44.9808 59.8203Z" fill="#D0CDCD"/>
+<path d="M34.1503 49.9987C34.0176 50.0292 33.8922 50.0854 33.7812 50.1643C33.6702 50.2433 33.5759 50.3432 33.5036 50.4586C33.4313 50.574 33.3824 50.7025 33.3597 50.8367C33.337 50.971 33.341 51.1084 33.3715 51.2411C33.4019 51.3738 33.4582 51.4992 33.5371 51.6102C33.616 51.7212 33.716 51.8155 33.8313 51.8878C33.9467 51.9602 34.0752 52.0091 34.2094 52.0317C34.3437 52.0544 34.4811 52.0504 34.6138 52.02L34.1503 49.9987ZM46.1301 49.3792C46.2628 49.3487 46.3882 49.2924 46.4992 49.2135C46.6101 49.1345 46.7044 49.0345 46.7767 48.9191C46.849 48.8037 46.8979 48.6752 46.9205 48.5409C46.9431 48.4066 46.9391 48.2692 46.9086 48.1365C46.8781 48.0038 46.8218 47.8784 46.7428 47.7674C46.6639 47.6565 46.5638 47.5621 46.4484 47.4899C46.333 47.4176 46.2045 47.3687 46.0702 47.3461C45.936 47.3235 45.7985 47.3275 45.6658 47.358L46.1301 49.3792ZM34.6138 52.02L46.1301 49.3792L45.6658 47.358L34.1503 49.9987L34.6138 52.02Z" fill="black"/>
+<path d="M23.3773 46.0965C23.94 47.6632 23.945 49.3761 23.3915 50.9462C22.838 52.5162 21.7599 53.8473 20.339 54.7147C18.6395 52.803 17.3075 50.505 16.3828 47.934C15.637 45.8656 15.2192 43.6934 15.1445 41.496C18.6275 40.8037 22.1713 42.7425 23.3773 46.0965Z" fill="#D0CDCD"/>
+<path d="M20.3345 54.7147C19.907 54.933 19.4795 55.1505 19.0317 55.3132C18.9762 55.3335 18.92 55.3537 18.8442 55.3177C18.584 55.4752 18.284 55.5202 17.984 55.566C14.5572 56.2387 11.0907 54.3345 9.86521 50.9235C8.63971 47.5125 10.154 43.8045 13.2747 42.105C13.535 41.9482 13.9265 41.8065 14.2062 41.7045L14.2625 41.6842C14.5422 41.583 14.8422 41.538 15.122 41.4367L15.2337 41.3955L15.254 41.4517C15.2427 41.772 15.2667 42.0157 15.311 42.3157C15.3402 42.7477 15.3125 43.2 15.4535 43.5915C15.5105 44.4555 15.7205 45.3907 15.9657 46.2495C16.0902 46.773 16.2912 47.3325 16.472 47.8357C17.3045 50.5042 18.6357 52.8022 20.3345 54.7147ZM63.3072 31.6725C64.5327 35.0835 63.0185 38.7915 60.0095 40.4497C59.75 40.6072 59.4897 40.7647 59.1897 40.8097C59.1545 40.8862 59.0982 40.9065 59.042 40.9267C58.5942 41.0887 58.0707 41.2155 57.659 41.3017C57.6387 41.2455 57.695 41.2252 57.695 41.2252C57.662 40.605 57.6845 39.9652 57.6515 39.345C57.6226 38.6914 57.5575 38.0399 57.4565 37.3935C57.2356 36.0767 56.8975 34.7823 56.4462 33.5257C56.1241 32.6284 55.7461 31.7522 55.3145 30.9022C55.1577 30.6427 55.0775 30.4192 54.941 30.216C54.725 29.7885 54.452 29.382 54.1797 28.9755C54.1392 28.863 54.0432 28.7715 53.9472 28.68C53.8022 28.4302 53.6329 28.1953 53.4417 27.9787C53.402 27.8662 53.3255 27.831 53.2857 27.7192L53.3975 27.6787C53.657 27.5212 53.9367 27.42 54.2165 27.3187L54.2727 27.2985C54.7624 27.1215 55.2707 27.0007 55.7877 26.9385C58.9392 26.556 62.1425 28.4295 63.3072 31.6725Z" fill="#D0CDCD"/>
+<path d="M30.3822 24.198C36.524 21.9757 39.716 15.2062 37.5125 9.07798C35.3082 2.95048 28.5432 -0.21602 22.4015 2.00623C16.2597 4.22848 13.0677 10.9972 15.272 17.1255C17.4755 23.253 24.2412 26.4202 30.3822 24.198Z" fill="black"/>
+<path d="M53.7928 28.674C52.4803 29.781 50.9555 30.6487 49.274 31.257C42.3238 33.7717 34.6468 30.921 30.947 24.8625C31.9565 31.8945 27.9178 38.9827 20.9675 41.4975C20.4628 41.6797 19.9378 41.8065 19.4338 41.9887C18.0283 42.3075 16.6183 42.4387 15.224 42.4372C15.179 42.1372 15.1348 41.8372 15.1663 41.5725L15.146 41.517C14.903 32.5635 20.321 24.027 29.1778 20.8237L29.2333 20.8027C29.402 20.7427 29.5138 20.7015 29.702 20.697C38.1703 17.823 47.3173 20.7105 52.7248 27.2895C52.841 27.4372 52.9775 27.6412 53.0945 27.7882C53.1905 27.8805 53.2108 27.936 53.2513 28.0477C53.3473 28.1392 53.4635 28.2877 53.504 28.3987C53.6563 28.4707 53.6968 28.5825 53.7928 28.674Z" fill="black"/>
+<path d="M98.8938 145.212C124.344 145.212 144.976 124.58 144.976 99.1297C144.976 73.6792 124.344 53.0475 98.8938 53.0475C73.4433 53.0475 52.8115 73.6792 52.8115 99.1297C52.8115 124.58 73.4433 145.212 98.8938 145.212Z" fill="white"/>
+<path d="M96.612 42.1425C65.2995 42.1425 39.9165 67.5255 39.9165 98.838C39.9165 130.151 65.2995 155.534 96.612 155.534C127.925 155.534 153.308 130.151 153.308 98.838C153.308 67.5255 127.925 42.1425 96.612 42.1425ZM133.19 91.4085V92.9925C133.19 93.6505 133.007 94.2955 132.661 94.8551C132.315 95.4148 131.82 95.8671 131.231 96.1613L127.713 97.9215C127.154 98.2011 126.531 98.3279 125.908 98.2889C125.284 98.2499 124.682 98.0466 124.163 97.6995L119.999 94.9245C119.55 94.6257 119.039 94.4331 118.504 94.3614C117.969 94.2896 117.425 94.3407 116.913 94.5105L116.307 94.7115C114.09 95.4503 113.184 98.0933 114.481 100.039L117.508 104.579C117.831 105.064 118.269 105.462 118.783 105.737C119.297 106.012 119.871 106.156 120.455 106.156H122.331C123.271 106.156 124.172 106.529 124.837 107.194C125.501 107.858 125.875 108.76 125.875 109.7V112.292C125.875 113.059 125.626 113.805 125.166 114.419L120.882 120.129C120.557 120.563 120.336 121.066 120.235 121.599L119.252 126.818C119.109 127.571 118.728 128.257 118.163 128.775C115.997 130.759 114.078 132.998 112.448 135.442L109.469 139.911C108.853 140.835 108.004 141.582 107.009 142.075C106.013 142.569 104.906 142.792 103.797 142.723C102.688 142.654 101.616 142.295 100.689 141.682C99.7628 141.069 99.0134 140.223 98.5163 139.229C97.2638 136.724 96.6118 133.962 96.612 131.162V124.328C96.612 123.389 96.2387 122.487 95.5743 121.823C94.9098 121.159 94.0087 120.785 93.069 120.785H87.1523C83.8401 120.785 80.6637 119.469 78.321 117.128C75.9797 114.785 74.6641 111.608 74.6633 108.296V105.082C74.6637 103.143 75.1153 101.231 75.9822 99.4972C76.8492 97.7632 78.1077 96.2547 79.6583 95.091L85.9635 90.3615C88.1256 88.7401 90.755 87.8633 93.4575 87.8625H93.6608C95.5995 87.8625 97.5128 88.3133 99.246 89.1818L102.611 90.864C103.027 91.0723 103.48 91.1965 103.944 91.2294C104.408 91.2624 104.874 91.2035 105.316 91.056L116.132 87.4508C116.93 87.1853 117.608 86.6442 118.044 85.9242C118.48 85.2043 118.646 84.3526 118.511 83.5218C118.376 82.691 117.95 81.9353 117.308 81.3902C116.667 80.8451 115.853 80.5462 115.011 80.547H112.704C112.239 80.547 111.778 80.4554 111.348 80.2773C110.918 80.0991 110.528 79.8381 110.199 79.509L108.617 77.9273C108.287 77.5981 107.897 77.337 107.467 77.1589C107.037 76.9808 106.576 76.8892 106.111 76.8893H85.5248C84.5849 76.8893 83.6835 76.5159 83.0189 75.8513C82.3544 75.1867 81.981 74.2854 81.981 73.3455V72.3398C81.9811 71.5495 82.2453 70.7819 82.7317 70.159C83.218 69.5361 83.8986 69.0936 84.6653 68.9018L87.9683 68.076C88.8236 67.8622 89.5686 67.3373 90.0578 66.6038L91.905 63.8355C92.2283 63.3503 92.6664 62.9524 93.1805 62.6772C93.6946 62.4021 94.2687 62.2582 94.8518 62.2583H100.387C101.326 62.2581 102.228 61.8846 102.892 61.2201C103.557 60.5555 103.93 59.6542 103.93 58.7145V53.7533C122.041 56.6888 136.588 70.266 140.947 87.8648H136.734C136.269 87.8648 135.808 87.9564 135.378 88.1345C134.948 88.3126 134.557 88.5736 134.228 88.9027C133.899 89.2318 133.638 89.6224 133.46 90.0524C133.282 90.4823 133.19 90.9431 133.19 91.4085Z" fill="#747474"/>
+<path d="M37.9613 129.181C35.6475 126.733 35.763 122.86 38.211 120.546L44.4563 114.671C46.9043 112.358 50.7773 112.473 53.0903 114.921C55.404 117.369 55.2885 121.242 52.8405 123.556L46.596 129.431C44.1473 131.744 40.2743 131.629 37.9613 129.181Z" fill="#D0CDCD"/>
+<path d="M36.5264 122.911L42.9441 116.122M47.4921 129.153L53.9376 122.37" stroke="#D0CDCD" stroke-width="3.02325" stroke-miterlimit="10"/>
+<path d="M11.9363 149.623L8.238 144.182C5.50275 140.194 6.51375 134.734 10.5322 132.026L62.5583 98.1885C66.5468 95.4532 62.6385 102.442 65.346 106.461L70.416 112.15C73.1512 116.14 80.1368 115.372 76.1183 118.08L24.093 151.917C20.1608 154.651 14.6723 153.611 11.9363 149.623Z" fill="#B0B0B0"/>
+<g style="mix-blend-mode:darken">
+<path d="M55.1377 106.668C55.5112 107.569 55.9417 108.467 56.343 109.339L56.373 109.366C56.5237 109.618 56.6182 109.871 56.7697 110.123C58.569 113.459 60.5947 116.73 62.7007 119.855C63.843 121.529 64.9852 123.203 66.1852 124.875L76.116 118.081C80.1045 115.345 73.4295 117.829 70.6942 113.84L65.6685 106.437C62.9332 102.448 66.5437 95.4547 62.5552 98.19L54.0742 103.963C54.42 104.893 54.7642 105.767 55.1377 106.668Z" fill="black" fill-opacity="0.8"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M140.91 116.307C122.696 135.819 92.1135 136.87 72.6015 118.656C53.0902 100.441 52.0387 69.8587 70.2532 50.3475C88.4677 30.8362 119.05 29.7847 138.562 47.9985C158.073 66.213 159.124 96.7957 140.91 116.307ZM134.107 109.957C119.401 125.711 94.707 126.56 78.9532 111.853C63.1995 97.1467 62.3505 72.4537 77.0572 56.7C91.764 40.9462 116.457 40.0972 132.211 54.8032C147.964 69.51 148.813 94.2037 134.107 109.957Z" fill="#B0B0B0"/>
+<path d="M15.1042 141.32C9.61571 134.262 16.758 113.179 36.5242 121.147L52.9132 129.966C57.1837 131.926 54.6195 136.279 50.424 138.399L31.275 151.165L24.5145 147.595C20.5275 145.762 17.6407 144.901 15.1042 141.32Z" fill="#D0CDCD"/>
+<path d="M37.1651 150.753C36.2621 151.344 35.218 151.684 34.1401 151.738C33.0621 151.792 31.9892 151.558 31.0316 151.06L18.1241 144.359C16.7218 143.596 15.6748 142.313 15.2084 140.786C14.7419 139.259 14.8931 137.61 15.6295 136.194C16.366 134.777 17.6288 133.706 19.1466 133.211C20.6643 132.716 22.3159 132.836 23.7461 133.545L36.6529 140.246C38.0787 140.987 39.1539 142.261 39.6444 143.792C40.1348 145.322 40.0006 146.984 39.2711 148.415C38.7887 149.363 38.0668 150.168 37.1771 150.75L37.1651 150.753Z" fill="#D0CDCD"/>
+<path d="M44.4604 145.995C43.557 146.586 42.5127 146.925 41.4347 146.979C40.3566 147.034 39.2836 146.8 38.3255 146.303L25.4187 139.603C23.9855 138.858 22.9067 137.575 22.4195 136.035C21.9323 134.495 22.0766 132.824 22.8207 131.391C23.5658 129.958 24.8489 128.88 26.3885 128.392C27.1508 128.15 27.9534 128.061 28.7501 128.13C29.5468 128.199 30.3221 128.425 31.0317 128.794L43.9392 135.494C45.3644 136.236 46.4392 137.51 46.9298 139.039C47.4204 140.569 47.2871 142.231 46.5589 143.662C46.0767 144.61 45.3544 145.415 44.4642 145.997L44.4604 145.995Z" fill="#D0CDCD"/>
+<path d="M53.9901 140.69C53.0871 141.281 52.043 141.621 50.9651 141.675C49.8871 141.73 48.8142 141.496 47.8566 140.998L34.9491 134.297C33.5518 133.533 32.5093 132.252 32.045 130.729C31.5806 129.205 31.7313 127.561 32.4649 126.147C33.1984 124.733 34.4564 123.663 35.9693 123.166C37.4823 122.668 39.1299 122.783 40.5591 123.486L53.4659 130.186C54.4098 130.677 55.209 131.406 55.7841 132.301C56.3582 133.196 56.688 134.226 56.7409 135.288C56.7938 136.351 56.5679 137.408 56.0856 138.356C55.6029 139.304 54.8804 140.108 53.9901 140.69Z" fill="#D0CDCD"/>
+<path d="M47.8516 140.992L38.3513 136.055M40.2143 147.141L30.7148 142.205" stroke="black" stroke-width="1.93275" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M30.8362 119.368C26.5027 118.438 17.1997 118.786 14.6572 127.624" stroke="black" stroke-width="1.383" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.9273 0.737993C80.8564 0.554875 79.7567 0.804308 78.8696 1.4315C77.9825 2.0587 77.3807 3.01236 77.1963 4.08299L72.049 31.2427C71.9848 31.6183 72.0334 32.0045 72.1886 32.3525C72.3438 32.7005 72.5987 32.9946 72.921 33.1979C73.2433 33.4011 73.6186 33.5042 73.9995 33.4942C74.3804 33.4842 74.7498 33.3616 75.061 33.1417L83.524 27.828L100.171 30.7132C101.242 30.8966 102.342 30.6472 103.229 30.02C104.116 29.3928 104.718 28.439 104.902 27.3682L108.046 9.40349C108.137 8.87348 108.123 8.33065 108.005 7.80603C107.886 7.28142 107.666 6.78531 107.355 6.34607C107.045 5.90683 106.651 5.53307 106.196 5.24616C105.741 4.95925 105.234 4.76482 104.704 4.67399L81.9273 0.737993ZM91.5595 10.788C90.7143 10.5652 89.7873 10.8697 88.945 11.844C88.6653 12.168 88.1898 12.2745 87.8313 12.0397L85.666 10.6237C85.3068 10.389 85.204 9.90599 85.4665 9.56699C86.9883 7.60649 89.494 5.96249 92.611 6.78299C94.2112 7.20481 95.5784 8.24469 96.4122 9.6741C97.246 11.1035 97.4782 12.8055 97.0578 14.406C96.5478 16.3485 94.9428 17.6392 93.4518 18.3322C92.1603 18.9322 90.589 19.2622 89.107 19.071C88.6818 19.0162 88.4335 18.5865 88.543 18.1725L89.2 15.669C89.3088 15.255 89.74 15.003 90.1675 14.9775C90.7011 14.9399 91.2231 14.8041 91.7073 14.577C92.6058 14.1592 92.9808 13.6372 93.055 13.3522C93.1967 12.8138 93.1188 12.2411 92.8383 11.7601C92.5579 11.2791 92.0979 10.9299 91.5595 10.788ZM86.89 21.573C87.208 20.3655 88.4073 19.7752 89.5623 20.0797C90.7428 20.3902 91.5205 21.5025 91.2025 22.7085C90.8853 23.916 89.6538 24.5265 88.4733 24.2152C87.3183 23.9107 86.572 22.7797 86.89 21.573Z" fill="black"/>
+</svg>
diff --git a/src/static/list/icon-paying-game.svg b/src/static/list/icon-paying-game.svg
new file mode 100644
index 0000000..a312921
--- /dev/null
+++ b/src/static/list/icon-paying-game.svg
@@ -0,0 +1,34 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1261_18963)">
+<g clip-path="url(#clip0_1261_18963)">
+<rect x="3" y="2" width="14" height="14" rx="7" fill="#21B200"/>
+<path d="M9.99996 14.8333C13.2216 14.8333 15.8333 12.2216 15.8333 8.99996C15.8333 5.7783 13.2216 3.16663 9.99996 3.16663C6.7783 3.16663 4.16663 5.7783 4.16663 8.99996C4.16663 12.2216 6.7783 14.8333 9.99996 14.8333Z" stroke="#21B200"/>
+<path d="M9.99996 3.16663C9.97053 5.11152 9.49301 6.57026 8.56741 7.54291C7.64178 8.51553 6.17484 9.00203 4.16663 9.00238" stroke="#21B200" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.8241 9.29315C13.9246 9.16286 12.4732 9.56886 11.4698 10.5111C10.4665 11.4534 9.97684 12.8942 10.0008 14.8333" stroke="#21B200" stroke-linecap="round"/>
+<g clip-path="url(#clip1_1261_18963)">
+<path d="M9.99992 13.1666C12.3011 13.1666 14.1666 11.3011 14.1666 8.99992C14.1666 6.69873 12.3011 4.83325 9.99992 4.83325C7.69873 4.83325 5.83325 6.69873 5.83325 8.99992C5.83325 11.3011 7.69873 13.1666 9.99992 13.1666Z" stroke="white"/>
+<path d="M9.99992 4.83325C9.9789 6.22246 9.63781 7.26442 8.97667 7.95917C8.3155 8.6539 7.26769 9.0014 5.83325 9.00165" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.16 9.20934C12.8033 9.11628 11.7666 9.40628 11.0499 10.0793C10.3332 10.7524 9.98346 11.7815 10.0006 13.1666" stroke="white" stroke-linecap="round"/>
+</g>
+</g>
+<rect x="2.5" y="1.5" width="15" height="15" rx="7.5" stroke="white"/>
+</g>
+<defs>
+<filter id="filter0_d_1261_18963" x="0" y="0" width="20" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1261_18963"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1261_18963" result="shape"/>
+</filter>
+<clipPath id="clip0_1261_18963">
+<rect x="3" y="2" width="14" height="14" rx="7" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1261_18963">
+<rect width="10" height="10" fill="white" transform="translate(5 4)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/static/list/icon-reload.svg b/src/static/list/icon-reload.svg
new file mode 100644
index 0000000..121dcc5
--- /dev/null
+++ b/src/static/list/icon-reload.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.2426 12.7426C11.1569 13.8284 9.65687 14.5 8 14.5C4.6863 14.5 2 11.8137 2 8.5C2 5.1863 4.6863 2.5 8 2.5C9.65687 2.5 11.1569 3.17157 12.2426 4.25737C12.7953 4.81003 14 6.16667 14 6.16667" stroke="black" stroke-opacity="0.85" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 3.16669V6.16669H11" stroke="black" stroke-opacity="0.85" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/store/listStore.ts b/src/store/listStore.ts
index 75454f6..2b767bd 100644
--- a/src/store/listStore.ts
+++ b/src/store/listStore.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { getTennisMatches } from '../services/listApi'
-import {ListActions, IFilterOptions, ListState } from '../../types/list/types'
+import { ListActions, IFilterOptions, ListState } from '../../types/list/types'
 
 // 完整的 Store 类型
 type TennisStore = ListState & ListActions
@@ -40,7 +40,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     { id: 3, label: "10km", value: "10km" },
   ],
   // 快捷筛选数据
-  quickFilterData:[
+  quickFilterData: [
     { text: "默认排序", value: "0" },
     { text: "好评排序", value: "1" },
     { text: "销量排序", value: "2" },
@@ -75,6 +75,8 @@ export const useListStore = create<TennisStore>()((set, get) => ({
   ],
   // 球局数量
   gamesNum: 124,
+  // 页面滚动距离顶部距离 是否大于0
+  isScrollTop: false,
 
   // 获取比赛数据
   fetchMatches: async (params) => {
@@ -83,15 +85,42 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     try {
       const resData = await getTennisMatches(params) || {};
       const { data = {}, code } = resData;
+      if (code !== 0) {
+        set({
+          error: '1',
+          matches: [],
+          loading: false,
+        })
+      }
       const { count, rows } = data;
+      const list = (rows || []).map(() => {
+        return {
+          id: "3",
+          title: "黄浦区双打约球",
+          dateTime: "7月20日(周日)下午6点 2小时",
+          location: "仁恒河滨花园网球场",
+          distance: "3.5km",
+          registeredCount: 3,
+          maxCount: 4,
+          skillLevel: "2.0 至 2.5",
+          matchType: "双打",
+          images: [
+            "https://images.unsplash.com/photo-1554068865-24cecd4e34b8?w=200&h=200&fit=crop&crop=center",
+          ],
+        }
+      })
       set({
-        matches: rows || [],
+        matches: list || rows || [],
         loading: false,
-        // lastRefreshTime: new Date().toISOString()
+        gamesNum: count,
       })
 
     } catch (error) {
-
+      set({
+        error,
+        matches: [],
+        loading: false,
+      })
     }
   },
 
@@ -100,13 +129,14 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     set({ loading: true, error: null })
 
     try {
-      const matches = await getTennisMatches()
+      const resData = await getTennisMatches() || {};
+      const { data = {}, code } = resData;
+      const { count, rows } = data;
       set({
-        matches,
+        matches: rows,
         loading: false,
         lastRefreshTime: new Date().toISOString()
       })
-      console.log('Store: 成功刷新网球比赛数据:', matches.length, '条')
     } catch (error) {
     }
   },
diff --git a/types/list/types.ts b/types/list/types.ts
index 818dd14..e9aa406 100644
--- a/types/list/types.ts
+++ b/types/list/types.ts
@@ -1,6 +1,6 @@
 // 网球比赛数据接口
 export interface TennisMatch {
-  id: string
+  id: number
   title: string
   dateTime: string
   location: string
@@ -39,6 +39,7 @@ export interface ListState {
   locationOptions: BubbleOption[]
   gamePlayOptions: BubbleOption[]
   gamesNum: number
+  isScrollTop: boolean
 }
 
 export interface ListState {