小程序修改

apps/mini-user/src/pages/home/index.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text } from '@tarojs/components';
 import Taro, { useDidShow } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
 import TabMainHeader from '../../components/TabMainHeader';
@@ -7,8 +7,8 @@ import CouponBadge from '../../components/CouponBadge';
 import ProductCarousel from '../../components/ProductCarousel';
 import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
 import { request, toast } from '../../lib/api';
-import { FALLBACK_CITY_CODE, getProductImages } from '../../lib/product-images';
-
+import { getProductImages } from '../../lib/product-images';
+import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location';
 type Product = {
   id: string;
   name: string;
@@ -30,10 +30,15 @@ export default function HomePage() {
   const [tab, setTab] = useState('QINGXIANG');
   const [products, setProducts] = useState<Product[]>([]);
   const [loading, setLoading] = useState(true);
-  const cityCode = FALLBACK_CITY_CODE;
+  const [displayCity, setDisplayCity] = useState('郑州市');
+  const [cityCode, setCityCode] = useState('410100');
 
   useDidShow(() => {
     syncTabBarSelected(0);
+    void resolveUserCity().then((resolved) => {
+      setDisplayCity(resolved.displayCity);
+      setCityCode(getCityCodeForCatalog(resolved));
+    });
   });
 
   useEffect(() => {
@@ -61,26 +66,21 @@ export default function HomePage() {
 
   return (
     <PageShell variant="tab" className="home-page">
-      <TabMainHeader
-        title="杜康好客"
-        extra={(
-          <View className="tab-main-header__extra-inner">
-            <View className="tab-main-city-pin" />
-            <Text className="tab-main-city-label">郑州市</Text>
-          </View>
-        )}
-      />
+      <TabMainHeader title="杜康好客" />
 
       <View className="home-aroma-nav">
-        {AROMA_TABS.map((t) => (
-          <Text
-            key={t.key}
-            className={`home-aroma-tab${tab === t.key ? ' home-aroma-tab--active' : ''}${!t.open ? ' home-aroma-tab--muted' : ''}`}
-            onClick={() => onAromaTabClick(t.key, t.open)}
-          >
-            {t.label}
-          </Text>
-        ))}
+        <View className="home-aroma-tabs">
+          {AROMA_TABS.map((t) => (
+            <Text
+              key={t.key}
+              className={`home-aroma-tab${tab === t.key ? ' home-aroma-tab--active' : ''}${!t.open ? ' home-aroma-tab--muted' : ''}`}
+              onClick={() => onAromaTabClick(t.key, t.open)}
+            >
+              {t.label}
+            </Text>
+          ))}
+        </View>
+        <Text className="home-aroma-city">{displayCity}</Text>
       </View>
 
       <View className="home-product-list">