Dev Main by v3.4 测试数据删除 #10

Merged
jacy merged 91 commits from dev into main 2026-07-28 17:19:22 +08:00
4 changed files with 25 additions and 18 deletions
Showing only changes of commit 15b878f2a4 - Show all commits
+3 -1
View File
@@ -271,7 +271,9 @@ export default function ProductsPage() {
{ title: '规格', dataIndex: 'spec', width: 120, ellipsis: true }, { title: '规格', dataIndex: 'spec', width: 120, ellipsis: true },
{ title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` }, { title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` },
{ title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` }, { title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` },
{ title: '状态', dataIndex: 'status', width: 80, render: (s) => <Tag>{PRODUCT_STATUS_LABELS[s] || s}</Tag> }, { title: '状态', dataIndex: 'status', width: 80, render: (s) => (
<Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
) },
{ {
title: '现场取货', title: '现场取货',
dataIndex: 'allowOnSitePickup', dataIndex: 'allowOnSitePickup',
+19 -14
View File
@@ -329,8 +329,6 @@ export default function StoresPage() {
const selectedRegionCodes = Form.useWatch('regionCodes', createForm); const selectedRegionCodes = Form.useWatch('regionCodes', createForm);
const selectedCityId = Form.useWatch('cityId', createForm); const selectedCityId = Form.useWatch('cityId', createForm);
const selectedCategoryParentId = Form.useWatch('categoryParentId', createForm); const selectedCategoryParentId = Form.useWatch('categoryParentId', createForm);
const watchedLat = Form.useWatch('latitude', createForm);
const watchedLng = Form.useWatch('longitude', createForm);
const categoryParentOptions = useMemo( const categoryParentOptions = useMemo(
() => () =>
@@ -866,12 +864,24 @@ export default function StoresPage() {
<Form.Item name="address" label="详细地址" rules={[{ required: true, message: '请填写详细地址' }]}> <Form.Item name="address" label="详细地址" rules={[{ required: true, message: '请填写详细地址' }]}>
<Input.TextArea rows={2} placeholder="请输入详细门牌号" /> <Input.TextArea rows={2} placeholder="请输入详细门牌号" />
</Form.Item> </Form.Item>
<Form.Item name="latitude" hidden> <Space wrap style={{ width: '100%' }}>
<InputNumber /> <Form.Item name="latitude" label="纬度" style={{ marginBottom: 8 }}>
</Form.Item> <InputNumber
<Form.Item name="longitude" hidden> style={{ width: 180 }}
<InputNumber /> precision={7}
</Form.Item> step={0.000001}
placeholder="如 34.7466000"
/>
</Form.Item>
<Form.Item name="longitude" label="经度" style={{ marginBottom: 8 }}>
<InputNumber
style={{ width: 180 }}
precision={7}
step={0.000001}
placeholder="如 113.6253000"
/>
</Form.Item>
</Space>
<Space wrap style={{ marginBottom: 16 }}> <Space wrap style={{ marginBottom: 16 }}>
<Button <Button
loading={locating} loading={locating}
@@ -903,12 +913,7 @@ export default function StoresPage() {
</Button> </Button>
<Typography.Text type="secondary"> <Typography.Text type="secondary">
{watchedLat != null && 便
watchedLng != null &&
Number.isFinite(Number(watchedLat)) &&
Number.isFinite(Number(watchedLng))
? `坐标:${Number(watchedLat).toFixed(6)}, ${Number(watchedLng).toFixed(6)}`
: '未定位(可选,便于用户端导航与距离)'}
</Typography.Text> </Typography.Text>
</Space> </Space>
<Space wrap style={{ width: '100%' }}> <Space wrap style={{ width: '100%' }}>
+1 -1
View File
@@ -150,7 +150,7 @@ export default function HomePage() {
indicatorDots={banners.length > 1} indicatorDots={banners.length > 1}
autoplay={banners.length > 1} autoplay={banners.length > 1}
circular={banners.length > 1} circular={banners.length > 1}
interval={4000} interval={2500}
> >
{banners.map((url) => ( {banners.map((url) => (
<SwiperItem key={url}> <SwiperItem key={url}>
+2 -2
View File
@@ -205,8 +205,8 @@
justify-content: center; justify-content: center;
padding: 4px 10px; padding: 4px 10px;
border-radius: var(--radius-full); border-radius: var(--radius-full);
background: #2e7d32; background: var(--color-aged-amber);
color: #fff; color: #5c4500;
font-size: 11px; font-size: 11px;
font-weight: 600; font-weight: 600;
line-height: 16px; line-height: 16px;