fix(h5-partner): resolve merge conflicts for auth and sub-accounts

Merge partner session model (AuthGate, ensureSession, WeChat OAuth in Context) with sub-account routing, admin partner-account tree CRUD, upload lock, and partner staff flows.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-10 11:24:48 +08:00
20 changed files with 378 additions and 264 deletions
+4 -14
View File
@@ -18,7 +18,6 @@ import {
loginPartnerWithWechat,
} from '../lib/wechat-auth';
import { isWechatEnv } from '../lib/weixin';
import { toastError } from '../lib/toast';
const REMEMBER_PHONE_KEY = 'partner_remember_phone';
const REMEMBER_FLAG_KEY = 'partner_remember_account';
@@ -86,9 +85,7 @@ export default function LoginPage() {
function ensureAgreed() {
if (!agreed) {
const text = '请先勾选并同意用户协议';
setMsg(text);
toastError(text);
setMsg('请先勾选并同意用户协议');
return false;
}
return true;
@@ -129,9 +126,7 @@ export default function LoginPage() {
});
}, 1000);
} catch (e) {
const text = formatPartnerError(e);
setMsg(text);
toastError(text);
setMsg(formatPartnerError(e));
}
}
@@ -160,9 +155,7 @@ export default function LoginPage() {
}
await finishLoginNavigate();
} catch (e) {
const text = formatPartnerError(e);
setMsg(text);
toastError(text);
setMsg(formatPartnerError(e));
} finally {
setLoading(false);
}
@@ -173,7 +166,6 @@ export default function LoginPage() {
setMsg('');
if (!isWechatEnv()) {
setMsg(WECHAT_INAPP_REQUIRED_MSG);
toastError(WECHAT_INAPP_REQUIRED_MSG);
return;
}
setWxLoading(true);
@@ -184,9 +176,7 @@ export default function LoginPage() {
await finishLoginNavigate();
}
} catch (e) {
const text = formatWechatError(e);
setMsg(text);
toastError(text);
setMsg(formatWechatError(e));
} finally {
setWxLoading(false);
}