Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy

apps/h5-partner/src/lib/api.ts

@@ -9,7 +9,14 @@ export async function request<T>(clientApp: string, path: string, options: Reque
   };
   if (token) headers.Authorization = `Bearer ${token}`;
   const res = await fetch(`${apiBase}${path}`, { ...options, headers });
-  const json = await res.json();
+  const json = await res.json().catch(() => ({ code: res.status, message: '网络异常' }));
+  if (res.status === 401 || json.code === 401) {
+    clearAuth();
+    if (typeof window !== 'undefined' && !window.location.pathname.startsWith('/login')) {
+      window.location.href = '/login';
+    }
+    throw new Error(json.message || '登录已过期，请重新登录');
+  }
   if (json.code !== 0) throw new Error(json.message || '请求失败');
   return json.data as T;
 }

apps/h5-partner/src/lib/wechat-auth.ts

@@ -1,4 +1,5 @@
 import type { WechatLoginResult } from '@dukang/shared-types';
+import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import { isWechatEnv, weixinSdk } from './weixin';
 import { request, saveAuth } from './api';
 
@@ -19,20 +20,46 @@ export function needsWechatAuth(profile: PartnerProfile | null): boolean {
   return isWechatEnv() && !!profile && !profile.hasWechat;
 }
 
-export function savePartnerWechatAuth(result: WechatLoginResult): boolean {
+/** 处理微信登录/绑定结果，返回是否已拿到 token 可进入首页 */
+export function handlePartnerWechatLoginResult(result: WechatLoginResult): boolean {
   if (!result.accessToken) return false;
   saveAuth({ accessToken: result.accessToken });
   return true;
 }
 
-export async function authorizePartnerWechat(): Promise<WechatLoginResult | void> {
-  if (!isWechatEnv()) {
-    throw new Error('请在微信内打开以完成授权');
-  }
-  return weixinSdk.login();
-}
-
 export async function handlePartnerWechatCallback(): Promise<WechatLoginResult | null> {
   if (!isWechatEnv()) return null;
   return weixinSdk.handleOAuthCallback();
 }
+
+/**
+ * 微信授权登录（对齐 C 端：仅微信内置浏览器走 OAuth）。
+ * 返回 true = 已登录；void = 已跳转授权页等待回调。
+ */
+export async function loginPartnerWithWechat(): Promise<boolean | void> {
+  if (!isWechatEnv()) {
+    throw new Error(WECHAT_INAPP_REQUIRED_MSG);
+  }
+  const result = await weixinSdk.login();
+  if (result) return handlePartnerWechatLoginResult(result);
+}
+
+/**
+ * 短信登录成功后于微信内自动发起 OAuth，将 openId 绑定到当前合伙人账号（便于同一微信后续免登）。
+ */
+export async function bindPartnerWechatAfterSmsLogin(): Promise<void> {
+  if (!isWechatEnv()) return;
+  await weixinSdk.login();
+}
+
+export async function authorizePartnerWechat(): Promise<WechatLoginResult | void> {
+  if (!isWechatEnv()) {
+    throw new Error(WECHAT_INAPP_REQUIRED_MSG);
+  }
+  return weixinSdk.login();
+}
+
+/** @deprecated 使用 handlePartnerWechatLoginResult */
+export function savePartnerWechatAuth(result: WechatLoginResult): boolean {
+  return handlePartnerWechatLoginResult(result);
+}