h5微信授权

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

@@ -11,10 +11,10 @@ import { bindWechatForUser } from '../../lib/wechat-auth';
 import { fetchUserProfile } from '../../lib/pay-wechat';
 import {
   fetchMiniWechatUserInfo,
-  getCachedWxProfile,
   mergeWxDisplayProfile,
 } from '../../lib/mini-wechat-profile';
 import { isLoggedIn, logout, request, toast, type UserProfile } from '../../lib/api';
+import { isWechatEnv } from '../../lib/weixin';
 
 const ORDER_SHORTCUTS = [
   { tab: 'pending_pay', icon: '付', label: '待付款' },
@@ -111,13 +111,39 @@ export default function MinePage() {
       toast('当前环境未开启微信授权');
       return;
     }
-    if (process.env.TARO_ENV !== 'weapp') {
-      toast('请在微信小程序中完成微信授权');
-      return;
-    }
 
     setBindingWx(true);
     try {
+      if (process.env.TARO_ENV === 'h5') {
+        if (!isWechatEnv()) {
+          toast('请在微信内打开后授权');
+          return;
+        }
+        const result = await bindWechatForUser();
+        if (!result.ok && 'redirecting' in result && result.redirecting) {
+          return;
+        }
+        if (!result.ok && 'needBindPhone' in result && result.needBindPhone) {
+          goLogin('/pages/mine/index', {
+            bindMode: '1',
+            wxSessionKey: result.wxSessionKey,
+          });
+          return;
+        }
+        if (result.ok) {
+          setProfile(
+            mergeWxDisplayProfile({
+              ...(result.profile ?? {}),
+              id: result.profile?.id ?? profile?.id ?? '',
+              hasWechat: true,
+            }),
+          );
+          loadProfile();
+          toast('微信授权成功', 'success');
+        }
+        return;
+      }
+
       let wxInfo = null;
       try {
         wxInfo = await fetchMiniWechatUserInfo();
@@ -127,7 +153,7 @@ export default function MinePage() {
       }
 
       const result = await bindWechatForUser(wxInfo);
-      if (!result.ok && result.needBindPhone) {
+      if (!result.ok && 'needBindPhone' in result && result.needBindPhone) {
         goLogin('/pages/mine/index', { bindMode: '1', wxSessionKey: result.wxSessionKey });
         return;
       }