fix(auth): transfer WeChat id on merge; stop false phone prompts

Merge used to drop wxOpenId so OAuth created a new guest without phone every time. Now migrate WeChat identity, recover legacy merged openIds, return accountMerged and force page reload, and only soft-prompt when phone is truly unbound.

apps/mini-user/src/lib/api.ts

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro';
 import { ClientApp } from '@dukang/shared-types';
-import { goLogin } from './auth-nav';
+import { goLogin, forceReloadAfterAccountMerge } from './auth-nav';
 
 function resolveApiBase(): string {
   const origin =
@@ -111,7 +111,13 @@ export async function request<T = unknown>(path: string, options: ReqOptions = {
     const stillCurrent = !!token && getToken() === token;
     if (stillCurrent) {
       clearAuth();
-      if (!isOnLoginPage()) redirectToLogin();
+      const mergedMsg = body?.message || '';
+      if (/账号已合并/.test(mergedMsg)) {
+        // 合并后旧 JWT 失效：强制刷新，不引导「重新登录」
+        forceReloadAfterAccountMerge();
+      } else if (!isOnLoginPage()) {
+        redirectToLogin();
+      }
     }
     throw new Error(body?.message || '登录已过期，请重新登录');
   }
@@ -131,6 +137,8 @@ export function toast(title: string, icon: 'success' | 'error' | 'none' = 'none'
 export type SessionPayload = {
   accessToken: string;
   refreshToken?: string;
+  phoneVerified?: boolean;
+  accountMerged?: boolean;
 };
 
 export type UserProfile = {