merge: 同步 upstream/main 新功能到定制版本

- feat: Add slider verification code (bd67997)
- fix bug: Inventory cannot be zero (1f7a6ee)
- fix: resolve merge conflicts and lint errors
This commit is contained in:
2026-03-23 21:50:10 -07:00
parent 3806264343
commit d6616c5859
63 changed files with 3111 additions and 1130 deletions
@@ -2,10 +2,10 @@
import { useNavigate } from "@tanstack/react-router";
import {
resetPassword,
userLogin,
userRegister,
} from "@workspace/ui/services/common/auth";
adminLogin,
adminResetPassword,
} from "@workspace/ui/services/admin/auth";
import { userRegister } from "@workspace/ui/services/common/auth";
import type { ReactNode } from "react";
import { useState, useTransition } from "react";
import { useTranslation } from "react-i18next";
@@ -42,7 +42,7 @@ export default function EmailAuthForm() {
try {
switch (type) {
case "login": {
const login = await userLogin(params);
const login = await adminLogin(params);
toast.success(t("login.success", "Login successful!"));
onLogin(login.data.data?.token);
break;
@@ -54,7 +54,7 @@ export default function EmailAuthForm() {
break;
}
case "reset":
await resetPassword(params);
await adminResetPassword(params);
toast.success(t("reset.success", "Password reset successful!"));
setType("login");
break;