fix(mini-user): address review blockers

Co-authored-by: Cursor <cursoragent@cursor.com>

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

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { View, Text } from '@tarojs/components';
 import Taro, { useDidShow } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
@@ -21,9 +21,9 @@ type Product = {
 };
 
 const AROMA_TABS = [
-  { key: 'QINGXIANG', label: '清香型', open: true },
-  { key: 'JIANGXIANG', label: '酱香型', open: false },
-  { key: 'NONGXIANG', label: '浓香型', open: false },
+  { key: 'QINGXIANG', label: '清香型' },
+  { key: 'JIANGXIANG', label: '酱香型' },
+  { key: 'NONGXIANG', label: '浓香型' },
 ] as const;
 
 export default function HomePage() {
@@ -49,20 +49,26 @@ export default function HomePage() {
       .finally(() => setLoading(false));
   }, [cityCode]);
 
-  function onAromaTabClick(key: string, open: boolean) {
-    if (!open) {
-      toast('暂未开放');
-      return;
+  const availableAromas = useMemo(
+    () =>
+      AROMA_TABS.filter((item) =>
+        products.some((product) => product.aromaType === item.key),
+      ),
+    [products],
+  );
+
+  useEffect(() => {
+    if (loading || availableAromas.length === 0) return;
+    if (!availableAromas.some((item) => item.key === tab)) {
+      setTab(availableAromas[0].key);
     }
-    setTab(key);
-  }
+  }, [availableAromas, loading, tab]);
 
   function openProductDetail(id: string) {
     Taro.navigateTo({ url: `/pages/product-detail/index?id=${id}` });
   }
 
   const filtered = products.filter((p) => p.aromaType === tab);
-  const onSale = tab === 'QINGXIANG';
 
   return (
     <PageShell variant="tab" className="home-page no-tab-header">
@@ -70,11 +76,11 @@ export default function HomePage() {
 
       <View className="home-aroma-nav">
         <View className="home-aroma-tabs">
-          {AROMA_TABS.map((t) => (
+          {availableAromas.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)}
+              className={`home-aroma-tab${tab === t.key ? ' home-aroma-tab--active' : ''}`}
+              onClick={() => setTab(t.key)}
             >
               {t.label}
             </Text>
@@ -85,12 +91,10 @@ export default function HomePage() {
 
       <View className="home-product-list">
         {loading ? <View className="home-empty">加载中…</View> : null}
-        {!loading && !onSale ? <View className="home-empty">该香型暂未上线，敬请期待</View> : null}
-        {!loading && onSale && filtered.length === 0 ? (
-          <View className="home-empty">暂无商品</View>
+        {!loading && products.length === 0 ? (
+          <View className="home-empty">当前城市暂无在售商品</View>
         ) : null}
         {!loading &&
-          onSale &&
           filtered.map((p) => {
             const images = getProductImages(p);
             return (

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

@@ -150,6 +150,19 @@ export default function LoginPage() {
     return true;
   }
 
+  function cancelLogin() {
+    const pages = Taro.getCurrentPages();
+    if (pages.length > 1) {
+      Taro.navigateBack().catch(() => {
+        Taro.switchTab({ url: '/pages/home/index' });
+      });
+      return;
+    }
+    Taro.switchTab({ url: '/pages/home/index' }).catch(() => {
+      Taro.reLaunch({ url: '/pages/home/index' });
+    });
+  }
+
   function applySessionAndLeave(
     data: SessionPayload | WechatLoginResult,
     phoneValue?: string,
@@ -370,6 +383,12 @@ export default function LoginPage() {
 
   return (
     <PageShell variant="plain" className="login-page">
+      <View className="login-nav">
+        <View className="login-nav-back" onClick={cancelLogin}>
+          <Text className="login-nav-back-icon">‹</Text>
+          <Text>返回</Text>
+        </View>
+      </View>
       <View className="login-header">
         <View className="login-logo-wrap">
           <View className="login-logo">
@@ -523,6 +542,11 @@ export default function LoginPage() {
             <WechatLoginButton loading={wxLoading} label="授权登录" onClick={() => void wechatLogin()} />
           </>
         ) : null}
+
+        <View className="login-cancel-btn" onClick={cancelLogin}>
+          <Text>暂不登录，继续浏览</Text>
+        </View>
+        <Text className="login-cancel-hint">无需登录也可浏览商品和门店</Text>
       </View>
     </PageShell>
   );

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

@@ -50,11 +50,13 @@ export default function MinePage() {
   const [draftAvatarUrl, setDraftAvatarUrl] = useState('');
   const [draftNickname, setDraftNickname] = useState('');
   const [savingProfile, setSavingProfile] = useState(false);
+  const [profileLoadError, setProfileLoadError] = useState('');
 
   function resetGuestState() {
     setProfile(null);
     setBenefitBalance(0);
     setOrderCounts({});
+    setProfileLoadError('');
   }
 
   function applyProfile(me: UserProfile) {
@@ -63,6 +65,7 @@ export default function MinePage() {
 
   function loadProfile() {
     if (!isLoggedIn()) return;
+    setProfileLoadError('');
     Promise.all([
       request<UserProfile>('/auth/me'),
       request<Array<Record<string, unknown>>>('/benefit/coupons').catch(() => []),
@@ -83,7 +86,16 @@ export default function MinePage() {
         });
         setOrderCounts(counts);
       })
-      .catch(() => {});
+      .catch((error) => {
+        if (!isLoggedIn()) {
+          setAuthed(false);
+          resetGuestState();
+          return;
+        }
+        const message = error instanceof Error ? error.message : '个人资料加载失败';
+        setProfileLoadError(message);
+        toast('个人资料加载失败，请点击重试');
+      });
   }
 
   useDidShow(() => {
@@ -162,22 +174,20 @@ export default function MinePage() {
 
   /** 点击头像：绑定账号后用 chooseAvatar + nickname 获取头像昵称 */
   async function handleAvatarTap() {
+    if (bindingWx || savingProfile) return;
     if (!isLoggedIn()) {
       goLogin('/pages/mine/index');
       return;
     }
-    if (!isWeapp) {
-      if (!profile?.hasWechat) {
-        const ok = await ensureWechatBound();
-        if (ok) loadProfile();
-      }
+    if (isWeapp) {
+      openProfileSheet();
       return;
     }
     if (!profile?.hasWechat) {
       const ok = await ensureWechatBound();
-      if (!ok) return;
+      if (ok) loadProfile();
     }
-    openProfileSheet();
+    return;
   }
 
   async function onChooseAvatar(e: { detail?: { avatarUrl?: string } }) {
@@ -202,16 +212,18 @@ export default function MinePage() {
     }
     setSavingProfile(true);
     try {
-      if (!profile?.hasWechat) {
-        const ok = await ensureWechatBound();
-        if (!ok) return;
-      }
       let avatarUrl = draftAvatarUrl;
+      let avatarResourceId: string | undefined;
       if (draftAvatarTemp) {
-        avatarUrl = await uploadAvatarTempFile(draftAvatarTemp);
+        const uploaded = await uploadAvatarTempFile(draftAvatarTemp);
+        avatarUrl = uploaded.url;
+        avatarResourceId = uploaded.resourceId;
       }
-      const updated = await uploadMiniWechatProfile({ nickname, avatarUrl });
-      if (updated) applyProfile({ ...updated, hasWechat: true });
+      const updated = await uploadMiniWechatProfile({
+        nickname,
+        ...(avatarResourceId ? { avatarUrl, avatarResourceId } : {}),
+      });
+      if (updated) applyProfile(updated);
       setProfileSheetOpen(false);
       toast('头像昵称已更新', 'success');
       loadProfile();
@@ -262,7 +274,9 @@ export default function MinePage() {
           </View>
         </View>
         <View className="mine-login-gate">
-          <View className="mine-login-gate-hint">登录后管理订单与个人信息</View>
+          <View className="mine-login-gate-hint">
+            登录后管理订单与个人信息；无需登录也可浏览商品和门店
+          </View>
           <View className="mine-login-btn" onClick={() => goLogin('/pages/mine/index')}>
             <Text>去登录</Text>
           </View>
@@ -283,9 +297,10 @@ export default function MinePage() {
   }
   const nickname = display.nickname || '用户';
   const needProfileFill = isWeapp && needsWxProfileFill(display);
+  const avatarProfileReady = isWeapp ? !needProfileFill : hasWechat;
   const memberLabel = needProfileFill
     ? '点击头像完善资料'
-    : hasWechat
+    : isWeapp || hasWechat
       ? '好客会员'
       : canWxAuth
         ? '点击头像授权'
@@ -305,7 +320,7 @@ export default function MinePage() {
           >
             <View
               className={`mine-avatar${
-                !needProfileFill && hasWechat ? ' mine-avatar--wx-ok' : ' mine-avatar--wx-pending'
+                avatarProfileReady ? ' mine-avatar--wx-ok' : ' mine-avatar--wx-pending'
               }`}
             >
               {renderAvatarContent(display.avatarUrl)}
@@ -313,13 +328,11 @@ export default function MinePage() {
             {avatarClickable ? (
               <View
                 className={`mine-avatar-status${
-                  needProfileFill || !hasWechat
-                    ? ' mine-avatar-status--pending'
-                    : ' mine-avatar-status--ok'
+                  avatarProfileReady ? ' mine-avatar-status--ok' : ' mine-avatar-status--pending'
                 }`}
               >
                 <Text>
-                  {bindingWx ? '授权中' : needProfileFill || !hasWechat ? '去完善' : '更换'}
+                  {bindingWx ? '授权中' : avatarProfileReady ? '更换' : '去完善'}
                 </Text>
               </View>
             ) : null}
@@ -330,9 +343,20 @@ export default function MinePage() {
             onClick={avatarClickable ? () => void handleAvatarTap() : undefined}
           >
             <Text className="mine-profile-name">{nickname}</Text>
-            <Text className={`mine-member-tag${hasWechat && !needProfileFill ? ' mine-member-tag--wechat' : ''}`}>
+            <Text className={`mine-member-tag${avatarProfileReady ? ' mine-member-tag--wechat' : ''}`}>
               {memberLabel}
             </Text>
+            {profileLoadError ? (
+              <Text
+                className="mine-profile-retry"
+                onClick={(event) => {
+                  event.stopPropagation();
+                  loadProfile();
+                }}
+              >
+                资料加载失败，点击重试
+              </Text>
+            ) : null}
           </View>
         </View>
       </View>