1

src/container/listCustomNavbar/index.tsx

@@ -1,6 +1,8 @@
 import { View, Text, Image } from "@tarojs/components";
 import img from "@/config/images";
 import { useGlobalState } from "@/store/global";
+import { useUserInfo, } from '@/store/userStore'
+
 import { useListState } from "@/store/listStore";
 import CustomNavbar from "@/components/CustomNavbar";
 import { Input } from "@nutui/nutui-react-taro";
@@ -32,9 +34,11 @@ const ListHeader = (props: IProps) => {
   const { gamesNum, searchValue, isShowInputCustomerNavBar } = useListState();
   const { statusBarHeight, navbarHeight } = statusNavbarHeightInfo;
 
-  const currentAddress = getLocationLoading
-    ? getLocationText
-    : location?.address;
+  const { city,district } = useUserInfo()
+
+  console.log("useUserInfo",city,district )
+
+  const currentAddress =  city + district
 
   const handleInputClick = () => {
     const pages = Taro.getCurrentPages();
@@ -69,9 +73,8 @@ const ListHeader = (props: IProps) => {
       <View className="listNavWrapper">
         {/* 首页logo 导航*/}
         <View
-          className={`listNavContainer toggleElement firstElement hidden ${
-            (!isShowInputCustomerNavBar && !showInput) && "visible"
-          }`}
+          className={`listNavContainer toggleElement firstElement hidden ${(!isShowInputCustomerNavBar && !showInput) && "visible"
+            }`}
           style={{
             height: `${navbarHeight}px`,
             paddingTop: `${statusBarHeight}px`,
@@ -94,16 +97,15 @@ const ListHeader = (props: IProps) => {
                 )}
               </View>
               <View className="listNavInfoWrapper">
-                <Text className="listNavInfo">附近${gamesNum}场球局</Text>
+                <Text className="listNavInfo">附近{gamesNum}场球局</Text>
               </View>
             </View>
           </View>
         </View>
         {/* 搜索导航 */}
         <View
-          className={`inputCustomerNavbarContainer toggleElement secondElement hidden ${
-            (isShowInputCustomerNavBar || showInput) && "visible"
-          } ${showInput && "inputCustomerNavbarShowInput"}`}
+          className={`inputCustomerNavbarContainer toggleElement secondElement hidden ${(isShowInputCustomerNavBar || showInput) && "visible"
+            } ${showInput && "inputCustomerNavbarShowInput"}`}
           style={{
             height: `${navbarHeight}px`,
             paddingTop: `${statusBarHeight}px`,