feat(h5-auth): remember SMS sessions and simplify media access

Hide WeChat login for shop and partner users, keep verified sessions for seven days, and allow JSSDK camera or album access without an OpenID binding.

Co-authored-by: Cursor <cursoragent@cursor.com>

apps/h5-partner/src/components/AuthGate.tsx

@@ -1,5 +1,5 @@
 import { Navigate, useLocation } from 'react-router-dom';
-import { getPartnerProfile, hasPartnerWxSession } from '../lib/api';
+import { getPartnerProfile } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
 
@@ -18,10 +18,6 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
   }
 
   if (!authenticated && !PUBLIC_PATHS.has(location.pathname)) {
-    const profile = getPartnerProfile();
-    if (profile && hasPartnerWxSession() && profile.hasWechat) {
-      return <Navigate to="/login?quick=1" replace state={{ from: location }} />;
-    }
     return <Navigate to="/login" replace state={{ from: location }} />;
   }
 

apps/h5-partner/src/components/OssUploadField.tsx

@@ -1,17 +1,9 @@
 import { useEffect, useRef, useState } from 'react';
 import { uploadFileToOss, type OssMediaType } from '../lib/upload';
 import { enqueueUpload } from '../lib/upload-lock';
-import {
-  authorizePartnerWechat,
-  fetchClientConfig,
-  fetchPartnerProfile,
-  needsWechatAuth,
-  type PartnerProfile,
-} from '../lib/wechat-auth';
 import { formatChooseImageFailMessage } from '@dukang/weixin-sdk';
 import { isWechatEnv, weixinSdk } from '../lib/weixin';
 import { toastError } from '../lib/toast';
-import type { ClientRuntimeConfig } from '@dukang/shared-types';
 
 type OssUploadFieldProps = {
   value?: string;
@@ -22,7 +14,7 @@ type OssUploadFieldProps = {
   wide?: boolean;
   compact?: boolean;
   label?: string;
-  /** 父级已确认微信授权时可跳过检查 */
+  /** 兼容现有调用：选图不再依赖 openId 绑定 */
   wechatReady?: boolean;
   onWechatReadyChange?: (ready: boolean) => void;
 };
@@ -52,15 +44,11 @@ export default function OssUploadField({
   wide,
   compact,
   label,
-  wechatReady,
-  onWechatReadyChange,
 }: OssUploadFieldProps) {
   const inputRef = useRef<HTMLInputElement>(null);
   const [uploading, setUploading] = useState(false);
-  const [authorizing, setAuthorizing] = useState(false);
   const [error, setError] = useState('');
-  const [profile, setProfile] = useState<PartnerProfile | null>(null);
-  const [clientConfig, setClientConfig] = useState<ClientRuntimeConfig | null>(null);
+  const [showAlbumFallback, setShowAlbumFallback] = useState(false);
 
   function showUploadError(text: string) {
     setError(text);
@@ -72,32 +60,14 @@ export default function OssUploadField({
   const inWechat = isWechatEnv();
   const useWechatPicker =
     inWechat && (mediaType === 'IMAGE' || (mediaType === 'FILE' && acceptsImages(resolvedAccept)));
-  const needsAuth = useWechatPicker && needsWechatAuth(profile, clientConfig) && wechatReady !== true;
-  const onWechatReadyChangeRef = useRef(onWechatReadyChange);
-  onWechatReadyChangeRef.current = onWechatReadyChange;
 
   useEffect(() => {
     if (!useWechatPicker) return;
-    void fetchClientConfig()
-      .then(setClientConfig)
-      .catch(() => {
-        /* 未登录等场景由上传接口报错 */
-      });
-    if (wechatReady === true) return;
-    void fetchPartnerProfile()
-      .then(setProfile)
-      .catch(() => {
-        /* 未登录等场景由上传接口报错 */
-      });
-  }, [useWechatPicker, wechatReady]);
-
-  useEffect(() => {
-    if (!useWechatPicker || needsAuth) return;
     weixinSdk.reset();
     void weixinSdk.init().catch(() => {
       /* 点击上传时会再次初始化 */
     });
-  }, [useWechatPicker, needsAuth]);
+  }, [useWechatPicker]);
 
   async function persistUpload(file: File) {
     if (!file.size) {
@@ -125,24 +95,6 @@ export default function OssUploadField({
     }
   }
 
-  async function startWechatAuth() {
-    setAuthorizing(true);
-    setError('');
-    try {
-      const result = await authorizePartnerWechat();
-      if (result) {
-        const me = await fetchPartnerProfile();
-        setProfile(me);
-        if (me.hasWechat) onWechatReadyChangeRef.current?.(true);
-      }
-    } catch (e) {
-      const text = e instanceof Error ? e.message : '微信授权失败';
-      showUploadError(text);
-    } finally {
-      setAuthorizing(false);
-    }
-  }
-
   async function pickWechatImage() {
     setUploading(true);
     setError('');
@@ -161,29 +113,26 @@ export default function OssUploadField({
     } catch (e) {
       const msg = e instanceof Error ? e.message : '无法打开相册';
       if (/cancel/i.test(msg)) return;
-      showUploadError(formatWechatUploadError(e));
+      throw e;
     } finally {
       setUploading(false);
     }
   }
 
   async function pickFile() {
-    if (uploading || authorizing) return;
+    if (uploading) return;
     setError('');
 
-    if (useWechatPicker && needsAuth) {
-      const text = '请先完成微信授权后再上传照片';
-      showUploadError(text);
-      return;
-    }
-
     if (useWechatPicker) {
       try {
         await pickWechatImage();
       } catch (e) {
         const msg = e instanceof Error ? e.message : '无法打开相册';
         if (/cancel/i.test(msg)) return;
-        showUploadError(formatWechatUploadError(e));
+        const formatted = formatWechatUploadError(e);
+        setError(`${formatted}，可改从系统相册选择`);
+        setShowAlbumFallback(true);
+        inputRef.current?.click();
       }
       return;
     }
@@ -193,44 +142,31 @@ export default function OssUploadField({
 
   const isImage = mediaType === 'IMAGE' && value;
   const isFile = mediaType === 'FILE' && value;
-  const busy = uploading || authorizing;
+  const busy = uploading;
   const pickerLabel = label ?? (useWechatPicker ? '拍照 / 从相册选择' : '点击上传');
 
   const triggerProps = {
     type: 'button' as const,
-    disabled: busy || needsAuth,
+    disabled: busy,
     onClick: () => void pickFile(),
   };
 
   return (
     <div className="partner-oss-upload">
-      {needsAuth && (
-        <div className="partner-wechat-auth-hint" role="status">
-          <p className="body-md">上传照片需先完成微信授权绑定</p>
-          <button
-            type="button"
-            className="partner-btn-outline"
-            style={{ marginTop: 8, width: '100%' }}
-            disabled={authorizing}
-            onClick={() => void startWechatAuth()}
-          >
-            {authorizing ? '跳转授权中…' : '微信授权绑定'}
-          </button>
-        </div>
-      )}
-      {!useWechatPicker && (
-        <input
-          ref={inputRef}
-          type="file"
-          accept={resolvedAccept}
-          className="partner-oss-upload-input"
-          disabled={busy}
-          onChange={(e) => {
-            const file = e.target.files?.[0];
-            if (file) void uploadSelectedFile(file);
-          }}
-        />
-      )}
+      <input
+        ref={inputRef}
+        type="file"
+        accept={resolvedAccept}
+        className="partner-oss-upload-input"
+        disabled={busy}
+        onChange={(e) => {
+          const file = e.target.files?.[0];
+          if (file) {
+            setShowAlbumFallback(false);
+            void uploadSelectedFile(file);
+          }
+        }}
+      />
       {isImage ? (
         <button {...triggerProps} className={`partner-upload-preview${wide ? ' partner-upload-preview--wide' : ''}`}>
           <img src={value} alt={label ?? '已上传'} />
@@ -258,10 +194,21 @@ export default function OssUploadField({
             {busy ? 'hourglass_top' : 'add_a_photo'}
           </span>
           <span className="text-primary" style={{ fontWeight: 500 }}>
-            {uploading ? '上传中…' : needsAuth ? '请先微信授权' : pickerLabel}
+            {uploading ? '上传中…' : pickerLabel}
           </span>
         </button>
       )}
+      {showAlbumFallback && useWechatPicker && (
+        <button
+          type="button"
+          className="partner-btn-outline"
+          style={{ marginTop: 8, width: '100%' }}
+          disabled={busy}
+          onClick={() => inputRef.current?.click()}
+        >
+          从系统相册选择
+        </button>
+      )}
       {error && <p className="partner-form-error" role="alert">{error}</p>}
     </div>
   );

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

@@ -12,7 +12,7 @@ const PARTNER_PROFILE = 'partnerProfile';
 const SESSION_EXPIRES_AT = 'partnerSessionExpiresAt';
 export const PARTNER_WX_BOUND = 'partnerWxBound';
 
-/** 微信验证通过后的免登录时长 */
+/** 手机号或微信验证通过后的免登录时长 */
 export const PARTNER_SESSION_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 
 const AUTH_RECOVERY_EXEMPT_PATHS = [
@@ -77,7 +77,7 @@ export function isPartnerSessionExpired() {
 }
 
 export function touchPartnerSession() {
-  if (!hasPartnerWxSession()) return;
+  if (!localStorage.getItem(REFRESH_TOKEN)) return;
   localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
 }
 
@@ -90,11 +90,16 @@ export function saveAuth(data: PartnerSessionPayload) {
   }
 }
 
+/** 手机号验证成功后写入 7 天免验证码会话 */
+export function saveRememberedSession(data: PartnerSessionPayload) {
+  saveAuth(data);
+  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
+}
+
 /** 微信登录/绑定成功后写入 7 天免登录 session */
 export function saveWechatSession(data: PartnerSessionPayload) {
-  saveAuth(data);
+  saveRememberedSession(data);
   localStorage.setItem(PARTNER_WX_BOUND, '1');
-  localStorage.setItem(SESSION_EXPIRES_AT, String(Date.now() + PARTNER_SESSION_TTL_MS));
 }
 
 export function clearAuth(options?: { keepProfile?: boolean }) {

apps/h5-partner/src/pages/LoginPage.tsx

@@ -1,25 +1,14 @@
-import { useEffect, useRef, useState, type RefObject } from 'react';
-import { Link, useNavigate, useSearchParams } from 'react-router-dom';
-import { isWxAuthorizeEnabled } from '@dukang/shared-types';
-import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
+import { useRef, useState, type RefObject } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
 import {
   getLastPhone,
   getPartnerProfile,
-  hasPartnerWxSession,
   request,
-  saveAuth,
+  saveRememberedSession,
   type PartnerSessionPayload,
 } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { partnerHomePath } from '../lib/partnerAccess';
-import {
-  bindPartnerWechatAfterSmsLogin,
-  canPartnerUseWechatLogin,
-  fetchClientConfig,
-  loginPartnerWithWechat,
-  PARTNER_WECHAT_LOGIN_HINT,
-} from '../lib/wechat-auth';
-import { isWechatEnv } from '../lib/weixin';
 
 const REMEMBER_PHONE_KEY = 'partner_remember_phone';
 const REMEMBER_FLAG_KEY = 'partner_remember_account';
@@ -31,7 +20,7 @@ function AgreementCheckbox({
 }: {
   agreed: boolean;
   onChange: (next: boolean) => void;
-  inputRef?: RefObject<HTMLLabelElement | null>;
+  inputRef?: RefObject<HTMLLabelElement>;
 }) {
   return (
     <label className="partner-checkbox-row partner-checkbox-row--agreement" ref={inputRef}>
@@ -50,11 +39,6 @@ function AgreementCheckbox({
   );
 }
 
-function maskPhone(phone: string) {
-  if (phone.length < 7) return phone;
-  return `${phone.slice(0, 3)} **** ${phone.slice(-4)}`;
-}
-
 function loadRememberedPhone(): { phone: string; remember: boolean } {
   try {
     const remember = localStorage.getItem(REMEMBER_FLAG_KEY) === '1';
@@ -76,19 +60,9 @@ function formatPartnerError(e: unknown): string {
   return text;
 }
 
-function formatWechatError(e: unknown): string {
-  const text = e instanceof Error ? e.message : '微信登录失败';
-  if (text.includes('首次登录') || text.includes('手机验证码')) {
-    return '该微信尚未绑定合伙人账号，请先使用手机验证码登录，登录后将自动关联微信';
-  }
-  return text;
-}
-
 export default function LoginPage() {
   const navigate = useNavigate();
   const { applySession, refresh, account } = usePartnerSession();
-  const [params] = useSearchParams();
-  const quick = params.get('quick') === '1';
   const savedProfile = getPartnerProfile();
   const remembered = loadRememberedPhone();
   const [phone, setPhone] = useState(remembered.phone || getLastPhone());
@@ -96,22 +70,10 @@ export default function LoginPage() {
   const [rememberAccount, setRememberAccount] = useState(remembered.remember);
   const [agreed, setAgreed] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [wxLoading, setWxLoading] = useState(false);
   const [msg, setMsg] = useState('');
   const [codeCooldown, setCodeCooldown] = useState(0);
-  const [wxAuthorize, setWxAuthorize] = useState(false);
   const agreementRef = useRef<HTMLLabelElement>(null);
 
-  useEffect(() => {
-    fetchClientConfig()
-      .then((config) => setWxAuthorize(isWxAuthorizeEnabled(config)))
-      .catch(() => setWxAuthorize(false));
-  }, []);
-
-  const quickName = savedProfile?.name ?? '城市合伙人';
-  const quickCompany = savedProfile?.companyName ?? '';
-  const quickPhone = savedProfile?.phone || phone;
-
   function ensureAgreed() {
     if (!agreed) {
       setMsg('请先勾选并同意用户协议');
@@ -175,14 +137,9 @@ export default function LoginPage() {
         body: JSON.stringify({ phone, code }),
         silent: true,
       });
-      saveAuth(data);
+      saveRememberedSession(data);
       applySession(data);
       persistRememberAccount(phone);
-      if (isWechatEnv() && wxAuthorize) {
-        setMsg('登录成功，正在关联微信…');
-        await bindPartnerWechatAfterSmsLogin();
-        return;
-      }
       await finishLoginNavigate();
     } catch (e) {
       setMsg(formatPartnerError(e));
@@ -191,116 +148,6 @@ export default function LoginPage() {
     }
   }
 
-  async function wechatLogin() {
-    if (!ensureAgreed()) return;
-    setMsg('');
-    if (!isWechatEnv()) {
-      setMsg(WECHAT_INAPP_REQUIRED_MSG);
-      return;
-    }
-    const canUseWechat = await canPartnerUseWechatLogin({
-      profile: savedProfile,
-      phone,
-    });
-    if (!canUseWechat) {
-      setMsg(PARTNER_WECHAT_LOGIN_HINT);
-      return;
-    }
-    setWxLoading(true);
-    try {
-      const session = await loginPartnerWithWechat();
-      if (session) {
-        applySession(session);
-        await finishLoginNavigate();
-      }
-    } catch (e) {
-      setMsg(formatWechatError(e));
-    } finally {
-      setWxLoading(false);
-    }
-  }
-
-  if (quick) {
-    const canWechatQuick =
-      wxAuthorize &&
-      isWechatEnv() &&
-      hasPartnerWxSession() &&
-      !!savedProfile &&
-      savedProfile.hasWechat === true;
-
-    return (
-      <div className="partner-auth-page partner-auth-page--quick">
-        <header className="partner-auth-brand">
-          <div className="partner-quick-avatar" style={{ width: 120, height: 120, margin: '0 auto 16px' }}>
-            <span className="material-symbols-outlined" style={{ fontSize: 48 }}>wine_bar</span>
-          </div>
-          <h1 className="partner-auth-title" style={{ fontSize: 20 }}>杜康好客</h1>
-          <p className="partner-auth-subtitle" style={{ fontSize: 12, letterSpacing: '0.2em', textTransform: 'uppercase' }}>城市合伙人端</p>
-        </header>
-
-        <section className="partner-glass-card">
-          <div className="partner-quick-badge">已识别账号</div>
-          <div className="partner-quick-avatar">
-            <span className="material-symbols-outlined">person</span>
-          </div>
-          <div style={{ textAlign: 'center' }}>
-            <h2 className="headline-md">
-              {quickName}
-              {quickCompany ? (
-                <span className="text-muted body-md" style={{ fontWeight: 400 }}> ({quickCompany})</span>
-              ) : null}
-            </h2>
-            <p className="text-muted body-md" style={{ letterSpacing: '0.1em', marginTop: 4 }}>
-              {quickPhone ? maskPhone(quickPhone) : '暂无已保存账号'}
-            </p>
-          </div>
-        </section>
-
-        <nav style={{ width: '100%', maxWidth: 384, marginTop: 16 }}>
-          {msg && <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center', marginBottom: 12 }}>{msg}</p>}
-          <AgreementCheckbox
-            agreed={agreed}
-            onChange={setAgreed}
-            inputRef={agreementRef}
-          />
-          {canWechatQuick ? (
-            <button
-              type="button"
-              className="partner-btn-primary"
-              style={{ marginTop: 16 }}
-              disabled={wxLoading}
-              onClick={() => void wechatLogin()}
-            >
-              <span className="material-symbols-outlined">chat</span>
-              <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-            </button>
-          ) : (
-            <p className="partner-auth-msg" style={{ textAlign: 'center', marginTop: 12, marginBottom: 12 }}>
-              {wxAuthorize && !isWechatEnv()
-                ? '请在微信内打开以使用一键登录'
-                : '请使用验证码登录并绑定微信后，即可 7 天内免登录'}
-            </p>
-          )}
-          {!canWechatQuick && (
-            <Link to="/login" className="partner-btn-primary" style={{ display: 'block', textAlign: 'center', textDecoration: 'none', marginTop: 12 }}>
-              验证码登录
-            </Link>
-          )}
-          <Link to="/login" className="partner-btn-ghost" style={{ display: 'block', marginTop: 12 }}>切换账号</Link>
-        </nav>
-
-        <footer className="partner-auth-footer">
-          <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
-            <span className="material-symbols-outlined">verified_user</span>
-            <span className="label-md" style={{ fontSize: 10, letterSpacing: '0.1em', textTransform: 'uppercase' }}>
-              {canWechatQuick ? '微信验证 · 7 天内免登录' : 'Secured by Dukang Heritage'}
-            </span>
-          </div>
-        </footer>
-      </div>
-    );
-  }
-
   return (
     <div className="partner-auth-page">
       <div className="partner-auth-brand">
@@ -367,25 +214,12 @@ export default function LoginPage() {
             <span>{loading ? '登录中...' : '登录'}</span>
             {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
           </button>
-
-          {wxAuthorize && (
-            <>
-              <div className="partner-auth-divider"><span>其他登录方式</span></div>
-              <button type="button" className="partner-btn-wechat" onClick={() => void wechatLogin()} disabled={wxLoading}>
-                <svg viewBox="0 0 24 24" fill="#07C160" aria-hidden>
-                  <path d="M8.25 4.5C4.52 4.5 1.5 7.04 1.5 10.17c0 1.78.98 3.37 2.5 4.48l-.63 1.88 2.19-1.09c.84.24 1.74.38 2.69.38.25 0 .5 0 .75-.03-.16-.53-.25-1.09-.25-1.66 0-3.13 3.02-5.67 6.75-5.67.57 0 1.13.06 1.66.17C15.17 6.13 12 4.5 8.25 4.5zm10.5 6.33c-3.11 0-5.62 2.12-5.62 4.73 0 2.61 2.51 4.73 5.62 4.73.79 0 1.54-.14 2.24-.38l1.83.91-.53-1.57c1.27-.92 2.08-2.25 2.08-3.73 0-2.61-2.51-4.73-5.62-4.73z" />
-                </svg>
-                <span>{wxLoading ? '登录中...' : '微信一键登录'}</span>
-              </button>
-            </>
-          )}
+          <p className="partner-auth-msg" style={{ textAlign: 'center' }}>
+            手机号验证成功后，7 天内无需再次输入验证码
+          </p>
         </div>
       </main>
 
-      {hasPartnerWxSession() && savedProfile?.hasWechat && (
-        <Link to="/login?quick=1" className="partner-link">微信快捷登录</Link>
-      )}
-
       <footer className="partner-auth-footer">
         <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
           <span className="material-symbols-outlined">verified_user</span>