feat(ops): v4.0.2 活动图模板、合伙人选择持久化与用户管理主图
HQ 上传底图与码栏;合伙人单选写入 partner_account.activity_poster_id,用户管理下次登录仍显示同一张图。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -25,6 +25,7 @@ import FulfillmentProvidersPage from './pages/FulfillmentProvidersPage';
|
||||
import StoreMediaPage from './pages/StoreMediaPage';
|
||||
import StoreCategoriesPage from './pages/StoreCategoriesPage';
|
||||
import PromoCodesPage from './pages/PromoCodesPage';
|
||||
import ActivityPostersPage from './pages/ActivityPostersPage';
|
||||
import PromoCodeDetailLayout from './pages/promo/PromoCodeDetailLayout';
|
||||
import PromoCodeDetailPage from './pages/promo/PromoCodeDetailPage';
|
||||
import PromoCodeUsersPage from './pages/promo/PromoCodeUsersPage';
|
||||
@@ -86,6 +87,7 @@ export default function App() {
|
||||
<Route path="/wechat-bindings" element={<WechatBindingsPage />} />
|
||||
<Route path="/orders" element={<OrdersPage />} />
|
||||
<Route path="/promo-codes" element={<PromoCodesPage />} />
|
||||
<Route path="/activity-posters" element={<ActivityPostersPage />} />
|
||||
<Route path="/promo-codes/:id" element={<PromoCodeDetailLayout />}>
|
||||
<Route index element={<PromoCodeDetailPage />} />
|
||||
<Route path="users" element={<PromoCodeUsersPage />} />
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
import { useCallback, useRef } from 'react';
|
||||
import { DEFAULT_ACTIVITY_POSTER_QR_SLOT, type ActivityPosterQrSlot } from '@dukang/shared-types';
|
||||
|
||||
type Props = {
|
||||
imageUrl?: string;
|
||||
value?: ActivityPosterQrSlot;
|
||||
onChange?: (slot: ActivityPosterQrSlot) => void;
|
||||
};
|
||||
|
||||
export default function ActivityPosterQrSlotEditor({ imageUrl, value, onChange }: Props) {
|
||||
const boxRef = useRef<HTMLDivElement>(null);
|
||||
const dragRef = useRef<{
|
||||
mode: 'move' | 'resize';
|
||||
startX: number;
|
||||
startY: number;
|
||||
start: ActivityPosterQrSlot;
|
||||
} | null>(null);
|
||||
const slot = value ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT;
|
||||
|
||||
const apply = useCallback((next: ActivityPosterQrSlot) => {
|
||||
const size = Math.min(50, Math.max(5, next.qrSizePct));
|
||||
const box = boxRef.current;
|
||||
const ratio = box && box.clientHeight > 0 ? box.clientWidth / box.clientHeight : 1;
|
||||
const heightPct = size * ratio;
|
||||
const x = Math.min(100 - size, Math.max(0, next.qrXPct));
|
||||
const y = Math.min(Math.max(0, 100 - heightPct), Math.max(0, next.qrYPct));
|
||||
onChange?.({
|
||||
qrXPct: Number(x.toFixed(2)),
|
||||
qrYPct: Number(y.toFixed(2)),
|
||||
qrSizePct: Number(size.toFixed(2)),
|
||||
});
|
||||
}, [onChange]);
|
||||
|
||||
function onPointerDown(mode: 'move' | 'resize', e: React.PointerEvent) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
(e.currentTarget as HTMLElement).setPointerCapture(e.pointerId);
|
||||
dragRef.current = { mode, startX: e.clientX, startY: e.clientY, start: { ...slot } };
|
||||
}
|
||||
|
||||
function onPointerMove(e: React.PointerEvent) {
|
||||
const drag = dragRef.current;
|
||||
const box = boxRef.current;
|
||||
if (!drag || !box) return;
|
||||
const dx = ((e.clientX - drag.startX) / box.clientWidth) * 100;
|
||||
const dy = ((e.clientY - drag.startY) / box.clientHeight) * 100;
|
||||
if (drag.mode === 'move') {
|
||||
apply({
|
||||
...drag.start,
|
||||
qrXPct: drag.start.qrXPct + dx,
|
||||
qrYPct: drag.start.qrYPct + dy,
|
||||
});
|
||||
} else {
|
||||
apply({ ...drag.start, qrSizePct: drag.start.qrSizePct + dx });
|
||||
}
|
||||
}
|
||||
|
||||
function endDrag() {
|
||||
dragRef.current = null;
|
||||
}
|
||||
|
||||
if (!imageUrl) {
|
||||
return <div style={{ color: 'rgba(0,0,0,0.45)' }}>请先上传活动图,再拖拽定位方形码栏</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div
|
||||
ref={boxRef}
|
||||
style={{ position: 'relative', width: '100%', maxWidth: 420, userSelect: 'none', touchAction: 'none' }}
|
||||
onPointerMove={onPointerMove}
|
||||
onPointerUp={endDrag}
|
||||
onPointerCancel={endDrag}
|
||||
>
|
||||
<img src={imageUrl} alt="活动图预览" style={{ width: '100%', display: 'block' }} draggable={false} />
|
||||
<div
|
||||
style={{
|
||||
position: 'absolute',
|
||||
left: `${slot.qrXPct}%`,
|
||||
top: `${slot.qrYPct}%`,
|
||||
width: `${slot.qrSizePct}%`,
|
||||
aspectRatio: '1',
|
||||
border: '2px dashed #1677ff',
|
||||
background: 'rgba(22,119,255,0.14)',
|
||||
cursor: 'move',
|
||||
boxSizing: 'border-box',
|
||||
}}
|
||||
onPointerDown={(e) => onPointerDown('move', e)}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
position: 'absolute',
|
||||
right: -6,
|
||||
bottom: -6,
|
||||
width: 14,
|
||||
height: 14,
|
||||
background: '#1677ff',
|
||||
borderRadius: 2,
|
||||
cursor: 'nwse-resize',
|
||||
}}
|
||||
onPointerDown={(e) => onPointerDown('resize', e)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ marginTop: 8, color: 'rgba(0,0,0,0.45)', fontSize: 12 }}>
|
||||
拖拽移动码栏,拉右下角调整大小(边长相对图宽 {slot.qrSizePct}%)
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
SettingOutlined,
|
||||
AccountBookOutlined,
|
||||
ProjectOutlined,
|
||||
PictureOutlined,
|
||||
} from '@ant-design/icons';
|
||||
import {
|
||||
hasAnySystemSettingsPermission,
|
||||
@@ -118,6 +119,7 @@ const MENU_ITEMS: MenuProps['items'] = [
|
||||
},
|
||||
{ key: '/invoices', icon: <FileTextOutlined />, label: '发票' },
|
||||
{ key: '/promo-codes', icon: <GiftOutlined />, label: '推广码' },
|
||||
{ key: '/activity-posters', icon: <PictureOutlined />, label: '活动图' },
|
||||
{ key: '/wechat-bindings', icon: <UserOutlined />, label: '微信绑定' },
|
||||
{
|
||||
key: 'wecom-group',
|
||||
@@ -180,6 +182,7 @@ function menuAllowed(key: string, permissionKeys: string[]): boolean {
|
||||
'/product-detail-templates': 'products',
|
||||
'/orders': 'orders',
|
||||
'/promo-codes': 'promo_codes',
|
||||
'/activity-posters': 'activity_posters',
|
||||
'/wecom/bots': 'wecom_bots',
|
||||
'/wecom/pushes': 'wecom_bots',
|
||||
'wecom-group': 'wecom_bots',
|
||||
|
||||
@@ -120,6 +120,7 @@ export const RESOURCE_BIZ_TYPE_LABELS: Record<string, string> = {
|
||||
QRCODE: '二维码',
|
||||
SIGN_PHOTO: '签收照',
|
||||
VIDEO: '视频',
|
||||
ACTIVITY_POSTER: '活动图',
|
||||
};
|
||||
|
||||
export const RESOURCE_STATUS_LABELS: Record<string, string> = {
|
||||
|
||||
@@ -43,6 +43,7 @@ export const REF_TYPE_LABELS: Record<string, string> = {
|
||||
INVOICE: '发票',
|
||||
PROMO: '推广码',
|
||||
PROMO_CODE: '推广码',
|
||||
ACTIVITY_POSTER: '活动图',
|
||||
HQ: '总部',
|
||||
HQ_ACCOUNT: 'HQ 账号',
|
||||
STORE_ACCOUNT: '门店账号',
|
||||
|
||||
@@ -61,6 +61,10 @@ export const HQ_OPERATION_ACTION_OPTIONS = [
|
||||
{ value: 'PARTNER_BILL_BATCH_MARK_PAID', label: '批量合伙人账单结算' },
|
||||
{ value: 'WINERY_BILL_CONFIRM', label: '酒厂对账单确认打款' },
|
||||
{ value: 'WINERY_BILL_BATCH_CONFIRM', label: '批量酒厂对账单打款' },
|
||||
{ value: 'ACTIVITY_POSTER_CREATE', label: '新增活动图' },
|
||||
{ value: 'ACTIVITY_POSTER_UPDATE', label: '编辑活动图' },
|
||||
{ value: 'ACTIVITY_POSTER_UPDATE_STATUS', label: '活动图上下架' },
|
||||
{ value: 'ACTIVITY_POSTER_DELETE', label: '删除活动图' },
|
||||
] as const;
|
||||
|
||||
export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = Object.fromEntries(
|
||||
|
||||
@@ -0,0 +1,242 @@
|
||||
import { useState } from 'react';
|
||||
import {
|
||||
Button, Form, Image, Input, InputNumber, Modal, Popconfirm, Select, Space, Table, Tag, message,
|
||||
} from 'antd';
|
||||
import type { ColumnsType } from 'antd/es/table';
|
||||
import {
|
||||
ACTIVITY_POSTER_STATUS_LABELS,
|
||||
DEFAULT_ACTIVITY_POSTER_QR_SLOT,
|
||||
type ActivityPosterItem,
|
||||
type ActivityPosterQrSlot,
|
||||
type ActivityPosterStatus,
|
||||
} from '@dukang/shared-types';
|
||||
import { request } from '../lib/api';
|
||||
import { fmtTime } from '../lib/constants';
|
||||
import { useAdminList } from '../lib/useAdminList';
|
||||
import { useAdminListColumns } from '../lib/useAdminListColumns';
|
||||
import { AdminListHeader } from '../components/AdminListHeader';
|
||||
import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
|
||||
import OssUpload from '../components/OssUpload';
|
||||
import ActivityPosterQrSlotEditor from '../components/ActivityPosterQrSlotEditor';
|
||||
|
||||
type FormValues = {
|
||||
title: string;
|
||||
copyText?: string;
|
||||
imageUrl: string;
|
||||
qrXPct: number;
|
||||
qrYPct: number;
|
||||
qrSizePct: number;
|
||||
sortOrder?: number;
|
||||
status?: ActivityPosterStatus;
|
||||
};
|
||||
|
||||
export default function ActivityPostersPage() {
|
||||
const [form] = Form.useForm();
|
||||
const [editForm] = Form.useForm<FormValues>();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
const { data, loading, page, pageSize, setPage, setPageSize, reload } = useAdminList<ActivityPosterItem>(
|
||||
'/admin/activity-posters',
|
||||
() => {
|
||||
const qs = new URLSearchParams();
|
||||
if (filters.status) qs.set('status', filters.status);
|
||||
return qs;
|
||||
},
|
||||
[filters],
|
||||
);
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
const [editing, setEditing] = useState<ActivityPosterItem | null>(null);
|
||||
|
||||
const imageUrl = Form.useWatch('imageUrl', editForm);
|
||||
const qrXPct = Form.useWatch('qrXPct', editForm);
|
||||
const qrYPct = Form.useWatch('qrYPct', editForm);
|
||||
const qrSizePct = Form.useWatch('qrSizePct', editForm);
|
||||
const slot: ActivityPosterQrSlot = {
|
||||
qrXPct: qrXPct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrXPct,
|
||||
qrYPct: qrYPct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrYPct,
|
||||
qrSizePct: qrSizePct ?? DEFAULT_ACTIVITY_POSTER_QR_SLOT.qrSizePct,
|
||||
};
|
||||
|
||||
function openCreate() {
|
||||
setEditing(null);
|
||||
editForm.setFieldsValue({
|
||||
title: '',
|
||||
copyText: '',
|
||||
imageUrl: '',
|
||||
...DEFAULT_ACTIVITY_POSTER_QR_SLOT,
|
||||
sortOrder: 0,
|
||||
status: 'ACTIVE',
|
||||
});
|
||||
setModalOpen(true);
|
||||
}
|
||||
|
||||
function openEdit(row: ActivityPosterItem) {
|
||||
setEditing(row);
|
||||
editForm.setFieldsValue({
|
||||
title: row.title,
|
||||
copyText: row.copyText,
|
||||
imageUrl: row.imageUrl,
|
||||
qrXPct: row.qrXPct,
|
||||
qrYPct: row.qrYPct,
|
||||
qrSizePct: row.qrSizePct,
|
||||
sortOrder: row.sortOrder,
|
||||
status: row.status,
|
||||
});
|
||||
setModalOpen(true);
|
||||
}
|
||||
|
||||
async function save() {
|
||||
const v = await editForm.validateFields();
|
||||
const body = JSON.stringify(v);
|
||||
if (editing) {
|
||||
await request(`/admin/activity-posters/${editing.id}`, { method: 'PUT', body });
|
||||
message.success('已保存');
|
||||
} else {
|
||||
await request('/admin/activity-posters', { method: 'POST', body });
|
||||
message.success('已创建');
|
||||
}
|
||||
setModalOpen(false);
|
||||
void reload();
|
||||
}
|
||||
|
||||
const baseColumns: ColumnsType<ActivityPosterItem> = [
|
||||
{
|
||||
title: '标题',
|
||||
dataIndex: 'title',
|
||||
width: 180,
|
||||
render: (v, row) => <AdminPrimaryLink onClick={() => openEdit(row)}>{v}</AdminPrimaryLink>,
|
||||
},
|
||||
{
|
||||
title: '封面',
|
||||
dataIndex: 'imageUrl',
|
||||
width: 90,
|
||||
render: (url: string) => <Image src={url} width={56} height={56} style={{ objectFit: 'cover' }} />,
|
||||
},
|
||||
{
|
||||
title: '文案',
|
||||
dataIndex: 'copyText',
|
||||
width: 240,
|
||||
render: (v: string) => v || '—',
|
||||
},
|
||||
{ title: '排序', dataIndex: 'sortOrder', width: 70 },
|
||||
{
|
||||
title: '状态',
|
||||
dataIndex: 'status',
|
||||
width: 80,
|
||||
render: (s: ActivityPosterStatus) => (
|
||||
<Tag color={s === 'ACTIVE' ? 'green' : 'default'}>{ACTIVITY_POSTER_STATUS_LABELS[s] || s}</Tag>
|
||||
),
|
||||
},
|
||||
{ title: '更新', dataIndex: 'updatedAt', width: 160, render: fmtTime },
|
||||
{
|
||||
title: '操作',
|
||||
width: 200,
|
||||
render: (_, row) => (
|
||||
<Space>
|
||||
<Button type="link" size="small" onClick={() => openEdit(row)}>编辑</Button>
|
||||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
onClick={async () => {
|
||||
const next = row.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE';
|
||||
await request(`/admin/activity-posters/${row.id}/status`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify({ status: next }),
|
||||
});
|
||||
message.success(next === 'ACTIVE' ? '已上架' : '已下架');
|
||||
void reload();
|
||||
}}
|
||||
>
|
||||
{row.status === 'ACTIVE' ? '下架' : '上架'}
|
||||
</Button>
|
||||
<Popconfirm
|
||||
title="确认删除该活动图?"
|
||||
onConfirm={async () => {
|
||||
await request(`/admin/activity-posters/${row.id}`, { method: 'DELETE' });
|
||||
message.success('已删除');
|
||||
void reload();
|
||||
}}
|
||||
>
|
||||
<Button type="link" size="small" danger>删除</Button>
|
||||
</Popconfirm>
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
const { columns, settingsButton, settingsModal } = useAdminListColumns('activity-posters', baseColumns, {
|
||||
page,
|
||||
pageSize,
|
||||
});
|
||||
|
||||
return (
|
||||
<div>
|
||||
{settingsModal}
|
||||
<AdminListHeader
|
||||
title="活动图"
|
||||
settings={settingsButton}
|
||||
actions={<Button type="primary" onClick={openCreate}>新建活动图</Button>}
|
||||
/>
|
||||
<Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
|
||||
<Form.Item name="status" label="状态">
|
||||
<Select
|
||||
allowClear
|
||||
style={{ width: 120 }}
|
||||
options={Object.entries(ACTIVITY_POSTER_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
|
||||
</Form>
|
||||
<Table
|
||||
rowKey="id"
|
||||
className="admin-table-nowrap"
|
||||
loading={loading}
|
||||
columns={columns}
|
||||
dataSource={data?.items ?? []}
|
||||
scroll={{ x: 'max-content' }}
|
||||
pagination={{
|
||||
current: page,
|
||||
pageSize,
|
||||
total: data?.total ?? 0,
|
||||
showSizeChanger: true,
|
||||
onChange: (p, ps) => { setPage(p); setPageSize(ps); },
|
||||
}}
|
||||
/>
|
||||
<Modal
|
||||
title={editing ? '编辑活动图' : '新建活动图'}
|
||||
open={modalOpen}
|
||||
onCancel={() => setModalOpen(false)}
|
||||
onOk={() => void save()}
|
||||
width={720}
|
||||
destroyOnClose
|
||||
>
|
||||
<Form form={editForm} layout="vertical">
|
||||
<Form.Item name="title" label="标题" rules={[{ required: true, message: '请填写标题' }]}>
|
||||
<Input maxLength={128} />
|
||||
</Form.Item>
|
||||
<Form.Item name="imageUrl" label="活动图" rules={[{ required: true, message: '请上传活动图' }]}>
|
||||
<OssUpload bizType="ACTIVITY_POSTER" />
|
||||
</Form.Item>
|
||||
<Form.Item name="qrXPct" hidden><InputNumber /></Form.Item>
|
||||
<Form.Item name="qrYPct" hidden><InputNumber /></Form.Item>
|
||||
<Form.Item name="qrSizePct" hidden><InputNumber /></Form.Item>
|
||||
<Form.Item label="二维码栏">
|
||||
<ActivityPosterQrSlotEditor
|
||||
imageUrl={imageUrl}
|
||||
value={slot}
|
||||
onChange={(next) => editForm.setFieldsValue(next)}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="copyText" label="推广文案">
|
||||
<Input.TextArea rows={4} maxLength={4000} placeholder="合伙人可一键复制" />
|
||||
</Form.Item>
|
||||
<Form.Item name="sortOrder" label="排序" initialValue={0}>
|
||||
<InputNumber min={0} style={{ width: '100%' }} />
|
||||
</Form.Item>
|
||||
<Form.Item name="status" label="状态" initialValue="ACTIVE">
|
||||
<Select options={Object.entries(ACTIVITY_POSTER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user