From 28201d79b9b45b556a0455ecac2412d3c2fe05bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AD=B1=E9=87=8E?= <hanxiufeng@xiaoye.lan>
Date: Wed, 10 Dec 2025 22:14:08 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TitleTextarea/TitleTextarea.tsx           | 50 +++++++++++++------
 src/components/TitleTextarea/index.scss       | 46 +++++++++++------
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/src/components/TitleTextarea/TitleTextarea.tsx b/src/components/TitleTextarea/TitleTextarea.tsx
index f6a4c27..9870e55 100644
--- a/src/components/TitleTextarea/TitleTextarea.tsx
+++ b/src/components/TitleTextarea/TitleTextarea.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useState } from 'react'
 import { View } from '@tarojs/components'
 import { TextArea } from '@nutui/nutui-react-taro';
 
@@ -22,27 +22,49 @@ const TitleTextarea: React.FC<TitleTextareaProps> = ({
   onBlur
 }) => {
   const isOverflow = value.length > maxLength
+  // const [isFocused, setIsFocused] = useState(false)
+
+  // const showPlaceholder = !isFocused && !value
+
   const handleChange = useCallback((values) => {
     // if (values.length > maxLength ) {
     //   const newValues = values.slice(0, maxLength)
     //   onChange(newValues)
     //   return;
     // }
-   onChange(values)
-  }, [])
+    onChange(values)
+  }, [onChange])
+
+  const handleFocus = useCallback(() => {
+    // setIsFocused(true)
+    onFocus?.()
+  }, [onFocus])
+
+  const handleBlur = useCallback(() => {
+    // setIsFocused(false)
+    onBlur?.()
+  }, [onBlur])
+
   return (
     <View className='title-input-wrapper'>
-      <TextArea
-        className='title-input'
-        placeholder={placeholder}
-        value={value}
-        onInput={(e) => handleChange(e.detail.value)}
-       // maxlength={maxLength}
-        autoSize={true}
-        placeholderClass='title-input-placeholder'
-        onFocus={onFocus}
-        onBlur={onBlur}
-      />
+      <View className='title-input-box'>
+        <TextArea
+          className='title-input'
+          placeholder={placeholder}
+          value={value}
+          onInput={(e) => handleChange(e.detail.value)}
+         // maxlength={maxLength}
+          placeholderClass='title-input-placeholder'
+          autoSize={true}
+          onFocus={handleFocus}
+          onBlur={handleBlur}
+        />
+        {/* {showPlaceholder && (
+          <View className='title-input-placeholder-custom'>
+            {placeholder}
+          </View>
+        )} */}
+      </View>
       <View className={`char-count${isOverflow ? ' char-count--error' : ''}`}>
         {value.length}/{maxLength}
       </View>
diff --git a/src/components/TitleTextarea/index.scss b/src/components/TitleTextarea/index.scss
index 720907a..64aa96f 100644
--- a/src/components/TitleTextarea/index.scss
+++ b/src/components/TitleTextarea/index.scss
@@ -4,9 +4,22 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 8px 12px;
-  min-height: 36px;
+  padding: 10px 12px;
+  min-height: 32px;
   box-sizing: border-box;
+  .title-input-box {
+    position: relative;
+    flex: 1;
+    display: flex;
+  }
+  .title-input-placeholder {
+    color: rgba(60, 60, 67, 0.60) !important;
+    font-weight: normal !important;
+    position: relative;
+    line-height: 22px !important;
+    height: 22px;
+    flex: 1;
+  }
   .title-input {
     flex: 1;
     padding: 0;
@@ -17,22 +30,23 @@
     display: flex;
     align-items: center;
     resize: none;
-    line-height: 26px;
-    min-height: 26px;
+    line-height: 22px;
+    min-height: 22px;
   }
-  
-  // 使用 placeholderClass 来控制 placeholder 样式
-  .title-input-placeholder {
-    color: rgba(60, 60, 67, 0.60) !important;
-    font-size: 16px !important;
-    font-weight: normal !important;
-    line-height: 26px !important;
-    height: 26px;
-    flex: 1;
+  .title-input-placeholder-custom {
+    position: absolute;
+    left: 7px;
+    top: 50%;
+    width: 100%;
+    padding: 0;
+    color: rgba(60, 60, 67, 0.60);
+    font-size: 16px;
+    font-weight: normal;
+    line-height: 22px;
+    pointer-events: none;
+    box-sizing: border-box;
+    transform: translateY(-50%);
   }
-  
-  
-  
   .char-count {
     color: #999;
     pointer-events: none;

From 293b9e6ebad5d6500e20e742b3b6c9bdd73f0242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Thu, 11 Dec 2025 15:56:22 +0800
Subject: [PATCH 2/5] 1

---
 src/components/HomeNavbar/index.tsx           | 50 ++++++++++++++++++-
 .../LocationConfirmDialog/index.scss          |  6 +++
 .../LocationConfirmDialog/index.tsx           | 16 +++++-
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/components/HomeNavbar/index.tsx b/src/components/HomeNavbar/index.tsx
index 3929053..bde384a 100644
--- a/src/components/HomeNavbar/index.tsx
+++ b/src/components/HomeNavbar/index.tsx
@@ -13,6 +13,10 @@ import LocationConfirmDialog from "@/components/LocationConfirmDialog";
 
 // 城市缓存 key
 const CITY_CACHE_KEY = "USER_SELECTED_CITY";
+// 定位弹窗关闭时间缓存 key（用户选择"继续浏览"时记录）
+const LOCATION_DIALOG_DISMISS_TIME_KEY = "LOCATION_DIALOG_DISMISS_TIME";
+// 2小时的毫秒数
+const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
 
 interface IProps {
   config?: {
@@ -130,8 +134,41 @@ const HomeNavbar = (props: IProps) => {
     }
   }, [detectedLocation]);
 
+  // 检查是否在2小时内已选择"继续浏览"
+  const should_show_location_dialog = (): boolean => {
+    try {
+      const dismiss_time = (Taro as any).getStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY);
+      if (!dismiss_time) {
+        return true; // 没有记录，可以显示
+      }
+      
+      const current_time = Date.now();
+      const time_diff = current_time - dismiss_time;
+      
+      // 如果距离上次选择"继续浏览"已超过2小时，可以再次显示
+      if (time_diff >= TWO_HOURS_MS) {
+        // 清除过期记录
+        (Taro as any).removeStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY);
+        return true;
+      }
+      
+      // 在2小时内，不显示弹窗
+      console.log(`距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
+      return false;
+    } catch (error) {
+      console.error('检查定位弹窗显示条件失败:', error);
+      return true; // 出错时默认显示
+    }
+  };
+
   // 显示定位确认弹窗
   const showLocationConfirmDialog = (detectedLocation: string, cachedCity: [string, string]) => {
+    // 检查是否在2小时内已选择"继续浏览"
+    if (!should_show_location_dialog()) {
+      console.log('[LocationDialog] 用户在2小时内已选择"继续浏览"，不显示弹窗');
+      return;
+    }
+    
     console.log('[LocationDialog] 准备显示定位确认弹窗，隐藏 GuideBar');
     setLocationDialogData({ detectedProvince: detectedLocation, cachedCity });
     setLocationDialogVisible(true);
@@ -162,14 +199,23 @@ const HomeNavbar = (props: IProps) => {
     handleCityChangeWithoutCache();
   };
 
-  // 处理定位弹窗取消
+  // 处理定位弹窗取消（用户选择"继续浏览"）
   const handleLocationDialogCancel = () => {
     if (!locationDialogData) return;
     
     const { cachedCity } = locationDialogData;
-    // 用户选择"否"，保持缓存的定位城市
+    // 用户选择"继续浏览"，保持缓存的定位城市
     console.log("保持缓存的定位城市:", cachedCity[1]);
     
+    // 记录用户选择"继续浏览"的时间戳，2小时内不再提示
+    try {
+      const current_time = Date.now();
+      (Taro as any).setStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY, current_time);
+      console.log(`[LocationDialog] 已记录用户选择"继续浏览"的时间，2小时内不再提示`);
+    } catch (error) {
+      console.error('保存定位弹窗关闭时间失败:', error);
+    }
+    
     // 关闭弹窗
     setLocationDialogVisible(false);
     setLocationDialogData(null);
diff --git a/src/components/LocationConfirmDialog/index.scss b/src/components/LocationConfirmDialog/index.scss
index 2b91270..d2db227 100644
--- a/src/components/LocationConfirmDialog/index.scss
+++ b/src/components/LocationConfirmDialog/index.scss
@@ -79,6 +79,10 @@
   cursor: pointer;
   transition: opacity 0.2s;
   margin-top: 20px;
+  position: relative;
+  z-index: 1;
+  user-select: none;
+  -webkit-tap-highlight-color: transparent;
   
   &:first-child {
     margin-top: 0;
@@ -111,6 +115,8 @@
   font-size: 16px;
   line-height: 22px;
   text-align: center;
+  pointer-events: none;
+  user-select: none;
   
   &.primary {
     color: #ffffff;
diff --git a/src/components/LocationConfirmDialog/index.tsx b/src/components/LocationConfirmDialog/index.tsx
index 09424a8..7501b73 100644
--- a/src/components/LocationConfirmDialog/index.tsx
+++ b/src/components/LocationConfirmDialog/index.tsx
@@ -40,10 +40,22 @@ const LocationConfirmDialog: React.FC<LocationConfirmDialogProps> = ({
         <View className="locationDialogContent">
           <Text className="locationDialogTitle">定位显示您在{detectedCity}</Text>
           <View className="locationDialogButtons">
-            <View className="locationDialogButton primary" onClick={onConfirm}>
+            <View 
+              className="locationDialogButton primary" 
+              onClick={(e) => {
+                e.stopPropagation();
+                onConfirm();
+              }}
+            >
               <Text className="locationDialogButtonText primary">切换到{detectedCity}</Text>
             </View>
-            <View className="locationDialogButton secondary" onClick={onCancel}>
+            <View 
+              className="locationDialogButton secondary" 
+              onClick={(e) => {
+                e.stopPropagation();
+                onCancel();
+              }}
+            >
               <Text className="locationDialogButtonText secondary">继续浏览{currentCity}</Text>
             </View>
           </View>

From 4c5262441c04b2f89dfede12fb22fda8ce2b8373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Fri, 12 Dec 2025 11:56:41 +0800
Subject: [PATCH 3/5] 1

---
 src/main_pages/components/ListPageContent.tsx | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/main_pages/components/ListPageContent.tsx b/src/main_pages/components/ListPageContent.tsx
index 3a8528f..d6e3181 100644
--- a/src/main_pages/components/ListPageContent.tsx
+++ b/src/main_pages/components/ListPageContent.tsx
@@ -214,6 +214,38 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
     }
   }, [isActive]);
 
+  // 记录上一次的城市，用于检测城市变化
+  const prevAreaRef = useRef<[string, string] | null>(null);
+
+  // 监听城市变化，重新获取行政区列表并清空已选择的行政区
+  useEffect(() => {
+    if (area && area.length >= 2) {
+      const currentProvince = area[1];
+      const prevProvince = prevAreaRef.current?.[1];
+      
+      // 只有当城市真正改变时才执行（避免初始化时也触发）
+      if (prevProvince && prevProvince !== currentProvince) {
+        console.log("城市改变，重新获取行政区列表:", {
+          prevProvince,
+          currentProvince,
+        });
+        // 城市改变时，重新获取行政区列表
+        getDistricts();
+        // 清空已选择的行政区，避免显示错误的行政区
+        const currentState = useListStore.getState();
+        const currentPageState = currentState.isSearchResult 
+          ? currentState.searchPageState 
+          : currentState.listPageState;
+        if (currentPageState?.distanceQuickFilter?.district) {
+          updateDistanceQuickFilter({ district: undefined });
+        }
+      }
+      // 更新记录的城市
+      prevAreaRef.current = area as [string, string];
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [area?.[1]]); // 只监听省份（area[1]）的变化
+
   // 当页面从非激活状态切换为激活状态时，检查城市是否变化，如果变化则重新加载数据
   useEffect(() => {
     // 如果从非激活状态变为激活状态（切回列表页）

From e560d06106238e40e9f9fb26bd1f48e0305bf31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Fri, 12 Dec 2025 23:49:10 +0800
Subject: [PATCH 4/5] 1

---
 src/components/HomeNavbar/index.tsx | 36 ++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/HomeNavbar/index.tsx b/src/components/HomeNavbar/index.tsx
index bde384a..920a90f 100644
--- a/src/components/HomeNavbar/index.tsx
+++ b/src/components/HomeNavbar/index.tsx
@@ -15,6 +15,8 @@ import LocationConfirmDialog from "@/components/LocationConfirmDialog";
 const CITY_CACHE_KEY = "USER_SELECTED_CITY";
 // 定位弹窗关闭时间缓存 key（用户选择"继续浏览"时记录）
 const LOCATION_DIALOG_DISMISS_TIME_KEY = "LOCATION_DIALOG_DISMISS_TIME";
+// 城市切换时间缓存 key（用户手动切换城市时记录）
+const CITY_CHANGE_TIME_KEY = "CITY_CHANGE_TIME";
 // 2小时的毫秒数
 const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
 
@@ -134,9 +136,26 @@ const HomeNavbar = (props: IProps) => {
     }
   }, [detectedLocation]);
 
-  // 检查是否在2小时内已选择"继续浏览"
+  // 检查是否在2小时内已选择"继续浏览"或切换过城市
   const should_show_location_dialog = (): boolean => {
     try {
+      // 检查是否在2小时内切换过城市
+      const city_change_time = (Taro as any).getStorageSync(CITY_CHANGE_TIME_KEY);
+      if (city_change_time) {
+        const current_time = Date.now();
+        const time_diff = current_time - city_change_time;
+        
+        // 如果距离上次切换城市还在2小时内，不显示弹窗
+        if (time_diff < TWO_HOURS_MS) {
+          console.log(`距离上次切换城市还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟，不显示定位弹窗`);
+          return false;
+        } else {
+          // 超过2小时，清除过期记录
+          (Taro as any).removeStorageSync(CITY_CHANGE_TIME_KEY);
+        }
+      }
+      
+      // 检查是否在2小时内已选择"继续浏览"
       const dismiss_time = (Taro as any).getStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY);
       if (!dismiss_time) {
         return true; // 没有记录，可以显示
@@ -304,12 +323,23 @@ const HomeNavbar = (props: IProps) => {
 
   // 处理城市切换（用户手动选择）
   const handleCityChange = async (_newArea: any) => {
-    // 用户手动选择的城市不保存到缓存（临时切换）
-    console.log("用户手动选择城市（不保存缓存）:", _newArea);
+    // 用户手动选择的城市保存到缓存
+    console.log("用户手动选择城市，更新缓存:", _newArea);
     
     // 先更新 area 状态（用于界面显示和接口参数）
     updateArea(_newArea);
     
+    // 保存城市到缓存
+    try {
+      (Taro as any).setStorageSync(CITY_CACHE_KEY, _newArea);
+      // 记录切换时间，2小时内不再弹出定位弹窗
+      const current_time = Date.now();
+      (Taro as any).setStorageSync(CITY_CHANGE_TIME_KEY, current_time);
+      console.log("已保存城市到缓存并记录切换时间:", _newArea, current_time);
+    } catch (error) {
+      console.error("保存城市缓存失败:", error);
+    }
+    
     // 先调用列表接口（会使用更新后的 state.area）
     if (refreshBothLists) {
       await refreshBothLists();

From 9f63a2369a9d3aa84881e11ad133aa3e7ea9ab68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= <light.zhang@ysinc.com>
Date: Sat, 13 Dec 2025 00:20:26 +0800
Subject: [PATCH 5/5] 1

---
 src/components/HomeNavbar/index.tsx           | 152 +++++++++++++-----
 src/main_pages/components/ListPageContent.tsx |  30 +++-
 src/store/userStore.ts                        |  24 ++-
 3 files changed, 159 insertions(+), 47 deletions(-)

diff --git a/src/components/HomeNavbar/index.tsx b/src/components/HomeNavbar/index.tsx
index 920a90f..019eea6 100644
--- a/src/components/HomeNavbar/index.tsx
+++ b/src/components/HomeNavbar/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState, useRef } from "react";
+import { useEffect, useState } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import img from "@/config/images";
 import { useGlobalState } from "@/store/global";
@@ -96,7 +96,6 @@ const HomeNavbar = (props: IProps) => {
     detectedProvince: string;
     cachedCity: [string, string];
   } | null>(null);
-  const hasShownLocationDialog = useRef(false); // 防止重复弹窗
 
   // 监听城市选择器状态变化，通知父组件
   useEffect(() => {
@@ -110,44 +109,18 @@ const HomeNavbar = (props: IProps) => {
   // 只使用省份/直辖市，不使用城市（城市可能是区）
   const detectedLocation = lastLocationProvince;
 
-  // 初始化城市：优先使用缓存的定位信息，其次使用用户详情中的位置信息
-  useEffect(() => {
-    // 1. 尝试从缓存中读取上次的定位信息
-    const cachedCity = (Taro as any).getStorageSync(CITY_CACHE_KEY);
-    
-    if (cachedCity && Array.isArray(cachedCity) && cachedCity.length === 2) {
-      // 如果有缓存的定位信息，使用缓存
-      const cachedCityArray = cachedCity as [string, string];
-      console.log("使用缓存的定位城市:", cachedCityArray);
-      updateArea(cachedCityArray);
-      
-      // 如果用户详情中有位置信息且与缓存不同，弹窗询问是否切换
-      if (detectedLocation && cachedCityArray[1] !== detectedLocation && !hasShownLocationDialog.current) {
-        hasShownLocationDialog.current = true;
-        showLocationConfirmDialog(detectedLocation, cachedCityArray);
-      }
-    } else if (detectedLocation) {
-      // 如果没有缓存但有用户详情中的位置信息，直接使用并保存到缓存
-      console.log("没有缓存，使用用户详情中的位置信息:", detectedLocation);
-      const newArea: [string, string] = ["中国", detectedLocation];
-      updateArea(newArea);
-      // 保存定位信息到缓存
-      (Taro as any).setStorageSync(CITY_CACHE_KEY, newArea);
-    }
-  }, [detectedLocation]);
-
-  // 检查是否在2小时内已选择"继续浏览"或切换过城市
+  // 检查是否应该显示定位确认弹窗
   const should_show_location_dialog = (): boolean => {
     try {
+      const current_time = Date.now();
+      
       // 检查是否在2小时内切换过城市
       const city_change_time = (Taro as any).getStorageSync(CITY_CHANGE_TIME_KEY);
       if (city_change_time) {
-        const current_time = Date.now();
         const time_diff = current_time - city_change_time;
-        
         // 如果距离上次切换城市还在2小时内，不显示弹窗
         if (time_diff < TWO_HOURS_MS) {
-          console.log(`距离上次切换城市还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟，不显示定位弹窗`);
+          console.log(`[HomeNavbar] 距离上次切换城市还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟，不显示定位弹窗`);
           return false;
         } else {
           // 超过2小时，清除过期记录
@@ -161,9 +134,7 @@ const HomeNavbar = (props: IProps) => {
         return true; // 没有记录，可以显示
       }
       
-      const current_time = Date.now();
       const time_diff = current_time - dismiss_time;
-      
       // 如果距离上次选择"继续浏览"已超过2小时，可以再次显示
       if (time_diff >= TWO_HOURS_MS) {
         // 清除过期记录
@@ -172,30 +143,123 @@ const HomeNavbar = (props: IProps) => {
       }
       
       // 在2小时内，不显示弹窗
-      console.log(`距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
+      console.log(`[HomeNavbar] 距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
       return false;
     } catch (error) {
-      console.error('检查定位弹窗显示条件失败:', error);
+      console.error('[HomeNavbar] 检查定位弹窗显示条件失败:', error);
       return true; // 出错时默认显示
     }
   };
 
   // 显示定位确认弹窗
   const showLocationConfirmDialog = (detectedLocation: string, cachedCity: [string, string]) => {
-    // 检查是否在2小时内已选择"继续浏览"
+    // 检查是否应该显示弹窗
     if (!should_show_location_dialog()) {
-      console.log('[LocationDialog] 用户在2小时内已选择"继续浏览"，不显示弹窗');
+      console.log('[HomeNavbar] 用户在2小时内已选择"继续浏览"或切换过城市，不显示弹窗');
       return;
     }
     
-    console.log('[LocationDialog] 准备显示定位确认弹窗，隐藏 GuideBar');
+    console.log('[HomeNavbar] 准备显示定位确认弹窗，隐藏 GuideBar');
     setLocationDialogData({ detectedProvince: detectedLocation, cachedCity });
     setLocationDialogVisible(true);
     // 显示弹窗时隐藏 GuideBar
     setShowGuideBar(false);
-    console.log('[LocationDialog] setShowGuideBar(false) 已调用');
+    console.log('[HomeNavbar] setShowGuideBar(false) 已调用');
   };
 
+  // 初始化城市：优先使用缓存的定位信息，如果缓存城市和用户详情位置不一致，且时间过期，则弹出选择框
+  // 只在组件挂载时执行一次，避免重复执行
+  useEffect(() => {
+    // 1. 优先尝试从缓存中读取上次的定位信息
+    const cachedCity = (Taro as any).getStorageSync(CITY_CACHE_KEY);
+    
+    if (cachedCity && Array.isArray(cachedCity) && cachedCity.length === 2) {
+      // 如果有缓存的定位信息，使用缓存
+      const cachedCityArray = cachedCity as [string, string];
+      console.log("[HomeNavbar] 使用缓存的定位城市:", cachedCityArray);
+      updateArea(cachedCityArray);
+      
+      // 如果用户详情中有位置信息，且与缓存不一致，检查是否需要弹窗
+      if (detectedLocation && cachedCityArray[1] !== detectedLocation) {
+        // 检查时间缓存，如果没有或过期，则弹出选择框
+        if (should_show_location_dialog()) {
+          console.log("[HomeNavbar] 缓存城市与用户详情位置不一致，且时间过期，弹出选择框");
+          showLocationConfirmDialog(detectedLocation, cachedCityArray);
+        } else {
+          console.log("[HomeNavbar] 缓存城市与用户详情位置不一致，但时间未过期，不弹出选择框");
+        }
+      }
+    } else if (detectedLocation) {
+      // 只有在完全没有缓存的情况下，才使用用户详情中的位置信息
+      console.log("[HomeNavbar] 没有缓存，使用用户详情中的位置信息:", detectedLocation);
+      const newArea: [string, string] = ["中国", detectedLocation];
+      updateArea(newArea);
+      // 保存定位信息到缓存
+      (Taro as any).setStorageSync(CITY_CACHE_KEY, newArea);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []); // 空依赖数组，确保只在组件挂载时执行一次
+
+  // 检查是否在2小时内已选择"继续浏览"或切换过城市（当前不使用，首页重新进入时直接使用缓存中的位置）
+  // const should_show_location_dialog = (): boolean => {
+  //   try {
+  //     // 检查是否在2小时内切换过城市
+  //     const city_change_time = (Taro as any).getStorageSync(CITY_CHANGE_TIME_KEY);
+  //     if (city_change_time) {
+  //       const current_time = Date.now();
+  //       const time_diff = current_time - city_change_time;
+  //       
+  //       // 如果距离上次切换城市还在2小时内，不显示弹窗
+  //       if (time_diff < TWO_HOURS_MS) {
+  //         console.log(`距离上次切换城市还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟，不显示定位弹窗`);
+  //         return false;
+  //       } else {
+  //         // 超过2小时，清除过期记录
+  //         (Taro as any).removeStorageSync(CITY_CHANGE_TIME_KEY);
+  //       }
+  //     }
+  //     
+  //     // 检查是否在2小时内已选择"继续浏览"
+  //     const dismiss_time = (Taro as any).getStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY);
+  //     if (!dismiss_time) {
+  //       return true; // 没有记录，可以显示
+  //     }
+  //     
+  //     const current_time = Date.now();
+  //     const time_diff = current_time - dismiss_time;
+  //     
+  //     // 如果距离上次选择"继续浏览"已超过2小时，可以再次显示
+  //     if (time_diff >= TWO_HOURS_MS) {
+  //       // 清除过期记录
+  //       (Taro as any).removeStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY);
+  //       return true;
+  //     }
+  //     
+  //     // 在2小时内，不显示弹窗
+  //     console.log(`距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
+  //     return false;
+  //   } catch (error) {
+  //     console.error('检查定位弹窗显示条件失败:', error);
+  //     return true; // 出错时默认显示
+  //   }
+  // };
+
+  // 显示定位确认弹窗（当前不使用，首页重新进入时直接使用缓存中的位置）
+  // const showLocationConfirmDialog = (detectedLocation: string, cachedCity: [string, string]) => {
+  //   // 检查是否在2小时内已选择"继续浏览"
+  //   if (!should_show_location_dialog()) {
+  //     console.log('[LocationDialog] 用户在2小时内已选择"继续浏览"，不显示弹窗');
+  //     return;
+  //   }
+  //   
+  //   console.log('[LocationDialog] 准备显示定位确认弹窗，隐藏 GuideBar');
+  //   setLocationDialogData({ detectedProvince: detectedLocation, cachedCity });
+  //   setLocationDialogVisible(true);
+  //   // 显示弹窗时隐藏 GuideBar
+  //   setShowGuideBar(false);
+  //   console.log('[LocationDialog] setShowGuideBar(false) 已调用');
+  // };
+
   // 处理定位弹窗确认
   const handleLocationDialogConfirm = () => {
     if (!locationDialogData) return;
@@ -206,6 +270,14 @@ const HomeNavbar = (props: IProps) => {
     updateArea(newArea);
     // 更新缓存为新的定位信息
     (Taro as any).setStorageSync(CITY_CACHE_KEY, newArea);
+    // 记录切换城市的时间戳，2小时内不再提示
+    try {
+      const current_time = Date.now();
+      (Taro as any).setStorageSync(CITY_CHANGE_TIME_KEY, current_time);
+      console.log(`[LocationDialog] 已记录用户切换城市的时间，2小时内不再提示`);
+    } catch (error) {
+      console.error('保存城市切换时间失败:', error);
+    }
     console.log("切换到用户详情中的位置信息并更新缓存:", detectedProvince);
     
     // 关闭弹窗
diff --git a/src/main_pages/components/ListPageContent.tsx b/src/main_pages/components/ListPageContent.tsx
index d6e3181..58703b4 100644
--- a/src/main_pages/components/ListPageContent.tsx
+++ b/src/main_pages/components/ListPageContent.tsx
@@ -129,15 +129,37 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
   // ScrollView 滚动处理
   const handleScrollViewScroll = useCallback(
     (e: any) => {
-
-
       const currentScrollTop = e?.detail?.scrollTop || 0;
+      const scrollHeight = e?.detail?.scrollHeight || 0;
+      const clientHeight = e?.detail?.clientHeight || 0;
       const lastScrollTop = lastScrollTopRef.current;
       const currentTime = Date.now();
       const timeDiff = currentTime - lastScrollTimeRef.current;
 
       if (timeDiff < 100) return;
 
+      // 计算距离底部的距离，提前加载（距离底部600px时开始加载）
+      // 注意：如果 scrollHeight 或 clientHeight 不可用，则使用 lowerThreshold 触发
+      if (scrollHeight > 0 && clientHeight > 0) {
+        const distanceToBottom = scrollHeight - currentScrollTop - clientHeight;
+        const preloadThreshold = 600; // 提前加载阈值
+        
+        // 如果距离底部小于阈值，且正在向下滚动，且有更多数据，则提前加载
+        if (
+          distanceToBottom < preloadThreshold &&
+          distanceToBottom > 0 &&
+          !loading &&
+          !loadingMoreRef.current &&
+          listPageState?.isHasMoreData &&
+          currentScrollTop > lastScrollTop // 向下滚动
+        ) {
+          loadingMoreRef.current = true;
+          loadMoreMatches().finally(() => {
+            loadingMoreRef.current = false;
+          });
+        }
+      }
+
       const scrollDiff = currentScrollTop - lastScrollTop;
       let newDirection = scrollDirectionRef.current;
       if (Math.abs(scrollDiff) > 15) {
@@ -195,7 +217,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
       lastScrollTopRef.current = currentScrollTop;
       lastScrollTimeRef.current = currentTime;
     },
-    [updateListPageState, onNavStateChange]
+    [updateListPageState, onNavStateChange, loading, loadMoreMatches, listPageState?.isHasMoreData]
     // 移除 showSearchBar 和 isShowInputCustomerNavBar 依赖，使用 ref 获取最新值
   );
 
@@ -550,7 +572,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
               refresherEnabled={true}
               refresherTriggered={refreshing}
               onRefresherRefresh={handleRefresh}
-              lowerThreshold={100}
+              lowerThreshold={600}
               onScrollToLower={async () => {
                 if (
                   !loading &&
diff --git a/src/store/userStore.ts b/src/store/userStore.ts
index 5c22707..1b35edd 100644
--- a/src/store/userStore.ts
+++ b/src/store/userStore.ts
@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import Taro from "@tarojs/taro";
 import {
   fetchUserProfile,
   updateUserProfile,
@@ -44,14 +45,31 @@ export const useUser = create<UserState>()((set) => ({
       const userData = res.data;
       set({ user: userData });
       
-      // 当 userLastLocationProvince 更新时，同步更新 area
+      // 优先使用缓存中的城市，不使用用户信息中的位置
+      // 检查是否有缓存的城市
+      const CITY_CACHE_KEY = "USER_SELECTED_CITY";
+      const cachedCity = (Taro as any).getStorageSync?.(CITY_CACHE_KEY);
+      
+      if (cachedCity && Array.isArray(cachedCity) && cachedCity.length === 2) {
+        // 如果有缓存的城市，使用缓存，不更新 area
+        console.log("[userStore] 检测到缓存的城市，使用缓存，不更新 area");
+        return userData;
+      }
+      
+      // 只有当没有缓存时，才使用用户信息中的位置
       if (userData?.last_location_province) {
         const listStore = useListStore.getState();
         const currentArea = listStore.area;
-        // 只有当 area 不存在或与 userLastLocationProvince 不一致时才更新
-        if (!currentArea || currentArea[1] !== userData.last_location_province) {
+        // 只有当 area 不存在时才使用用户信息中的位置
+        if (!currentArea) {
           const newArea: [string, string] = ["中国", userData.last_location_province];
           listStore.updateArea(newArea);
+          // 保存到缓存
+          try {
+            (Taro as any).setStorageSync?.(CITY_CACHE_KEY, newArea);
+          } catch (error) {
+            console.error("保存城市缓存失败:", error);
+          }
         }
       }