我的页面中的头像

apps/mini-user/src/lib/mini-wechat-profile.ts

@@ -1,7 +1,5 @@
 import Taro from '@tarojs/taro';
-import { request } from './api';
-
-import type { UserProfile } from './api';
+import { API_BASE, CLIENT_APP, getToken, request, type UserProfile } from './api';
 
 export type MiniWechatProfile = {
   nickname?: string;
@@ -32,26 +30,81 @@ export function getCachedWxProfile(): MiniWechatProfile | null {
 }
 
 export function isDefaultMiniNickname(nickname?: string | null): boolean {
-  if (!nickname || nickname === '访客') return true;
+  if (!nickname || nickname === '访客' || nickname === '微信用户' || nickname === '用户') return true;
   return /^用户\d{4}$/.test(nickname);
 }
 
+/** 是否缺少可展示的微信头像/昵称（需走 chooseAvatar + nickname 填写） */
+export function needsWxProfileFill(profile: UserProfile | null | undefined): boolean {
+  if (!profile) return true;
+  return !profile.avatarUrl || isDefaultMiniNickname(profile.nickname);
+}
+
 export function mergeWxDisplayProfile(profile: UserProfile): UserProfile {
-  if (!profile.hasWechat) return profile;
   const cached = getCachedWxProfile();
-  if (!cached) return profile;
+  if (!cached && !profile.hasWechat) return profile;
+  const nickname =
+    (!isDefaultMiniNickname(profile.nickname) ? profile.nickname : undefined) ||
+    cached?.nickname ||
+    profile.nickname ||
+    '微信用户';
   return {
     ...profile,
-    nickname:
-      cached.nickname ||
-      (!isDefaultMiniNickname(profile.nickname) ? profile.nickname : undefined) ||
-      profile.nickname ||
-      '微信用户',
-    avatarUrl: profile.avatarUrl || cached.avatarUrl || null,
+    nickname,
+    avatarUrl: profile.avatarUrl || cached?.avatarUrl || null,
   };
 }
 
-/** 用户点击触发：拉取微信昵称/头像 */
+/** 上传 chooseAvatar 临时文件到 OSS，返回永久 URL */
+export async function uploadAvatarTempFile(tempFilePath: string): Promise<string> {
+  const token = getToken();
+  if (!token) throw new Error('请先登录');
+
+  const res = await Taro.uploadFile({
+    url: `${API_BASE}/common/resources/upload`,
+    filePath: tempFilePath,
+    name: 'file',
+    formData: {
+      bizType: 'AVATAR',
+      mediaType: 'IMAGE',
+    },
+    header: {
+      Authorization: `Bearer ${token}`,
+      'X-Client-App': CLIENT_APP,
+    },
+  });
+
+  let body: { code?: number; message?: string; data?: { url?: string } } = {};
+  try {
+    body = JSON.parse(String(res.data || '{}')) as typeof body;
+  } catch {
+    throw new Error('头像上传响应异常');
+  }
+  if (res.statusCode === 401 || body.code === 401) {
+    throw new Error(body.message || '登录已过期，请重新登录');
+  }
+  if (res.statusCode >= 400 || body.code !== 0 || !body.data?.url) {
+    throw new Error(body.message || '头像上传失败');
+  }
+  return body.data.url;
+}
+
+export async function uploadMiniWechatProfile(info: MiniWechatProfile): Promise<UserProfile | null> {
+  if (!info.nickname && !info.avatarUrl) return null;
+  const updated = await request<UserProfile>('/auth/wechat/mini-profile', {
+    method: 'POST',
+    data: info,
+  });
+  cacheWxProfile({
+    nickname: updated?.nickname ?? info.nickname,
+    avatarUrl: updated?.avatarUrl ?? info.avatarUrl,
+  });
+  return updated;
+}
+
+/**
+ * @deprecated getUserProfile 已收回真实头像昵称，仅作兼容；小程序请用 chooseAvatar + nickname
+ */
 export async function fetchMiniWechatUserInfo(): Promise<MiniWechatProfile> {
   if (process.env.TARO_ENV !== 'weapp') {
     throw new Error('请在微信小程序中授权');
@@ -64,45 +117,22 @@ export async function fetchMiniWechatUserInfo(): Promise<MiniWechatProfile> {
   if (!info.nickname && !info.avatarUrl) {
     throw new Error('未获取到微信头像或昵称');
   }
+  // 灰色默认头像 / 「微信用户」视为无效，需走填写能力
+  if (info.nickname === '微信用户' || !info.avatarUrl) {
+    throw new Error('请使用头像昵称填写能力完善资料');
+  }
   cacheWxProfile(info);
   return info;
 }
 
-export async function uploadMiniWechatProfile(info: MiniWechatProfile): Promise<MiniWechatProfile | null> {
-  if (!info.nickname && !info.avatarUrl) return null;
-  try {
-    const updated = await request<{
-      nickname?: string | null;
-      avatarUrl?: string | null;
-    }>('/auth/wechat/mini-profile', {
-      method: 'POST',
-      data: info,
-    });
-    if (updated?.nickname || updated?.avatarUrl) {
-      cacheWxProfile({
-        nickname: updated.nickname ?? info.nickname,
-        avatarUrl: updated.avatarUrl ?? info.avatarUrl,
-      });
-    }
-    return info;
-  } catch {
-    return null;
-  }
-}
-
-/** 绑定后上报微信资料（优先使用已拉取的信息，避免重复弹窗） */
-export async function syncMiniWechatProfile(prefetched?: MiniWechatProfile | null): Promise<MiniWechatProfile | null> {
+/** 绑定后上报微信资料（优先使用已拉取的信息） */
+export async function syncMiniWechatProfile(
+  prefetched?: MiniWechatProfile | null,
+): Promise<MiniWechatProfile | null> {
   if (process.env.TARO_ENV !== 'weapp') return null;
-
-  let info = prefetched ?? null;
-  if (!info) {
-    try {
-      info = await fetchMiniWechatUserInfo();
-    } catch {
-      return getCachedWxProfile();
-    }
+  if (!prefetched?.nickname && !prefetched?.avatarUrl) {
+    return getCachedWxProfile();
   }
-
-  await uploadMiniWechatProfile(info);
-  return info;
+  await uploadMiniWechatProfile(prefetched);
+  return prefetched;
 }