Revert "fix(home): 导航栏城市优先展示 LBS 定位"

This reverts commit 08af61d009.
This commit is contained in:
zhangjing1
2026-03-27 10:59:15 +08:00
parent b3577cc638
commit 2fbaec6b43
3 changed files with 3 additions and 10 deletions

View File

@@ -43,8 +43,7 @@ function CustomPage(props) {
const loginRef = useRef()
const router = useRouter()
const { location, address } = useSelector((state) => state.user)
const nearbyText =
location?.city || location?.province || address?.city || ''
const nearbyText = address?.city || location?.city || ''
useEffect(() => {
fetch()

View File

@@ -46,11 +46,7 @@ function WgtHomeHeader(props) {
}
}}
>
<View className='address'>
{location?.address ||
[location?.province, location?.city, location?.district].filter(Boolean).join('') ||
'选择地区'}
</View>
<View className='address'>{location?.address || '北京市北京市昌平区'}</View>
<Text className='iconfont icon-qianwang-01'></Text>
</View>
)}

View File

@@ -90,9 +90,7 @@ function Home() {
const showAdv = useSelector((member) => member.user.showAdv)
const { location, address } = useSelector((state) => state.user)
/** 导航栏城市:优先跟随 LBS 定位,与「选择商家」页一致;勿用收货地址盖住当前定位 */
const nearbyText =
location?.city || location?.province || address?.city || ''
const nearbyText = address?.city || location?.city || ''
const { setNavigationBarTitle } = useNavigation()
const { updateAddress } = useLocation()
const locationKeyRef = useRef('')