用户端小程序修改

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

@@ -13,7 +13,13 @@ import { BRAND_LOGO_WIDE_URL } from '@dukang/shared-types';
 import { finishLoginNavigate } from '../../lib/auth-nav';
 import { bindWechatForUser } from '../../lib/wechat-auth';
 import { fetchUserProfile } from '../../lib/pay-wechat';
-import { saveUserPhone } from '../../lib/user-phone';
+import { saveUserPhone, resolveDefaultUserPhone } from '../../lib/user-phone';
+import {
+  fetchMiniWechatUserInfo,
+  getCachedWxProfile,
+  syncMiniWechatProfile,
+  type MiniWechatProfile,
+} from '../../lib/mini-wechat-profile';
 import { isLoggedIn, request, saveAuth, toast, type SessionPayload } from '../../lib/api';
 import { loginWithWechat } from '../../lib/wechat-auth';
 
@@ -91,18 +97,28 @@ export default function LoginPage() {
     return true;
   }
 
-  function applySessionAndLeave(data: SessionPayload | WechatLoginResult, phone?: string) {
+  function applySessionAndLeave(
+    data: SessionPayload | WechatLoginResult,
+    phone?: string,
+    wxInfo?: MiniWechatProfile | null,
+  ) {
     if (!data.accessToken) return;
     if (phone) saveUserPhone(phone);
     saveAuth({
       accessToken: data.accessToken,
       refreshToken: data.refreshToken,
     });
+    void syncMiniWechatProfile(wxInfo ?? getCachedWxProfile());
+    if (!phone) {
+      void fetchUserProfile()
+        .then((me) => resolveDefaultUserPhone(me))
+        .catch(() => {});
+    }
     toast('登录成功', 'success');
     finishLoginNavigate(returnTo);
   }
 
-  function handleWechatLoginResult(result: WechatLoginResult) {
+  function handleWechatLoginResult(result: WechatLoginResult, wxInfo?: MiniWechatProfile | null) {
     if (result.needBindPhone && result.wxSessionKey) {
       setBindMode(true);
       setWxSessionKey(result.wxSessionKey);
@@ -111,7 +127,7 @@ export default function LoginPage() {
       return;
     }
     if (result.accessToken) {
-      applySessionAndLeave(result);
+      applySessionAndLeave(result, undefined, wxInfo);
       return;
     }
     setMsg('微信登录未完成，请重试或使用手机号登录');
@@ -196,8 +212,18 @@ export default function LoginPage() {
     setSentHint('');
     setWxLoading(true);
     try {
+      let wxInfo: MiniWechatProfile | null = null;
+      if (process.env.TARO_ENV === 'weapp') {
+        try {
+          wxInfo = await fetchMiniWechatUserInfo();
+        } catch (e) {
+          toast(e instanceof Error ? e.message : '需要授权微信头像和昵称');
+          return;
+        }
+      }
+
       if (completeMode === 'wechat' && isLoggedIn()) {
-        const result = await bindWechatForUser();
+        const result = await bindWechatForUser(wxInfo);
         if (!result.ok && result.needBindPhone) {
           setBindMode(true);
           setWxSessionKey(result.wxSessionKey);
@@ -206,6 +232,7 @@ export default function LoginPage() {
           return;
         }
         if (result.ok) {
+          await syncMiniWechatProfile(wxInfo);
           toast('微信授权成功', 'success');
           finishLoginNavigate(returnTo);
           return;
@@ -213,7 +240,7 @@ export default function LoginPage() {
         return;
       }
       const result = await loginWithWechat();
-      handleWechatLoginResult(result);
+      handleWechatLoginResult(result, wxInfo);
     } catch (e) {
       const raw = e instanceof Error ? e.message : '微信登录失败';
       const hint = /invalid code/i.test(raw)