h5微信授权

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

@@ -11,7 +11,10 @@ import PageShell from '../../components/PageShell';
 import WechatLoginButton from '../../components/WechatLoginButton';
 import { BRAND_LOGO_WIDE_URL } from '@dukang/shared-types';
 import { finishLoginNavigate } from '../../lib/auth-nav';
-import { bindWechatForUser } from '../../lib/wechat-auth';
+import {
+  bindWechatForUser,
+  loginWithWechat,
+} from '../../lib/wechat-auth';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import { saveUserPhone, resolveDefaultUserPhone } from '../../lib/user-phone';
 import {
@@ -21,7 +24,6 @@ import {
   type MiniWechatProfile,
 } from '../../lib/mini-wechat-profile';
 import { isLoggedIn, request, saveAuth, toast, type SessionPayload } from '../../lib/api';
-import { loginWithWechat } from '../../lib/wechat-auth';
 
 function normalizePhone(value: string) {
   return value.replace(/\D/g, '').slice(0, 11);
@@ -224,7 +226,10 @@ export default function LoginPage() {
 
       if (completeMode === 'wechat' && isLoggedIn()) {
         const result = await bindWechatForUser(wxInfo);
-        if (!result.ok && result.needBindPhone) {
+        if (!result.ok && 'redirecting' in result && result.redirecting) {
+          return;
+        }
+        if (!result.ok && 'needBindPhone' in result && result.needBindPhone) {
           setBindMode(true);
           setWxSessionKey(result.wxSessionKey);
           setCompleteMode('phone');
@@ -240,11 +245,13 @@ export default function LoginPage() {
         return;
       }
       const result = await loginWithWechat();
-      handleWechatLoginResult(result, wxInfo);
+      if (result) handleWechatLoginResult(result, wxInfo);
     } catch (e) {
       const raw = e instanceof Error ? e.message : '微信登录失败';
       const hint = /invalid code/i.test(raw)
-        ? '微信 code 无效：请确认后端 WX_MINI_APP_ID 与小程序 appid 一致，或本地联调使用 MOCK_WECHAT'
+        ? process.env.TARO_ENV === 'weapp'
+          ? '微信 code 无效：请确认后端 WX_MINI_APP_ID 与小程序 appid 一致，或本地联调使用 MOCK_WECHAT'
+          : '微信授权失败：请确认公众号 WX_APP_ID / 网页授权域名配置正确'
         : raw;
       setMsg(hint);
     } finally {