From 7dd8a6662bf24138ec8d9d8e9b011d0873c27fa4 Mon Sep 17 00:00:00 2001
From: jacy-dukang <moonjie444@163.com>
Date: Tue, 7 Jul 2026 14:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=E7=AB=AF=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/h5-partner/src/pages/LoginPage.tsx | 187 +++++++++---------------
 scripts/test-partner-auth.mjs           |   8 +-
 2 files changed, 70 insertions(+), 125 deletions(-)

diff --git a/apps/h5-partner/src/pages/LoginPage.tsx b/apps/h5-partner/src/pages/LoginPage.tsx
index 9628b3a..07043eb 100644
--- a/apps/h5-partner/src/pages/LoginPage.tsx
+++ b/apps/h5-partner/src/pages/LoginPage.tsx
@@ -28,6 +28,9 @@ function formatPartnerError(e: unknown): string {
   if (text.includes('合伙人账号不存在') || text.includes('未找到合伙人账号')) {
     return '未找到合伙人账号';
   }
+  if (text.includes('合伙人账号已停用')) {
+    return '合伙人账号已停用';
+  }
   return text;
 }
 
@@ -36,14 +39,8 @@ export default function LoginPage() {
   const [params] = useSearchParams();
   const quick = params.get('quick') === '1';
   const remembered = loadRememberedPhone();
-  const [step, setStep] = useState<'phone' | 'code'>('phone');
   const [phone, setPhone] = useState(remembered.phone || '13700000001');
-  const [confirmedProfile, setConfirmedProfile] = useState<{
-    maskedPhone: string;
-    name?: string;
-    companyName?: string;
-  } | null>(null);
-  const [code, setCode] = useState('123456');
+  const [code, setCode] = useState('');
   const [rememberAccount, setRememberAccount] = useState(remembered.remember);
   const [agreed, setAgreed] = useState(true);
   const [loading, setLoading] = useState(false);
@@ -91,37 +88,6 @@ export default function LoginPage() {
     }
   }
 
-  function backToPhoneStep() {
-    setStep('phone');
-    setConfirmedProfile(null);
-    setCode('');
-    setMsg('');
-    setCodeCooldown(0);
-  }
-
-  async function confirmPhone() {
-    if (!ensureAgreed()) return;
-    setLoading(true);
-    setMsg('');
-    try {
-      const data = await request<{ ok: boolean; maskedPhone: string; name?: string; companyName?: string }>(
-        'PARTNER_H5',
-        '/partner/auth/phone/check',
-        { method: 'POST', body: JSON.stringify({ phone }) },
-      );
-      setConfirmedProfile({
-        maskedPhone: data.maskedPhone,
-        name: data.name,
-        companyName: data.companyName,
-      });
-      setStep('code');
-    } catch (e) {
-      setMsg(formatPartnerError(e));
-    } finally {
-      setLoading(false);
-    }
-  }
-
   async function sendCode() {
     if (!ensureAgreed()) return;
     setMsg('');
@@ -130,7 +96,7 @@ export default function LoginPage() {
         method: 'POST',
         body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
       });
-      setMsg('验证码已发送（Mock: 123456）');
+      setMsg('验证码已发送');
       setCodeCooldown(60);
       const timer = setInterval(() => {
         setCodeCooldown((s) => {
@@ -146,11 +112,17 @@ export default function LoginPage() {
     }
   }
 
-  async function login() {
-    if (!ensureAgreed()) return;
+  async function login(options?: { quick?: boolean }) {
+    if (!options?.quick && !ensureAgreed()) return;
     setLoading(true);
     setMsg('');
     try {
+      if (options?.quick) {
+        await request('PARTNER_H5', '/partner/auth/sms/send', {
+          method: 'POST',
+          body: JSON.stringify({ phone, scene: 'PARTNER_LOGIN' }),
+        });
+      }
       const data = await request<{ accessToken: string }>('PARTNER_H5', '/partner/auth/login/sms', {
         method: 'POST',
         body: JSON.stringify({ phone, code }),
@@ -214,7 +186,7 @@ export default function LoginPage() {
 
         <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>}
-          <button type="button" className="partner-btn-primary" onClick={login} disabled={loading}>
+          <button type="button" className="partner-btn-primary" onClick={() => void login({ quick: true })} disabled={loading}>
             <span>{loading ? '登录中...' : '一键登录'}</span>
             {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
           </button>
@@ -244,83 +216,62 @@ export default function LoginPage() {
       <main className="partner-auth-card">
         <h2 className="partner-auth-card-title">城市合伙人登录</h2>
         <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
-          {step === 'phone' ? (
-            <>
-              <div className="partner-input-wrap">
-                <span className="material-symbols-outlined partner-input-icon">smartphone</span>
-                <input
-                  className="partner-input"
-                  type="tel"
-                  placeholder="请输入手机号"
-                  value={phone}
-                  onChange={(e) => {
-                    setPhone(e.target.value);
-                    setMsg('');
-                  }}
-                />
-              </div>
-              <button type="button" className="partner-btn-primary" onClick={confirmPhone} disabled={loading}>
-                <span>{loading ? '校验中...' : '下一步'}</span>
-                {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
-              </button>
-            </>
-          ) : (
-            <>
-              <div className="partner-glass-card" style={{ padding: '12px 16px' }}>
-                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12 }}>
-                  <div>
-                    <div style={{ fontWeight: 600 }}>
-                      {confirmedProfile?.name || '合伙人账号'}
-                      {confirmedProfile?.companyName ? (
-                        <span className="text-muted body-md" style={{ fontWeight: 400, marginLeft: 8 }}>
-                          {confirmedProfile.companyName}
-                        </span>
-                      ) : null}
-                    </div>
-                    <div className="text-muted body-md" style={{ marginTop: 4 }}>
-                      {confirmedProfile?.maskedPhone || phone}
-                    </div>
-                  </div>
-                  <button type="button" className="partner-link" onClick={backToPhoneStep} style={{ flexShrink: 0 }}>
-                    修改
-                  </button>
-                </div>
-              </div>
-              <div className="partner-input-row">
-                <div className="partner-input-wrap">
-                  <span className="material-symbols-outlined partner-input-icon">shield</span>
-                  <input className="partner-input" type="text" placeholder="验证码" value={code} onChange={(e) => setCode(e.target.value)} />
-                </div>
-                <button type="button" className="partner-code-btn" onClick={sendCode} disabled={codeCooldown > 0}>
-                  {codeCooldown > 0 ? `${codeCooldown}s 后重发` : '获取验证码'}
-                </button>
-              </div>
-              <label className="partner-remember-row">
-                <input
-                  type="checkbox"
-                  checked={rememberAccount}
-                  onChange={(e) => setRememberAccount(e.target.checked)}
-                />
-                <span>记住账号</span>
-              </label>
-              <button type="button" className="partner-btn-primary" onClick={login} disabled={loading}>
-                <span>{loading ? '登录中...' : '登录'}</span>
-                {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
-              </button>
-            </>
-          )}
+          <div className="partner-input-wrap">
+            <span className="material-symbols-outlined partner-input-icon">smartphone</span>
+            <input
+              className="partner-input"
+              type="tel"
+              maxLength={11}
+              placeholder="请输入手机号"
+              value={phone}
+              onChange={(e) => {
+                setPhone(e.target.value);
+                setMsg('');
+              }}
+            />
+          </div>
+
+          <div className="partner-input-row">
+            <div className="partner-input-wrap">
+              <span className="material-symbols-outlined partner-input-icon">shield</span>
+              <input
+                className="partner-input"
+                type="text"
+                maxLength={6}
+                placeholder="验证码"
+                value={code}
+                onChange={(e) => setCode(e.target.value)}
+              />
+            </div>
+            <button type="button" className="partner-code-btn" onClick={sendCode} disabled={codeCooldown > 0}>
+              {codeCooldown > 0 ? `${codeCooldown}s` : '获取验证码'}
+            </button>
+          </div>
+
+          <label className="partner-remember-row">
+            <input
+              type="checkbox"
+              checked={rememberAccount}
+              onChange={(e) => setRememberAccount(e.target.checked)}
+            />
+            <span>记住账号</span>
+          </label>
+
           {msg && <p className="partner-auth-msg" style={{ color: 'var(--color-error, #d33)', fontSize: 13, textAlign: 'center' }}>{msg}</p>}
-          {step === 'phone' && (
-            <>
-              <div className="partner-auth-divider"><span>其他登录方式</span></div>
-              <button type="button" className="partner-btn-wechat" onClick={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>
-            </>
-          )}
+
+          <button type="button" className="partner-btn-primary" onClick={() => void login()} disabled={loading}>
+            <span>{loading ? '登录中...' : '登录'}</span>
+            {!loading && <span className="material-symbols-outlined">arrow_forward</span>}
+          </button>
+
+          <div className="partner-auth-divider"><span>其他登录方式</span></div>
+          <button type="button" className="partner-btn-wechat" onClick={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>
+
           <label className="partner-checkbox-row">
             <input type="checkbox" checked={agreed} onChange={(e) => setAgreed(e.target.checked)} />
             <span>
diff --git a/scripts/test-partner-auth.mjs b/scripts/test-partner-auth.mjs
index c09cd1d..25ba9ed 100644
--- a/scripts/test-partner-auth.mjs
+++ b/scripts/test-partner-auth.mjs
@@ -45,13 +45,7 @@ async function main() {
   });
   if (!unknownSms.includes('未找到合伙人账号')) throw new Error(`unexpected: ${unknownSms}`);
 
-  console.log('3. PARTNER phone/check + login bound phone');
-  const check = await req('PARTNER_H5', '/partner/auth/phone/check', {
-    method: 'POST',
-    body: JSON.stringify({ phone: '13700000001' }),
-  });
-  if (!check.ok || !check.maskedPhone) throw new Error('phone check failed');
-
+  console.log('3. PARTNER sms/login bound phone');
   const login = await loginWithSms(
     'PARTNER_H5',
     '13700000001',