HI-VPN/hi-frontend
4
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

修复(#122): 合并促销价档位提交到测试环境
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
shanshanzhong
2026-05-29 04:15:40 -07:00
parent c46944aae1
commit 23f51a1ef4
14 changed files with 369 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin/src/sections/promo/index.tsx
+23 -12
View File
@@ -46,7 +46,7 @@ type RuleFilters = {
};
type PriceFilters = {
rule_id?: string;
promo_rule_id?: string;
subscribe_id?: string;
};
@@ -301,12 +301,13 @@ export default function PromoPage() {
}}
columns={[
{
accessorKey: "rule_id",
accessorKey: "promo_rule_id",
header: t("rule", "Rule"),
cell: ({ row }) =>
row.original.rule_id
? rules.find((rule) => rule.id === row.original.rule_id)
?.name || `#${row.original.rule_id}`
row.original.promo_rule_id
? rules.find(
(rule) => rule.id === row.original.promo_rule_id
)?.name || `#${row.original.promo_rule_id}`
: "--",
},
{
@@ -316,6 +317,11 @@ export default function PromoPage() {
row.original.subscribe_name ||
getSubscribeName(row.original.subscribe_id),
},
{
accessorKey: "quantity",
header: t("quantity", "Quantity"),
cell: ({ row }) => row.original.quantity || "--",
},
{
accessorKey: "unit_price",
header: t("unitPrice", "Unit Price"),
@@ -361,7 +367,7 @@ export default function PromoPage() {
}}
params={[
{
key: "rule_id",
key: "promo_rule_id",
placeholder: t("rule", "Rule"),
options: rules.map((rule) => ({
label: rule.name,
@@ -382,7 +388,7 @@ export default function PromoPage() {
request={async (pagination, filters) => {
const { data } = await getPromoPriceList({
...pagination,
rule_id: parseOptionalNumber(filters.rule_id),
promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
subscribe_id: parseOptionalNumber(filters.subscribe_id),
});
return {
@@ -398,13 +404,13 @@ export default function PromoPage() {
action={usageRef}
columns={[
{
accessorKey: "rule_id",
accessorKey: "promo_rule_id",
header: t("rule", "Rule"),
cell: ({ row }) =>
row.original.rule_name ||
rules.find((rule) => rule.id === row.original.rule_id)
rules.find((rule) => rule.id === row.original.promo_rule_id)
?.name ||
`#${row.original.rule_id}`,
`#${row.original.promo_rule_id}`,
},
{
accessorKey: "user_id",
@@ -418,6 +424,11 @@ export default function PromoPage() {
row.original.subscribe_name ||
getSubscribeName(row.original.subscribe_id),
},
{
accessorKey: "quantity",
header: t("quantity", "Quantity"),
cell: ({ row }) => row.original.quantity || "--",
},
{
accessorKey: "order_no",
header: t("orderNo", "Order No."),
@@ -447,7 +458,7 @@ export default function PromoPage() {
}
params={[
{
key: "rule_id",
key: "promo_rule_id",
placeholder: t("rule", "Rule"),
options: rules.map((rule) => ({
label: rule.name,
@@ -470,7 +481,7 @@ export default function PromoPage() {
request={async (pagination, filters) => {
const { data } = await getPromoUsageList({
...pagination,
rule_id: parseOptionalNumber(filters.rule_id),
promo_rule_id: parseOptionalNumber(filters.promo_rule_id),
subscribe_id: parseOptionalNumber(filters.subscribe_id),
user_id: parseOptionalNumber(filters.user_id),
order_no: filters.order_no?.trim() || undefined,