66 Commits

Author SHA1 Message Date
jacy 58010feed8 Merge branch 'main' of git.yqidian.com:jacy/dukang into dev
CI / verify (push) Waiting to run
2026-08-30 14:40:56 +08:00
jacy 9f14c59f22 merge(dev_jacy): v4.0.1 partner assoc and H5 user management 2026-08-30 14:35:56 +08:00
jacy 870494563d merge(dev): store bill issue date to today
CI / verify (push) Has been cancelled
2026-08-28 14:14:39 +08:00
jacy 4c9b3f72bc merge(dev_jacy): store bill issue date to today 2026-08-28 14:13:28 +08:00
jacy 14c5c8c3f3 merge(dev): v3.5.18 HQ 明文手机、任务版本与核销快链
CI / verify (push) Has been cancelled
2026-08-28 13:58:57 +08:00
jacy a7f3283ae5 merge(dev_jacy): v3.5.18 HQ 明文手机、任务版本与核销快链 2026-08-28 13:58:37 +08:00
jacy c06251f0a4 merge(dev): HQ 订单筛选改版与用户商品模糊搜索
CI / verify (push) Has been cancelled
2026-08-28 13:12:52 +08:00
jacy faa1830bde merge(dev_jacy): HQ 订单筛选改版与用户商品模糊搜索 2026-08-28 13:11:17 +08:00
jacy 2b5f42acdf merge(dev): HQ 推广码订单只计已完成并补快链
CI / verify (push) Has been cancelled
2026-08-28 12:57:03 +08:00
jacy 71149044ca merge(dev_jacy): HQ 推广码订单只计已完成并补快链 2026-08-28 12:56:02 +08:00
jacy 1ecc6a11df merge(dev): 企微结算账单明细与成交播报用户明文
CI / verify (push) Has been cancelled
2026-08-27 11:46:12 +08:00
jacy cfd42dfc32 merge(dev_jacy): 企微结算账单明细与成交播报用户明文 2026-08-27 11:45:59 +08:00
jacy a423fb71e8 merge(dev): v3.5.14 提交订单/支付成功日志端修复
CI / verify (push) Has been cancelled
2026-08-26 17:25:25 +08:00
jacy 4111e5c0a6 merge(dev_jacy): v3.5.14 提交订单/支付成功日志端修复 2026-08-26 17:25:15 +08:00
jacy 3a9f27eb38 merge(dev): v3.5.12 大屏BGM、中文展示、分类删除与侧栏
CI / verify (push) Has been cancelled
2026-08-26 10:55:40 +08:00
jacy e2f5aa9dd8 merge(dev_jacy): v3.5.12 大屏BGM、中文展示、分类删除与侧栏 2026-08-26 10:55:14 +08:00
jacy 6a5c0cb090 Merge pull request 'Dev' (#53) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/53
2026-08-26 09:56:50 +08:00
jacy 448b9983d3 Merge pull request 'Dev jacy v3.5.11 企业微信通知调整' (#52) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/52
2026-08-26 09:56:36 +08:00
jacy 00bb6a2227 Merge pull request 'Dev' (#51) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/51
2026-08-26 07:16:04 +08:00
jacy 1f06530894 Merge pull request '小程序版本号' (#50) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/50
2026-08-26 07:15:52 +08:00
jacy 93390ccf75 merge(dev): 同城运费路由与配送单信息
CI / verify (push) Has been cancelled
2026-08-25 21:13:05 +08:00
jacy a2976cdc8f merge(dev_jacy): 同城运费路由与配送单信息 2026-08-25 21:12:53 +08:00
jacy 8f2ebbfef4 merge(dev): 补承运商删除操作常量
CI / verify (push) Has been cancelled
2026-08-25 14:32:32 +08:00
jacy ee1a3f4b6c merge(dev_jacy): 补承运商删除操作常量 2026-08-25 14:32:27 +08:00
jacy f2fbf95c53 merge(dev): v3.5.10 同城配送提示与企微客服
CI / verify (push) Has been cancelled
2026-08-25 14:30:43 +08:00
jacy 98d52ff173 merge(dev_jacy): v3.5.10 同城配送提示与企微客服 2026-08-25 14:30:10 +08:00
jacy 43de361e61 merge(dev): 列设置靠右与订单状态多选
CI / verify (push) Has been cancelled
2026-08-25 14:20:39 +08:00
jacy b1511ecb92 merge(dev_jacy): 列设置靠右与订单状态多选 2026-08-25 14:20:13 +08:00
jacy 0b548a2764 Merge pull request 'Dev' (#49) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/49
2026-08-25 12:39:52 +08:00
jacy 30f8d649cb Merge pull request 'v3.5.9版本迭代列表优化' (#48) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/48
2026-08-25 12:39:30 +08:00
jacy 40e8a12596 Merge pull request 'Dev' (#47) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/47
2026-08-25 10:10:20 +08:00
jacy d7241d54b1 Merge pull request '给用户增加“备注”列' (#46) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/46
2026-08-25 10:10:07 +08:00
jacy 3d819dc10b Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#45) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/45
2026-08-25 09:23:12 +08:00
jacy 5e0691ab35 Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#44) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/44
2026-08-25 09:22:48 +08:00
jacy 8984465893 Merge pull request 'Dev' (#43) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/43
2026-08-23 19:27:28 +08:00
jacy b90a4e9f8f Merge pull request 'v3.5.7版本迭代' (#42) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/42
2026-08-23 19:27:14 +08:00
jacy 3f208d27a9 Merge pull request 'Dev' (#41) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/41
2026-08-23 17:34:40 +08:00
jacy 6973e3d7f5 Merge pull request '修改订单导出时间错误' (#40) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/40
2026-08-23 17:34:21 +08:00
jacy fa69ced448 Merge pull request 'Dev v3.5.6' (#39) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39
2026-08-23 16:43:51 +08:00
jacy a144a35c3d Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38
2026-08-23 16:43:07 +08:00
jacy 18c5abea79 Merge pull request 'v3.5.5版本合并' (#37) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/37
2026-08-23 12:30:04 +08:00
jacy 012626f6bd Merge pull request 'v3.5.5版本上传' (#36) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36
2026-08-23 12:29:33 +08:00
jacy 5d4ed566de merge(dev): HQ product list as SPU with expandable SKUs
CI / verify (push) Has been cancelled
2026-08-21 23:52:41 +08:00
jacy 3004a65b35 Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev 2026-08-21 23:52:37 +08:00
jacy 5fdddae41c merge(dev): v3.5.4 规格主图与门店使用规则
CI / verify (push) Has been cancelled
2026-08-21 17:37:20 +08:00
jacy 7d2e4ef57e merge(dev_jacy): v3.5.4 规格主图与门店使用规则 2026-08-21 17:37:09 +08:00
jacy 22c0b03a47 Merge pull request 'Dev' (#35) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/35
2026-08-21 16:24:07 +08:00
jacy 73fd27bdf6 Merge pull request 'v3.5.4版本提交,修改api' (#34) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34
2026-08-21 16:23:54 +08:00
jacy f2d03e2595 Merge pull request 'v3.5.4' (#33) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33
2026-08-21 15:50:30 +08:00
jacy cd9696bc1c Merge pull request 'v3.5.4版本提交' (#32) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32
2026-08-21 15:50:07 +08:00
jacy 0c28c204b2 Merge pull request 'Dev' (#31) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31
2026-08-20 20:23:20 +08:00
jacy b5d4f8b27c Merge pull request 'v3.5.3版本更新2' (#30) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30
2026-08-20 20:23:03 +08:00
jacy 9a80f0f8d6 Merge pull request 'v3.5.3版本更新1' (#29) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/29
2026-08-20 18:55:43 +08:00
jacy e7f49a9639 Merge pull request 'v3.5.3版本更新1' (#28) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28
2026-08-20 18:55:18 +08:00
jacy f941dcf072 Merge pull request 'Dev' (#27) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/27
2026-08-20 15:06:24 +08:00
jacy e8b585e623 Merge pull request '增加音效逻辑' (#26) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26
2026-08-20 15:06:07 +08:00
jacy 5702266276 Merge pull request 'Dev jacy' (#25) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/25
2026-08-20 13:43:29 +08:00
jacy 3382d36a6c Merge pull request 'Dev jacy 大屏优化' (#24) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24
2026-08-20 13:43:06 +08:00
jacy 9b8e3f1347 Merge pull request 'v3.5.2 大屏调整' (#23) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/23
2026-08-20 12:01:21 +08:00
jacy a8a37fbc4a Merge pull request 'v3.5.2 大屏调整' (#22) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22
2026-08-20 12:00:57 +08:00
jacy 1440a59fc8 Merge pull request 'Dev' (#21) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/21
2026-08-20 00:54:54 +08:00
jacy e34416a9b3 Merge pull request 'Dev jacy mock 支付调整' (#20) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/20
2026-08-20 00:54:17 +08:00
jacy 11659484c6 Merge pull request 'v3.5.1 版本更新' (#19) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/19
2026-08-19 16:01:31 +08:00
jacy 6c44e9c56f Merge pull request 'v3.5.1 版本更新' (#18) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/18
2026-08-19 16:00:56 +08:00
jacy 0fb7ab7abb Merge pull request 'v3.4.18' (#17) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/17
2026-08-17 23:45:19 +08:00
jacy 905e145af3 Merge pull request 'v3.4.18' (#16) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/16
2026-08-17 23:45:00 +08:00
24 changed files with 873 additions and 839 deletions
@@ -1,97 +0,0 @@
import { useEffect, useState } from 'react';
import { Image, Input, Modal, Space, Typography } from 'antd';
import { PAYMENT_PROOF_IMAGE_MAX_COUNT } from '@dukang/shared-types';
import MultiImageUpload from './MultiImageUpload';
export function parsePaymentProofUrls(raw: unknown): string[] {
if (!Array.isArray(raw)) return [];
return raw.map((u) => String(u ?? '').trim()).filter(Boolean);
}
export function PaymentProofGallery({ urls }: { urls?: unknown }) {
const list = parsePaymentProofUrls(urls);
if (!list.length) return <></>;
return (
<Image.PreviewGroup>
<Space wrap size={8}>
{list.map((url, index) => (
<Image
key={`${url}-${index}`}
src={url}
width={72}
height={72}
style={{ objectFit: 'cover', borderRadius: 6, border: '1px solid #f0f0f0' }}
/>
))}
</Space>
</Image.PreviewGroup>
);
}
type FinancePayProofModalProps = {
open: boolean;
title: string;
hint: string;
okText: string;
confirmLoading?: boolean;
onCancel: () => void;
onOk: (payload: { paymentRef?: string; paymentProofUrls?: string[] }) => Promise<void>;
};
export function FinancePayProofModal({
open,
title,
hint,
okText,
confirmLoading,
onCancel,
onOk,
}: FinancePayProofModalProps) {
const [paymentRef, setPaymentRef] = useState('');
const [proofUrls, setProofUrls] = useState<string[]>([]);
useEffect(() => {
if (open) {
setPaymentRef('');
setProofUrls([]);
}
}, [open]);
return (
<Modal
title={title}
open={open}
okText={okText}
cancelText="取消"
confirmLoading={confirmLoading}
destroyOnClose
width={480}
onCancel={onCancel}
onOk={async () => {
await onOk({
paymentRef: paymentRef.trim() || undefined,
paymentProofUrls: proofUrls.length ? proofUrls : undefined,
});
}}
>
<Typography.Paragraph style={{ marginBottom: 12 }}>{hint}</Typography.Paragraph>
<Input
placeholder="打款凭证号(可选)"
value={paymentRef}
onChange={(e) => setPaymentRef(e.target.value)}
style={{ marginBottom: 12 }}
/>
<Typography.Text type="secondary"></Typography.Text>
<div style={{ marginTop: 8 }}>
<MultiImageUpload
bizType="PAYMENT_PROOF"
value={proofUrls}
onChange={setProofUrls}
maxCount={PAYMENT_PROOF_IMAGE_MAX_COUNT}
buttonText="上传凭证照片"
tip={`最多 ${PAYMENT_PROOF_IMAGE_MAX_COUNT} 张,支持一次选择多张`}
/>
</div>
</Modal>
);
}
+68 -81
View File
@@ -18,7 +18,6 @@ import {
Typography, Typography,
message, message,
} from 'antd'; } from 'antd';
import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import type { Dayjs } from 'dayjs'; import type { Dayjs } from 'dayjs';
import { import {
@@ -114,13 +113,6 @@ export default function StoreBillsPage() {
pendingCount: number; pendingCount: number;
overdueCount: number; overdueCount: number;
} | null>(null); } | null>(null);
const [payModal, setPayModal] = useState<{
ids: string[];
amountHint?: number;
} | null>(null);
const [paySubmitting, setPaySubmitting] = useState(false);
const [withdrawApproveId, setWithdrawApproveId] = useState<string | null>(null);
const [withdrawSubmitting, setWithdrawSubmitting] = useState(false);
useEffect(() => { useEffect(() => {
form.setFieldsValue({ form.setFieldsValue({
@@ -142,11 +134,77 @@ export default function StoreBillsPage() {
}, []); }, []);
function confirmPay(ids: string[], amountHint?: number) { function confirmPay(ids: string[], amountHint?: number) {
setPayModal({ ids, amountHint }); let paymentRef = '';
Modal.confirm({
title: '确认打款?',
content: (
<div>
<div>
{ids.length} T+1
{amountHint != null ? `,合计约 ¥${amountHint.toFixed(2)}` : ''}
</div>
<Input
placeholder="打款凭证号(可选)"
style={{ marginTop: 8 }}
onChange={(e) => {
paymentRef = e.target.value;
}}
/>
</div>
),
okText: '确认打款',
cancelText: '取消',
onOk: async () => {
const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined });
if (ids.length === 1) {
await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
} else {
setBatchLoading(true);
try {
await request('/admin/store-bills/batch-confirm', {
method: 'POST',
body: JSON.stringify({ ids }),
});
} finally {
setBatchLoading(false);
}
}
message.success('已确认打款');
setSelectedKeys([]);
reload();
},
});
} }
function approveWithdraw(id: string) { function approveWithdraw(id: string) {
setWithdrawApproveId(id); let paymentRef = '';
Modal.confirm({
title: '审核通过并标记已结算?',
content: (
<Input
placeholder="打款凭证号(可选)"
onChange={(e) => {
paymentRef = e.target.value;
}}
/>
),
okText: '通过并结算',
cancelText: '取消',
onOk: async () => {
await request(`/admin/store-withdrawals/${id}/approve`, {
method: 'POST',
body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
});
message.success('已通过并标记已结算');
setDrawerOpen(false);
reload();
void request<{ pendingCount: number; overdueCount: number }>(
'/admin/store-withdrawals/overdue-summary',
)
.then(setOverdueSummary)
.catch(() => {});
},
});
} }
function rejectWithdraw(id: string) { function rejectWithdraw(id: string) {
@@ -507,9 +565,6 @@ export default function StoreBillsPage() {
<Descriptions.Item label="打款凭证"> <Descriptions.Item label="打款凭证">
{detail.paymentRef ? String(detail.paymentRef) : '—'} {detail.paymentRef ? String(detail.paymentRef) : '—'}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="凭证照片">
<PaymentProofGallery urls={detail.paymentProofUrls} />
</Descriptions.Item>
</Descriptions> </Descriptions>
{(detail.storeAccount as { {(detail.storeAccount as {
bankAccountName?: string; bankAccountName?: string;
@@ -594,9 +649,6 @@ export default function StoreBillsPage() {
<Descriptions.Item label="打款凭证"> <Descriptions.Item label="打款凭证">
{detail.paymentRef ? String(detail.paymentRef) : '—'} {detail.paymentRef ? String(detail.paymentRef) : '—'}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="凭证照片">
<PaymentProofGallery urls={detail.paymentProofUrls} />
</Descriptions.Item>
</Descriptions> </Descriptions>
{storeAccount ? ( {storeAccount ? (
<> <>
@@ -667,71 +719,6 @@ export default function StoreBillsPage() {
</> </>
)} )}
</Drawer> </Drawer>
<FinancePayProofModal
open={!!payModal}
title="确认打款?"
hint={`将确认 ${payModal?.ids.length ?? 0} 笔 T+1 门店对账单${
payModal?.amountHint != null ? `,合计约 ¥${payModal.amountHint.toFixed(2)}` : ''
}。此操作不可撤销。`}
okText="确认打款"
confirmLoading={paySubmitting}
onCancel={() => setPayModal(null)}
onOk={async (payload) => {
if (!payModal) return;
const { ids } = payModal;
setPaySubmitting(true);
if (ids.length > 1) setBatchLoading(true);
try {
const body = JSON.stringify({
...payload,
...(ids.length > 1 ? { ids } : {}),
});
if (ids.length === 1) {
await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body });
} else {
await request('/admin/store-bills/batch-confirm', { method: 'POST', body });
}
message.success('已确认打款');
setPayModal(null);
setSelectedKeys([]);
reload();
} finally {
setPaySubmitting(false);
setBatchLoading(false);
}
}}
/>
<FinancePayProofModal
open={!!withdrawApproveId}
title="审核通过并标记已结算?"
hint="通过后将标记该提现为已结算,此操作不可撤销。"
okText="通过并结算"
confirmLoading={withdrawSubmitting}
onCancel={() => setWithdrawApproveId(null)}
onOk={async (payload) => {
if (!withdrawApproveId) return;
setWithdrawSubmitting(true);
try {
await request(`/admin/store-withdrawals/${withdrawApproveId}/approve`, {
method: 'POST',
body: JSON.stringify(payload),
});
message.success('已通过并标记已结算');
setWithdrawApproveId(null);
setDrawerOpen(false);
reload();
void request<{ pendingCount: number; overdueCount: number }>(
'/admin/store-withdrawals/overdue-summary',
)
.then(setOverdueSummary)
.catch(() => {});
} finally {
setWithdrawSubmitting(false);
}
}}
/>
</div> </div>
); );
} }
@@ -23,7 +23,6 @@ import { useAdminList } from '../lib/useAdminList';
import { useAdminListColumns } from '../lib/useAdminListColumns'; import { useAdminListColumns } from '../lib/useAdminListColumns';
import { AdminListHeader } from '../components/AdminListHeader'; import { AdminListHeader } from '../components/AdminListHeader';
import { AdminPrimaryLink } from '../components/AdminPrimaryLink'; import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof';
type Row = { type Row = {
@@ -71,8 +70,6 @@ export default function StoreWithdrawalsPage() {
pendingCount: number; pendingCount: number;
overdueCount: number; overdueCount: number;
} | null>(null); } | null>(null);
const [approveId, setApproveId] = useState<string | null>(null);
const [approveSubmitting, setApproveSubmitting] = useState(false);
useEffect(() => { useEffect(() => {
void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`) void request<Paginated<StoreOption>>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -92,7 +89,34 @@ export default function StoreWithdrawalsPage() {
} }
function approve(id: string) { function approve(id: string) {
setApproveId(id); let paymentRef = '';
Modal.confirm({
title: '审核通过并标记已结算?',
content: (
<Input
placeholder="打款凭证号(可选)"
onChange={(e) => {
paymentRef = e.target.value;
}}
/>
),
okText: '通过并结算',
cancelText: '取消',
onOk: async () => {
await request(`/admin/store-withdrawals/${id}/approve`, {
method: 'POST',
body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }),
});
message.success('已通过并标记已结算');
setDrawerOpen(false);
reload();
void request<{ pendingCount: number; overdueCount: number }>(
'/admin/store-withdrawals/overdue-summary',
)
.then(setOverdueSummary)
.catch(() => {});
},
});
} }
function reject(id: string) { function reject(id: string) {
@@ -332,9 +356,6 @@ export default function StoreWithdrawalsPage() {
{detail.paymentRef ? ( {detail.paymentRef ? (
<Descriptions.Item label="打款凭证">{String(detail.paymentRef)}</Descriptions.Item> <Descriptions.Item label="打款凭证">{String(detail.paymentRef)}</Descriptions.Item>
) : null} ) : null}
<Descriptions.Item label="凭证照片">
<PaymentProofGallery urls={detail.paymentProofUrls} />
</Descriptions.Item>
<Descriptions.Item label="收款户名"> <Descriptions.Item label="收款户名">
{storeAccount?.bankAccountName || '—'} {storeAccount?.bankAccountName || '—'}
</Descriptions.Item> </Descriptions.Item>
@@ -373,36 +394,6 @@ export default function StoreWithdrawalsPage() {
</> </>
) : null} ) : null}
</Drawer> </Drawer>
<FinancePayProofModal
open={!!approveId}
title="审核通过并标记已结算?"
hint="通过后将标记该提现为已结算,此操作不可撤销。"
okText="通过并结算"
confirmLoading={approveSubmitting}
onCancel={() => setApproveId(null)}
onOk={async (payload) => {
if (!approveId) return;
setApproveSubmitting(true);
try {
await request(`/admin/store-withdrawals/${approveId}/approve`, {
method: 'POST',
body: JSON.stringify(payload),
});
message.success('已通过并标记已结算');
setApproveId(null);
setDrawerOpen(false);
reload();
void request<{ pendingCount: number; overdueCount: number }>(
'/admin/store-withdrawals/overdue-summary',
)
.then(setOverdueSummary)
.catch(() => {});
} finally {
setApproveSubmitting(false);
}
}}
/>
</div> </div>
); );
} }
+1 -1
View File
@@ -7,7 +7,7 @@
@import './styles/mine.css'; @import './styles/mine.css';
@import './styles/address.css'; @import './styles/address.css';
@import './styles/benefit-promo.css'; @import './styles/benefit-promo.css';
@import './components/HomeSplash.css'; @import './components/JiuzuSplash.css';
page, page,
body { body {
+2
View File
@@ -6,12 +6,14 @@ import { patchTaroH5Hooks } from './lib/patch-taro-h5-hooks';
import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm'; import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm';
import { installClientErrorReporting } from './lib/client-error'; import { installClientErrorReporting } from './lib/client-error';
import { prefetchShareBrandAssets } from './lib/wechat-share'; import { prefetchShareBrandAssets } from './lib/wechat-share';
import { prefetchJiuzuSplashAssets } from './lib/jiuzu-splash';
import './app.css'; import './app.css';
// H5:在首屏 page hooks 执行前,把 Taro.useDidShow 等绑到与 createReactApp 同一份 runtime // H5:在首屏 page hooks 执行前,把 Taro.useDidShow 等绑到与 createReactApp 同一份 runtime
patchTaroH5Hooks(); patchTaroH5Hooks();
installClientErrorReporting(); installClientErrorReporting();
prefetchShareBrandAssets(); prefetchShareBrandAssets();
prefetchJiuzuSplashAssets();
function App({ children }: PropsWithChildren) { function App({ children }: PropsWithChildren) {
const handlingRef = useRef(false); const handlingRef = useRef(false);
+2 -2
View File
@@ -4,14 +4,14 @@ import Taro, { useDidShow } from '@tarojs/taro';
import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm'; import { handleWechatOrderConfirmShow } from './lib/wechat-order-confirm';
import { installClientErrorReporting } from './lib/client-error'; import { installClientErrorReporting } from './lib/client-error';
import { prefetchShareBrandAssets } from './lib/wechat-share'; import { prefetchShareBrandAssets } from './lib/wechat-share';
import { prefetchHomeSplashAssets } from './lib/home-splash'; import { prefetchJiuzuSplashAssets } from './lib/jiuzu-splash';
import { capturePromoSceneAndTouchScan } from './lib/promo'; import { capturePromoSceneAndTouchScan } from './lib/promo';
import { initClientVersionChecks } from './lib/client-version'; import { initClientVersionChecks } from './lib/client-version';
import './app.css'; import './app.css';
installClientErrorReporting(); installClientErrorReporting();
prefetchShareBrandAssets(); prefetchShareBrandAssets();
prefetchHomeSplashAssets(); prefetchJiuzuSplashAssets();
function App({ children }: PropsWithChildren) { function App({ children }: PropsWithChildren) {
const handlingRef = useRef(false); const handlingRef = useRef(false);
@@ -1,272 +0,0 @@
/* 首页开场:半透明底 + 酒瓶 + 分流光 + 文字渐显 */
.home-splash {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 10010;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
overflow: hidden;
pointer-events: auto;
}
.home-splash--out {
animation: home-splash-out 0.8s ease-in forwards;
pointer-events: none;
}
.home-splash-veil {
position: absolute;
z-index: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: rgba(20, 8, 8, 0.58);
background-image: radial-gradient(
ellipse at 50% 48%,
rgba(166, 29, 36, 0.42) 0%,
rgba(20, 8, 8, 0.62) 62%,
rgba(10, 4, 4, 0.72) 100%
);
opacity: 0;
animation: home-splash-fade 0.7s ease-out forwards;
}
.home-splash-copy {
position: relative;
z-index: 3;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 8px;
}
.home-splash-title {
font-family: 'Songti SC', 'STSong', 'Noto Serif SC', 'PingFang SC', serif;
font-size: 40px;
font-weight: 700;
line-height: 1.2;
letter-spacing: 0.22em;
color: #f5d76e;
text-shadow: 0 0 14px rgba(255, 191, 0, 0.55), 0 2px 10px rgba(20, 8, 8, 0.45);
opacity: 0;
animation: home-splash-fade 1.1s 0.65s ease-out forwards;
}
.home-splash-sub {
margin-top: 10px;
font-size: 13px;
letter-spacing: 0.16em;
color: rgba(255, 248, 210, 0.88);
opacity: 0;
animation: home-splash-fade 1.1s 1.35s ease-out forwards;
}
.home-splash-stage {
position: relative;
z-index: 2;
width: 220px;
height: 420px;
overflow: hidden;
opacity: 0;
animation: home-splash-fade 1s 0.2s ease-out forwards;
}
.home-splash-glow {
position: absolute;
z-index: 0;
left: 18px;
right: 18px;
top: 18%;
bottom: 8%;
border-radius: 50%;
background: radial-gradient(ellipse at 50% 50%, rgba(255, 191, 0, 0.34) 0%, rgba(255, 191, 0, 0) 72%);
opacity: 0;
animation: home-splash-glow 2.6s 0.8s ease-in-out infinite;
}
.home-splash-beam {
position: absolute;
z-index: 1;
top: 0;
bottom: 0;
left: 50%;
width: 46px;
margin-left: -23px;
background: linear-gradient(
180deg,
rgba(255, 248, 210, 0) 0%,
rgba(255, 248, 210, 0.16) 28%,
rgba(255, 191, 0, 0.22) 50%,
rgba(255, 248, 210, 0.1) 78%,
rgba(255, 248, 210, 0) 100%
);
opacity: 0;
animation: home-splash-beam 3.2s 1.1s ease-in-out infinite;
}
.home-splash-bottle {
position: relative;
z-index: 2;
display: block;
width: 220px;
height: 420px;
}
.home-splash-bottle img {
width: 100%;
height: 100%;
object-fit: contain;
}
.home-splash-lights {
position: absolute;
z-index: 3;
top: 0;
left: 0;
width: 220px;
height: 420px;
overflow: hidden;
pointer-events: none;
-webkit-mask-size: contain;
mask-size: contain;
-webkit-mask-repeat: no-repeat;
mask-repeat: no-repeat;
-webkit-mask-position: center;
mask-mode: alpha;
}
.home-splash-sheen {
position: absolute;
z-index: 3;
top: -12%;
bottom: -12%;
pointer-events: none;
opacity: 0;
}
.home-splash-sheen--a {
width: 48px;
left: 0;
background: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0%,
rgba(255, 248, 210, 0.08) 28%,
rgba(255, 248, 210, 0.55) 50%,
rgba(255, 191, 0, 0.18) 72%,
rgba(255, 255, 255, 0) 100%
);
transform: translateX(-70px) skewX(-22deg);
animation: home-splash-sheen-a 2.8s 1.4s ease-in-out infinite;
}
.home-splash-sheen--b {
width: 22px;
left: 0;
background: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0%,
rgba(255, 255, 255, 0.42) 50%,
rgba(255, 255, 255, 0) 100%
);
transform: translateX(-50px) skewX(-18deg);
animation: home-splash-sheen-b 3.6s 2.3s ease-in-out infinite;
}
.home-splash-skip {
position: absolute;
top: 16px;
right: 16px;
z-index: 4;
padding: 6px 14px;
border-radius: 999px;
border: 1px solid rgba(245, 215, 110, 0.45);
background: rgba(20, 8, 8, 0.35);
opacity: 0;
animation: home-splash-fade 0.6s 0.35s ease-out forwards;
}
.home-splash-skip-text {
color: rgba(255, 248, 210, 0.92);
font-size: 12px;
line-height: 1.4;
letter-spacing: 0.08em;
}
@keyframes home-splash-fade {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes home-splash-out {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
@keyframes home-splash-glow {
0%,
100% {
opacity: 0.35;
}
50% {
opacity: 0.85;
}
}
@keyframes home-splash-beam {
0%,
100% {
opacity: 0;
}
40% {
opacity: 0.7;
}
70% {
opacity: 0.15;
}
}
@keyframes home-splash-sheen-a {
0% {
opacity: 0;
transform: translateX(-70px) skewX(-22deg);
}
18% {
opacity: 1;
}
82% {
opacity: 0.7;
}
100% {
opacity: 0;
transform: translateX(250px) skewX(-22deg);
}
}
@keyframes home-splash-sheen-b {
0% {
opacity: 0;
transform: translateX(-40px) skewX(-18deg);
}
22% {
opacity: 0.9;
}
100% {
opacity: 0;
transform: translateX(240px) skewX(-18deg);
}
}
@@ -1,121 +0,0 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { Image, Text, View } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { HOME_SPLASH_BOTTLE_URL } from '@dukang/shared-types';
import { markHomeSplashPlayed } from '../lib/home-splash';
const SPLASH_NAV_BG = '#140808';
const HOME_NAV_BG = '#FAF9F7';
const FADE_AT_MS = 4800;
const FADE_MS = 800;
type HomeSplashProps = {
onDone: () => void;
};
function applySplashChrome() {
try {
void Taro.hideTabBar({ animation: false });
} catch {
/* H5 无原生 TabBar */
}
void Taro.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: SPLASH_NAV_BG,
animation: { duration: 200, timingFunc: 'easeIn' },
}).catch(() => {});
}
function restoreChrome() {
try {
void Taro.showTabBar({ animation: false });
} catch {
/* H5 无原生 TabBar */
}
void Taro.setNavigationBarColor({
frontColor: '#000000',
backgroundColor: HOME_NAV_BG,
animation: { duration: 200, timingFunc: 'easeOut' },
}).catch(() => {});
}
export default function HomeSplash({ onDone }: HomeSplashProps) {
const finishedRef = useRef(false);
const fadingRef = useRef(false);
const onDoneRef = useRef(onDone);
onDoneRef.current = onDone;
const [leaving, setLeaving] = useState(false);
const finish = useCallback(() => {
if (finishedRef.current) return;
finishedRef.current = true;
restoreChrome();
onDoneRef.current();
}, []);
const beginExit = useCallback(() => {
if (fadingRef.current || finishedRef.current) return;
fadingRef.current = true;
setLeaving(true);
setTimeout(finish, FADE_MS);
}, [finish]);
useEffect(() => {
markHomeSplashPlayed();
applySplashChrome();
const timer = setTimeout(beginExit, FADE_AT_MS);
return () => {
clearTimeout(timer);
if (!finishedRef.current) restoreChrome();
};
}, [beginExit]);
return (
<View
className={`home-splash${leaving ? ' home-splash--out' : ''}`}
catchMove
onTouchMove={(e) => {
e.stopPropagation?.();
}}
>
<View className="home-splash-veil" />
<View className="home-splash-copy">
<Text className="home-splash-title"></Text>
<Text className="home-splash-sub"></Text>
</View>
<View className="home-splash-stage">
<View className="home-splash-glow" />
<Image
className="home-splash-bottle"
src={HOME_SPLASH_BOTTLE_URL}
mode="aspectFit"
style={{ width: '220px', height: '420px' }}
/>
<View
className="home-splash-lights"
style={{
width: '220px',
height: '420px',
WebkitMaskImage: `url(${HOME_SPLASH_BOTTLE_URL})`,
maskImage: `url(${HOME_SPLASH_BOTTLE_URL})`,
WebkitMaskSize: 'contain',
maskSize: 'contain',
WebkitMaskRepeat: 'no-repeat',
maskRepeat: 'no-repeat',
WebkitMaskPosition: 'center',
}}
>
<View className="home-splash-beam" />
<View className="home-splash-sheen home-splash-sheen--a" />
<View className="home-splash-sheen home-splash-sheen--b" />
</View>
</View>
<View className="home-splash-skip" onClick={finish}>
<Text className="home-splash-skip-text"></Text>
</View>
</View>
);
}
@@ -0,0 +1,266 @@
/* 酒祖杜康开场:黑红底 → GIF 播完消失 → 四字上移 → 副标题跟上 */
.jiuzu-splash {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 10010;
overflow: hidden;
background-color: #140808;
background-image: radial-gradient(ellipse at 50% 42%, #5a1014 0%, #2a080a 48%, #140808 100%);
animation: jiuzu-bg-in 0.35s ease-out both;
}
.jiuzu-splash--out {
animation: jiuzu-bg-out 0.8s ease-in forwards;
pointer-events: none;
}
.jiuzu-splash-mist {
position: absolute;
z-index: 0;
border-radius: 50%;
pointer-events: none;
filter: blur(48px);
}
.jiuzu-splash-mist--a {
width: 280px;
height: 280px;
left: -72px;
top: 12%;
background: rgba(166, 29, 36, 0.38);
}
.jiuzu-splash-mist--b {
width: 240px;
height: 240px;
right: -56px;
bottom: 16%;
background: rgba(90, 16, 20, 0.5);
}
.jiuzu-splash-gif {
position: absolute;
z-index: 5;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: block;
width: 100%;
height: 100%;
pointer-events: none;
}
.jiuzu-splash-gif--out {
animation: jiuzu-bg-out 0.35s ease-in forwards;
}
.jiuzu-splash-gif img {
width: 100%;
height: 100%;
object-fit: cover;
}
.jiuzu-splash-copy {
position: absolute;
z-index: 2;
left: 0;
right: 0;
top: 26%;
display: flex;
flex-direction: column;
align-items: center;
}
.jiuzu-splash-lockup {
position: relative;
width: 320px;
height: 180px;
display: flex;
align-items: center;
justify-content: center;
}
.jiuzu-splash-title {
position: relative;
z-index: 2;
opacity: 0;
transform: translateY(48vh);
}
.jiuzu-splash--after-gif .jiuzu-splash-title {
animation: jiuzu-title-rise 2.4s cubic-bezier(0.22, 1, 0.32, 1) forwards;
}
.jiuzu-splash-mark {
position: absolute;
z-index: 0;
top: 0;
left: 0;
width: 320px;
height: 180px;
opacity: 0;
pointer-events: none;
}
.jiuzu-splash--after-gif .jiuzu-splash-mark {
animation: fadeInTo4 1s ease-out both;
}
.jiuzu-splash-mark img {
width: 100%;
height: 100%;
object-fit: contain;
}
.jiuzu-splash-chars {
position: relative;
z-index: 2;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
overflow: hidden;
padding: 8px 4px;
}
.jiuzu-splash-char {
width: 52px;
}
.jiuzu-splash-char-text {
display: block;
width: 100%;
font-family: 'Songti SC', 'STSong', 'Noto Serif SC', 'PingFang SC', serif;
font-size: 46px;
font-weight: 700;
line-height: 1.15;
text-align: center;
color: #f5d76e;
text-shadow: 0 0 12px rgba(255, 191, 0, 0.85), 0 0 28px rgba(20, 8, 8, 0.65);
}
.jiuzu-splash-shimmer {
position: absolute;
top: -10%;
bottom: -10%;
width: 36px;
z-index: 3;
pointer-events: none;
opacity: 0;
background: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0%,
rgba(255, 248, 210, 0.55) 50%,
rgba(255, 255, 255, 0) 100%
);
transform: translateX(-80px) skewX(-18deg);
}
.jiuzu-splash--after-gif .jiuzu-splash-shimmer {
animation: jiuzu-shimmer 0.7s 2.2s ease-out both;
}
.jiuzu-splash-sub {
position: relative;
z-index: 2;
margin-top: 4px;
opacity: 0;
transform: translateY(36vh);
}
.jiuzu-splash--after-gif .jiuzu-splash-sub {
animation: jiuzu-sub-rise 0.4s 1.3s cubic-bezier(0.22, 1, 0.32, 1) forwards;
}
.jiuzu-splash-sub-text {
font-size: 13px;
letter-spacing: 0.28em;
color: rgba(245, 215, 110, 0.88);
}
.jiuzu-splash-skip {
position: absolute;
top: 16px;
right: 16px;
z-index: 6;
padding: 6px 14px;
border-radius: 999px;
border: 1px solid rgba(245, 215, 110, 0.45);
background: rgba(20, 8, 8, 0.35);
}
.jiuzu-splash-skip-text {
color: rgba(255, 248, 210, 0.92);
font-size: 12px;
line-height: 1.4;
letter-spacing: 0.08em;
}
@keyframes fadeInTo4 {
0% { opacity: 0; }
100% { opacity: 0.4; }
}
@keyframes jiuzu-bg-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes jiuzu-bg-out {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
@keyframes jiuzu-title-rise {
0% {
opacity: 0;
transform: translateY(48vh);
}
14% {
opacity: 1;
transform: translateY(48vh);
}
100% {
opacity: 1;
transform: translateY(0);
}
}
@keyframes jiuzu-sub-rise {
0% {
opacity: 0;
transform: translateY(36vh);
}
18% {
opacity: 1;
transform: translateY(36vh);
}
100% {
opacity: 1;
transform: translateY(0);
}
}
@keyframes jiuzu-shimmer {
from {
transform: translateX(-80px) skewX(-18deg);
opacity: 0.2;
}
to {
transform: translateX(280px) skewX(-18deg);
opacity: 0;
}
}
@@ -0,0 +1,140 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { Image, Text, View } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { JIUZU_SPLASH_GIF_URL, JIUZU_SPLASH_MARK_URL } from '@dukang/shared-types';
import { markJiuzuSplashPlayed } from '../lib/jiuzu-splash';
const CHARS = ['酒', '祖', '杜', '康'] as const;
const SPLASH_NAV_BG = '#140808';
const HOME_NAV_BG = '#FAF9F7';
/** GIF 21 帧 × 80ms,略提前淡出避免循环 */
const GIF_MS = 1650;
const GIF_FADE_MS = 350;
/** 四字显现并升到偏上位置 */
const TITLE_MS = 2400;
/** 副标题在四字到位后再升起 */
const SUB_DELAY_MS = 2300;
const SUB_MS = 1400;
const HOLD_MS = 900;
const FADE_MS = 800;
const FADE_AT_MS = GIF_MS + SUB_DELAY_MS + SUB_MS + HOLD_MS;
type JiuzuSplashProps = {
onDone: () => void;
};
function applySplashChrome() {
try {
void Taro.hideTabBar({ animation: false });
} catch {
/* H5 无原生 TabBar */
}
void Taro.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: SPLASH_NAV_BG,
animation: { duration: 200, timingFunc: 'easeIn' },
}).catch(() => {});
}
function restoreChrome() {
try {
void Taro.showTabBar({ animation: false });
} catch {
/* H5 无原生 TabBar */
}
void Taro.setNavigationBarColor({
frontColor: '#000000',
backgroundColor: HOME_NAV_BG,
animation: { duration: 200, timingFunc: 'easeOut' },
}).catch(() => {});
}
export default function JiuzuSplash({ onDone }: JiuzuSplashProps) {
const finishedRef = useRef(false);
const fadingRef = useRef(false);
const onDoneRef = useRef(onDone);
onDoneRef.current = onDone;
const [leaving, setLeaving] = useState(false);
const [gifDone, setGifDone] = useState(false);
const [gifGone, setGifGone] = useState(false);
const finish = useCallback(() => {
if (finishedRef.current) return;
finishedRef.current = true;
restoreChrome();
onDoneRef.current();
}, []);
const beginExit = useCallback(() => {
if (fadingRef.current || finishedRef.current) return;
fadingRef.current = true;
setLeaving(true);
setTimeout(finish, FADE_MS);
}, [finish]);
useEffect(() => {
markJiuzuSplashPlayed();
applySplashChrome();
const gifTimer = setTimeout(() => setGifDone(true), GIF_MS);
const gifGoneTimer = setTimeout(() => setGifGone(true), GIF_MS + GIF_FADE_MS);
const exitTimer = setTimeout(beginExit, FADE_AT_MS);
return () => {
clearTimeout(gifTimer);
clearTimeout(gifGoneTimer);
clearTimeout(exitTimer);
if (!finishedRef.current) restoreChrome();
};
}, [beginExit]);
return (
<View
className={`jiuzu-splash${gifDone ? ' jiuzu-splash--after-gif' : ''}${leaving ? ' jiuzu-splash--out' : ''}`}
catchMove
onTouchMove={(e) => {
e.stopPropagation?.();
}}
>
<View className="jiuzu-splash-mist jiuzu-splash-mist--a" />
<View className="jiuzu-splash-mist jiuzu-splash-mist--b" />
{gifGone ? null : (
<Image
className={`jiuzu-splash-gif${gifDone ? ' jiuzu-splash-gif--out' : ''}`}
src={JIUZU_SPLASH_GIF_URL}
mode="aspectFill"
style={{ width: '100%', height: '100%' }}
/>
)}
<View className="jiuzu-splash-copy">
<View className="jiuzu-splash-lockup">
<Image
className="jiuzu-splash-mark"
src={JIUZU_SPLASH_MARK_URL}
mode="aspectFit"
style={{ width: '320px', height: '180px' }}
/>
<View className="jiuzu-splash-title">
<View className="jiuzu-splash-chars">
<View className="jiuzu-splash-shimmer" />
{CHARS.map((ch) => (
<View key={ch} className="jiuzu-splash-char">
<Text className="jiuzu-splash-char-text">{ch}</Text>
</View>
))}
</View>
</View>
</View>
<View className="jiuzu-splash-sub">
<Text className="jiuzu-splash-sub-text"> · </Text>
</View>
</View>
<View className="jiuzu-splash-skip" onClick={finish}>
<Text className="jiuzu-splash-skip-text"></Text>
</View>
</View>
);
}
-21
View File
@@ -1,21 +0,0 @@
import Taro from '@tarojs/taro';
import { HOME_SPLASH_BOTTLE_URL } from '@dukang/shared-types';
/** 冷启动会话内是否已播过首页开场(进程级,切 Tab 不重播) */
let played = false;
export function hasHomeSplashPlayed() {
return played;
}
export function markHomeSplashPlayed() {
played = true;
}
/** 冷启动预拉 OSS 开场图(仅 weappH5 的 getImageInfo 会走 CORS */
export function prefetchHomeSplashAssets() {
if (played) return;
if (process.env.TARO_ENV !== 'weapp') return;
void Taro.getImageInfo({ src: HOME_SPLASH_BOTTLE_URL }).catch(() => {});
}
@@ -0,0 +1,316 @@
/** Canvas 金龙:盘成一圈,仿照立体金龙的鳞片、须、角、爪与光晕 */
export type DragonCanvasNode = {
width: number;
height: number;
getContext: (type: '2d') => CanvasRenderingContext2D;
requestAnimationFrame?: (cb: (time: number) => void) => number;
cancelAnimationFrame?: (id: number) => void;
};
type SpinePt = {
x: number;
y: number;
ang: number;
nx: number;
ny: number;
w: number;
};
const GOLD_HI = '#fff6c8';
const GOLD = '#ffbf00';
const GOLD_MID = '#e8a800';
const GOLD_DEEP = '#b87500';
function lerp(a: number, b: number, t: number) {
return a + (b - a) * t;
}
function fillOval(
ctx: CanvasRenderingContext2D,
x: number,
y: number,
rw: number,
rh: number,
rot: number,
) {
ctx.save();
ctx.translate(x, y);
ctx.rotate(rot);
ctx.scale(Math.max(0.01, rw), Math.max(0.01, rh));
ctx.beginPath();
ctx.arc(0, 0, 1, 0, Math.PI * 2);
ctx.fill();
ctx.restore();
}
function easeInCubic(t: number) {
return t * t * t;
}
function buildSpine(cx: number, cy: number, r: number, phase: number, segs: number): SpinePt[] {
const pts: SpinePt[] = [];
const turns = 0.94;
for (let i = 0; i < segs; i++) {
const u = i / (segs - 1);
const ang = -Math.PI / 2 + u * Math.PI * 2 * turns;
const wobble = Math.sin(u * 14 + phase) * r * 0.042 + Math.sin(u * 5.5 - phase * 0.7) * r * 0.02;
const rr = r + wobble;
const nx = Math.cos(ang);
const ny = Math.sin(ang);
pts.push({
x: cx + nx * rr,
y: cy + ny * rr,
ang,
nx,
ny,
w: lerp(20, 6.5, u ** 0.62),
});
}
return pts;
}
function strokeRibbon(
ctx: CanvasRenderingContext2D,
pts: SpinePt[],
widthScale: number,
color: string,
alpha: number,
) {
if (pts.length < 2) return;
ctx.save();
ctx.globalAlpha = alpha;
ctx.strokeStyle = color;
ctx.lineCap = 'round';
ctx.lineJoin = 'round';
ctx.beginPath();
ctx.moveTo(pts[0].x, pts[0].y);
for (let i = 1; i < pts.length; i++) ctx.lineTo(pts[i].x, pts[i].y);
ctx.lineWidth = pts[Math.floor(pts.length * 0.15)].w * widthScale;
ctx.stroke();
ctx.restore();
}
function drawScales(ctx: CanvasRenderingContext2D, pts: SpinePt[]) {
for (let i = 2; i < pts.length - 1; i += 1) {
const p = pts[i];
const u = i / (pts.length - 1);
const ox = p.x + p.nx * p.w * 0.18;
const oy = p.y + p.ny * p.w * 0.18;
ctx.save();
ctx.translate(ox, oy);
ctx.rotate(p.ang + Math.PI / 2);
ctx.fillStyle = i % 2 === 0 ? GOLD_HI : GOLD;
ctx.globalAlpha = 0.55 + (1 - u) * 0.25;
fillOval(ctx, 0, 0, p.w * 0.55, p.w * 0.38, 0);
ctx.restore();
}
}
function drawSpines(ctx: CanvasRenderingContext2D, pts: SpinePt[]) {
ctx.fillStyle = GOLD_HI;
for (let i = 3; i < pts.length - 6; i += 3) {
const p = pts[i];
const len = p.w * 1.35;
ctx.save();
ctx.globalAlpha = 0.85;
ctx.beginPath();
ctx.moveTo(p.x + p.nx * p.w * 0.2, p.y + p.ny * p.w * 0.2);
ctx.lineTo(
p.x + p.nx * (p.w + len),
p.y + p.ny * (p.w + len),
);
const tx = -p.ny;
const ty = p.nx;
ctx.lineTo(p.x + tx * 2.2, p.y + ty * 2.2);
ctx.closePath();
ctx.fill();
ctx.restore();
}
}
function drawClaw(ctx: CanvasRenderingContext2D, p: SpinePt, side: number) {
const tx = -p.ny * side;
const ty = p.nx * side;
const baseX = p.x + tx * p.w * 0.7;
const baseY = p.y + ty * p.w * 0.7;
ctx.save();
ctx.translate(baseX, baseY);
ctx.rotate(Math.atan2(ty, tx));
ctx.fillStyle = GOLD;
ctx.strokeStyle = GOLD_DEEP;
ctx.lineWidth = 0.8;
for (let k = -1; k <= 1; k++) {
ctx.beginPath();
ctx.moveTo(0, k * 4);
ctx.quadraticCurveTo(10, k * 6 - 2, 18, k * 5);
ctx.quadraticCurveTo(10, k * 4, 0, k * 3);
ctx.closePath();
ctx.fill();
ctx.stroke();
}
ctx.restore();
}
function drawHead(ctx: CanvasRenderingContext2D, p: SpinePt, phase: number) {
ctx.save();
ctx.translate(p.x + p.nx * 10, p.y + p.ny * 10);
ctx.rotate(Math.atan2(p.ny, p.nx) + Math.PI / 2);
const mane = 6;
for (let i = 0; i < mane; i++) {
const a = -0.9 + (i / (mane - 1)) * 1.8;
ctx.beginPath();
ctx.strokeStyle = i % 2 ? GOLD_HI : GOLD;
ctx.globalAlpha = 0.7;
ctx.lineWidth = 2.2;
ctx.moveTo(Math.sin(a) * 6, -4);
ctx.quadraticCurveTo(Math.sin(a) * 16, -18 - Math.sin(phase + i) * 3, Math.sin(a) * 8, -28);
ctx.stroke();
}
ctx.globalAlpha = 1;
ctx.beginPath();
ctx.moveTo(-7, -18);
ctx.quadraticCurveTo(-16, -32, -5, -38);
ctx.quadraticCurveTo(-2, -26, -3, -16);
ctx.fillStyle = GOLD_MID;
ctx.fill();
ctx.beginPath();
ctx.moveTo(7, -18);
ctx.quadraticCurveTo(16, -32, 5, -38);
ctx.quadraticCurveTo(2, -26, 3, -16);
ctx.fill();
const g = ctx.createRadialGradient(-4, -4, 2, 0, 4, 20);
g.addColorStop(0, GOLD_HI);
g.addColorStop(0.45, GOLD);
g.addColorStop(1, GOLD_DEEP);
ctx.fillStyle = g;
fillOval(ctx, 0, 2, 16, 18, 0);
ctx.fillStyle = GOLD_MID;
fillOval(ctx, 0, 10, 9, 8, 0);
for (const sx of [-6.5, 6.5]) {
ctx.fillStyle = '#3a1a00';
fillOval(ctx, sx, -2, 3.2, 3.6, 0);
ctx.fillStyle = '#ffe566';
fillOval(ctx, sx, -2.4, 1.5, 1.7, 0);
ctx.fillStyle = '#fff';
fillOval(ctx, sx - 0.5, -3, 0.6, 0.6, 0);
}
ctx.strokeStyle = GOLD_HI;
ctx.lineWidth = 1.15;
ctx.globalAlpha = 0.9;
for (const side of [-1, 1]) {
ctx.beginPath();
ctx.moveTo(side * 12, 6);
ctx.quadraticCurveTo(side * 36, 10 + Math.sin(phase) * 2, side * 42, 22);
ctx.stroke();
ctx.beginPath();
ctx.moveTo(side * 10, 9);
ctx.quadraticCurveTo(side * 28, 18, side * 34, 28);
ctx.stroke();
}
ctx.globalAlpha = 1;
ctx.restore();
}
function drawSparks(
ctx: CanvasRenderingContext2D,
cx: number,
cy: number,
r: number,
phase: number,
) {
for (let i = 0; i < 28; i++) {
const a = (i / 28) * Math.PI * 2 + phase * 0.35;
const rr = r * (0.72 + ((i * 17) % 10) / 40);
const x = cx + Math.cos(a) * rr + Math.sin(phase * 1.4 + i) * 4;
const y = cy + Math.sin(a) * rr + Math.cos(phase * 1.1 + i) * 3;
const s = 1.1 + (i % 5) * 0.35;
ctx.beginPath();
ctx.globalAlpha = 0.25 + (Math.sin(phase * 2 + i) + 1) * 0.25;
ctx.fillStyle = i % 3 === 0 ? GOLD_HI : GOLD;
ctx.arc(x, y, s, 0, Math.PI * 2);
ctx.fill();
}
ctx.globalAlpha = 1;
}
export function drawJiuzuDragonFrame(
ctx: CanvasRenderingContext2D,
width: number,
height: number,
elapsedMs: number,
) {
const cx = width / 2;
const cy = height * 0.42;
const radius = Math.min(width, height) * 0.3;
const fadeIn = Math.min(1, elapsedMs / 380);
const spinT = Math.min(1, Math.max(0, (elapsedMs - 120) / 2050));
const flyT = Math.min(1, Math.max(0, (elapsedMs - 2200) / 1200));
const spin = spinT * Math.PI * 2;
const fly = easeInCubic(flyT);
const phase = elapsedMs / 220;
ctx.clearRect(0, 0, width, height);
ctx.save();
ctx.globalAlpha = fadeIn * (1 - fly);
ctx.translate(cx, cy + fly * -height * 0.42);
ctx.scale(1 + fly * 0.55, 1 + fly * 0.55);
ctx.rotate(spin);
ctx.translate(-cx, -cy);
const pts = buildSpine(cx, cy, radius, phase, 56);
strokeRibbon(ctx, pts, 2.4, 'rgba(255, 191, 0, 0.18)', 1);
strokeRibbon(ctx, pts, 1.55, 'rgba(255, 214, 80, 0.4)', 1);
ctx.save();
ctx.lineCap = 'round';
ctx.lineJoin = 'round';
ctx.beginPath();
ctx.moveTo(pts[0].x, pts[0].y);
for (let i = 1; i < pts.length; i++) ctx.lineTo(pts[i].x, pts[i].y);
const bodyGrad = ctx.createLinearGradient(cx - radius, cy, cx + radius, cy);
bodyGrad.addColorStop(0, GOLD_DEEP);
bodyGrad.addColorStop(0.5, GOLD);
bodyGrad.addColorStop(1, GOLD_HI);
ctx.strokeStyle = bodyGrad;
ctx.lineWidth = pts[0].w * 1.15;
ctx.shadowColor = 'rgba(255, 191, 0, 0.7)';
ctx.shadowBlur = 16;
ctx.stroke();
ctx.shadowBlur = 0;
ctx.restore();
drawScales(ctx, pts);
drawSpines(ctx, pts);
drawClaw(ctx, pts[Math.floor(pts.length * 0.32)], 1);
drawClaw(ctx, pts[Math.floor(pts.length * 0.68)], -1);
drawHead(ctx, pts[0], phase);
drawSparks(ctx, cx, cy, radius, phase);
ctx.restore();
}
export function scheduleDragonFrame(
canvas: DragonCanvasNode,
cb: (time: number) => void,
): number {
if (typeof canvas.requestAnimationFrame === 'function') {
return canvas.requestAnimationFrame(cb);
}
return requestAnimationFrame(cb);
}
export function cancelDragonFrame(canvas: DragonCanvasNode, id: number) {
if (typeof canvas.cancelAnimationFrame === 'function') {
canvas.cancelAnimationFrame(id);
return;
}
cancelAnimationFrame(id);
}
+22
View File
@@ -0,0 +1,22 @@
import Taro from '@tarojs/taro';
import { JIUZU_SPLASH_GIF_URL, JIUZU_SPLASH_MARK_URL } from '@dukang/shared-types';
/** 冷启动会话内是否已播过「酒祖杜康」开场(进程级,切 Tab 不重播) */
let played = false;
export function hasJiuzuSplashPlayed() {
return played;
}
export function markJiuzuSplashPlayed() {
played = true;
}
/** 冷启动预拉 OSS 开场图(仅 weappH5 的 getImageInfo 会走 CORS */
export function prefetchJiuzuSplashAssets() {
if (played) return;
if (process.env.TARO_ENV !== 'weapp') return;
void Taro.getImageInfo({ src: JIUZU_SPLASH_GIF_URL }).catch(() => {});
void Taro.getImageInfo({ src: JIUZU_SPLASH_MARK_URL }).catch(() => {});
}
+4 -4
View File
@@ -13,9 +13,9 @@ import BenefitSloganBar from '../../components/BenefitSloganBar';
import { BENEFIT_GIFT_TAG, BENEFIT_TAG } from '../../lib/benefit-copy'; import { BENEFIT_GIFT_TAG, BENEFIT_TAG } from '../../lib/benefit-copy';
import WechatShareReady from '../../components/WechatShareReady'; import WechatShareReady from '../../components/WechatShareReady';
import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar'; import UserTabBar, { shouldRenderPageTabBar, syncTabBarSelected } from '../../components/UserTabBar';
import HomeSplash from '../../components/HomeSplash'; import JiuzuSplash from '../../components/JiuzuSplash';
import { goLogin } from '../../lib/auth-nav'; import { goLogin } from '../../lib/auth-nav';
import { hasHomeSplashPlayed } from '../../lib/home-splash'; import { hasJiuzuSplashPlayed } from '../../lib/jiuzu-splash';
import { getToken, isLoggedIn, request, toast } from '../../lib/api'; import { getToken, isLoggedIn, request, toast } from '../../lib/api';
import { import {
getHomeCatalogCache, getHomeCatalogCache,
@@ -83,7 +83,7 @@ function formatBenefitCorner(p: Product): string {
} }
export default function HomePage() { export default function HomePage() {
const [showSplash, setShowSplash] = useState(() => !hasHomeSplashPlayed()); const [showSplash, setShowSplash] = useState(() => !hasJiuzuSplashPlayed());
const [activeAroma, setActiveAroma] = useState<AromaKey>('QINGXIANG'); const [activeAroma, setActiveAroma] = useState<AromaKey>('QINGXIANG');
const [products, setProducts] = useState<Product[]>([]); const [products, setProducts] = useState<Product[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@@ -428,7 +428,7 @@ export default function HomePage() {
) : null} ) : null}
{shouldRenderPageTabBar() && !showSplash ? <UserTabBar selected={0} /> : null} {shouldRenderPageTabBar() && !showSplash ? <UserTabBar selected={0} /> : null}
{showSplash ? <HomeSplash onDone={() => setShowSplash(false)} /> : null} {showSplash ? <JiuzuSplash onDone={() => setShowSplash(false)} /> : null}
</PageShell> </PageShell>
); );
} }
+1 -1
View File
@@ -113,7 +113,7 @@
**HQ 财务打款信息**`admin-web` 财务四页,v3.5.6): **HQ 财务打款信息**`admin-web` 财务四页,v3.5.6):
- 门店/合伙人/酒厂/物流账单列表、详情、导出展示收款账户(户名、账号、开户行) - 门店/合伙人/酒厂/物流账单列表、详情、导出展示收款账户(户名、账号、开户行)
- 确认打款时可填写打款凭证号(`paymentRef`),并可上传凭证照片(`paymentProofUrls`,最多 9 张);已打款后在详情与导出中展示 - 确认打款时可填写打款凭证号(`paymentRef`),已打款后在详情与导出中展示
- 门店账单统一列表:T+1 终态「已打款」、手动提现终态「已结算」(均为 `PAID`,文案区分业务类型) - 门店账单统一列表:T+1 终态「已打款」、手动提现终态「已结算」(均为 `PAID`,文案区分业务类型)
- 门店 T+1「出账日」= 出账当天(核销窗口「昨日 00:00–今日 00:00」中的今天) - 门店 T+1「出账日」= 出账当天(核销窗口「昨日 00:00–今日 00:00」中的今天)
- 核销详情展示核销门店主账户收款信息 - 核销详情展示核销门店主账户收款信息
-1
View File
@@ -71,7 +71,6 @@
| 日期 | 说明 | | 日期 | 说明 |
|------|------| |------|------|
| 2026-08-30 | HQ 门店账单确认打款支持上传凭证照片(`payment_proof_urls` |
| 2026-08-26 | v3.5.14`order_submit`/`pay_success` 埋点改用真实 `clientApp`;线上这两类 `USER_H5` 回填为 `USER_MINI` | | 2026-08-26 | v3.5.14`order_submit`/`pay_success` 埋点改用真实 `clientApp`;线上这两类 `USER_H5` 回填为 `USER_MINI` |
| 2026-08-26 | v3.5.12:订单大屏循环 BGM;HQ 日志/订单状态流转/用户行为时间线英文码改中文;修复删除门店分类后被 `ensureDefaults` 回种;HQ 侧栏按业务前 11 项重排、系统设置置底 | | 2026-08-26 | v3.5.12:订单大屏循环 BGM;HQ 日志/订单状态流转/用户行为时间线英文码改中文;修复删除门店分类后被 `ensureDefaults` 回种;HQ 侧栏按业务前 11 项重排、系统设置置底 |
| 2026-08-26 | v3.5.11:城市三种履约起购;企微补提交人/订单规格物流收货/核销用户(昵称+明文手机+HQ备注);`alert.settlement` 改名「结算任务失败通知」归入系统监控;补提现通过与四账单(城市/合伙人、笔数、累计金额、收款人账号开户行) | | 2026-08-26 | v3.5.11:城市三种履约起购;企微补提交人/订单规格物流收货/核销用户(昵称+明文手机+HQ备注);`alert.settlement` 改名「结算任务失败通知」归入系统监控;补提现通过与四账单(城市/合伙人、笔数、累计金额、收款人账号开户行) |
-2
View File
@@ -54,8 +54,6 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd
**用户日志端(v3.5.14**`order_submit` / `pay_success``clientApp` 取 JWT(小程序 `USER_MINI`);微信支付回调沿用该订单已有埋点,缺省小程序。禁止再写死 `USER_H5` **用户日志端(v3.5.14**`order_submit` / `pay_success``clientApp` 取 JWT(小程序 `USER_MINI`);微信支付回调沿用该订单已有埋点,缺省小程序。禁止再写死 `USER_H5`
**HQ 门店账单打款凭证**:确认打款 / 提现通过可填 `paymentRef`,并可上传照片(`paymentProofUrls`OSS `PAYMENT_PROOF`,最多 9 张)。详情与 T+1 导出展示。
**合伙人关联与订单佣金(v4.0.1)**:规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定;`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入(禁止区县解析)。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`(勿写 `hq_remark`)。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`(关联用户 / 当前关联用户已付购酒单,本日/本月)· `GET /partner/assoc/users?keyword&sort`(合伙人侧返回 `partnerRemark`,不返回 `hqRemark`)· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword``assocPartnerAccountId``none` / `any` / 主账号 ID)· `GET /admin/orders` 支持 `assocPartnerAccountId`(筛本单快照,`none`=无快照)· `PUT /admin/users/:id/assoc`(权限 `users_partner_assoc`)改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))` **合伙人关联与订单佣金(v4.0.1)**:规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定;`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入(禁止区县解析)。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`(勿写 `hq_remark`)。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`(关联用户 / 当前关联用户已付购酒单,本日/本月)· `GET /partner/assoc/users?keyword&sort`(合伙人侧返回 `partnerRemark`,不返回 `hqRemark`)· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword``assocPartnerAccountId``none` / `any` / 主账号 ID)· `GET /admin/orders` 支持 `assocPartnerAccountId`(筛本单快照,`none`=无快照)· `PUT /admin/users/:id/assoc`(权限 `users_partner_assoc`)改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`
## 5. 验收用例(必过) ## 5. 验收用例(必过)
+6 -3
View File
@@ -54,13 +54,16 @@ export const BRAND_LOGO_MARK_URL = `${BRAND_LOGO_OSS_BASE}logo2.png`;
/** 小程序静态资源根路径(默认;系统设置 MINI_USER_STATIC_OSS_BASE 可覆盖) */ /** 小程序静态资源根路径(默认;系统设置 MINI_USER_STATIC_OSS_BASE 可覆盖) */
export const MINI_USER_STATIC_OSS_BASE = export const MINI_USER_STATIC_OSS_BASE =
'https://dukang-prod.oss-cn-hangzhou.aliyuncs.com/static/mini-user/'; 'https://dukang-dev.oss-cn-beijing.aliyuncs.com/static/mini-user/';
/** 「我的」页资质公示长图(默认;系统设置 QUALIFICATION_DISCLOSURE_URL 可覆盖) */ /** 「我的」页资质公示长图(默认;系统设置 QUALIFICATION_DISCLOSURE_URL 可覆盖) */
export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualification-disclosure.png`; export const QUALIFICATION_DISCLOSURE_URL = `${MINI_USER_STATIC_OSS_BASE}qualification-disclosure.png`;
/** 首页开场酒瓶图(不进主包,走 OSS */ /** 小程序开场金龙 GIF(冷启动;不进主包,走 OSS */
export const HOME_SPLASH_BOTTLE_URL = `${MINI_USER_STATIC_OSS_BASE}home-splash-bottle.png`; export const JIUZU_SPLASH_GIF_URL = `${MINI_USER_STATIC_OSS_BASE}jiuzu-dragon.gif`;
/** 小程序开场酒祖印记图(冷启动;不进主包,走 OSS) */
export const JIUZU_SPLASH_MARK_URL = `${MINI_USER_STATIC_OSS_BASE}jiuzu-dragon-mark.png`;
/** 总部客服电话(默认;系统设置 CUSTOMER_SERVICE_PHONE 可覆盖) */ /** 总部客服电话(默认;系统设置 CUSTOMER_SERVICE_PHONE 可覆盖) */
export const CUSTOMER_SERVICE_PHONE = '13203801799'; export const CUSTOMER_SERVICE_PHONE = '13203801799';
-11
View File
@@ -66,14 +66,6 @@ export interface StoreWithdrawSummaryDto {
bankAccount?: StoreWithdrawBankAccountDto | null; bankAccount?: StoreWithdrawBankAccountDto | null;
} }
/** 确认打款 / 提现通过时可附带的凭证照片上限 */
export const PAYMENT_PROOF_IMAGE_MAX_COUNT = 9;
export interface ConfirmFinancePayDto {
paymentRef?: string;
paymentProofUrls?: string[];
}
export interface StoreWithdrawRequestDto { export interface StoreWithdrawRequestDto {
id: string; id: string;
withdrawNo: string; withdrawNo: string;
@@ -86,7 +78,6 @@ export interface StoreWithdrawRequestDto {
reviewedAt?: string | null; reviewedAt?: string | null;
paidAt?: string | null; paidAt?: string | null;
paymentRef?: string | null; paymentRef?: string | null;
paymentProofUrls?: string[];
} }
export interface StorePayoutDto { export interface StorePayoutDto {
@@ -180,8 +171,6 @@ export interface StoreBillDto {
payoutAmount: number; payoutAmount: number;
status: FinancePayStatus; status: FinancePayStatus;
paidAt?: string | null; paidAt?: string | null;
paymentRef?: string | null;
paymentProofUrls?: string[];
} }
export interface WineryBillDto { export interface WineryBillDto {
-122
View File
@@ -1,122 +0,0 @@
/**
* 把本地文件上传到 OSS `static/mini-user/`(不进小程序主包)。
* 凭证优先读 system_config,其次 server/dukang-api/.env。
*
* 用法:node scripts/upload-mini-user-static.mjs <localFile> [objectName]
*/
import { readFileSync, existsSync } from 'node:fs';
import { basename, resolve, dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { createRequire } from 'node:module';
const __dirname = dirname(fileURLToPath(import.meta.url));
const root = resolve(__dirname, '..');
const apiRoot = resolve(root, 'server/dukang-api');
const require = createRequire(resolve(apiRoot, 'package.json'));
const OSS = require('ali-oss');
const { PrismaClient } = require('@prisma/client');
function loadEnvFile(path) {
if (!existsSync(path)) return;
for (const line of readFileSync(path, 'utf8').split(/\r?\n/)) {
const trimmed = line.trim();
if (!trimmed || trimmed.startsWith('#')) continue;
const eq = trimmed.indexOf('=');
if (eq <= 0) continue;
const key = trimmed.slice(0, eq).trim();
let value = trimmed.slice(eq + 1).trim();
if (
(value.startsWith('"') && value.endsWith('"')) ||
(value.startsWith("'") && value.endsWith("'"))
) {
value = value.slice(1, -1);
}
if (process.env[key] === undefined) process.env[key] = value;
}
}
loadEnvFile(resolve(apiRoot, '.env'));
loadEnvFile(resolve(apiRoot, '.env.local'));
const localFile = process.argv[2];
if (!localFile) {
console.error('用法:node scripts/upload-mini-user-static.mjs <localFile> [objectName]');
process.exit(1);
}
const absFile = resolve(process.cwd(), localFile);
if (!existsSync(absFile)) {
console.error(`文件不存在:${absFile}`);
process.exit(1);
}
const objectName = process.argv[3] || basename(absFile);
const ossKey = `static/mini-user/${objectName.replace(/^\/+/, '')}`;
const prisma = new PrismaClient();
const rows = await prisma.systemConfig.findMany({
where: {
configKey: {
in: [
'OSS_ACCESS_KEY_ID',
'OSS_ACCESS_KEY_SECRET',
'OSS_BUCKET',
'OSS_REGION',
'OSS_ENDPOINT',
'OSS_CDN_BASE',
'OSS_AUTHORIZATION_V4',
'MINI_USER_STATIC_OSS_BASE',
],
},
},
});
await prisma.$disconnect();
for (const row of rows) {
if (row.value?.trim()) process.env[row.configKey] = row.value.trim();
}
const accessKeyId = process.env.OSS_ACCESS_KEY_ID ?? '';
const accessKeySecret = process.env.OSS_ACCESS_KEY_SECRET ?? '';
const bucket = process.env.OSS_BUCKET ?? '';
const region = process.env.OSS_REGION ?? 'oss-cn-hangzhou';
const endpoint = process.env.OSS_ENDPOINT ?? '';
const cdnBase = (process.env.OSS_CDN_BASE ?? '').replace(/\/$/, '');
const staticBase = (process.env.MINI_USER_STATIC_OSS_BASE ?? '').replace(/\/$/, '/');
if (!accessKeyId || !accessKeySecret || !bucket) {
console.error('OSS 未配置:请在 HQ 系统设置或 .env 填写 OSS_ACCESS_KEY_ID / SECRET / BUCKET');
process.exit(1);
}
const client = new OSS({
region,
accessKeyId,
accessKeySecret,
bucket,
...(endpoint ? { endpoint } : {}),
...(process.env.OSS_AUTHORIZATION_V4 === 'true' ? { authorizationV4: true } : {}),
});
const mime =
absFile.endsWith('.png')
? 'image/png'
: absFile.endsWith('.gif')
? 'image/gif'
: absFile.endsWith('.jpg') || absFile.endsWith('.jpeg')
? 'image/jpeg'
: 'application/octet-stream';
const result = await client.put(ossKey, absFile, {
mime,
headers: {
'Content-Disposition': 'inline',
'Cache-Control': 'public, max-age=31536000',
},
});
const publicUrl =
(staticBase ? `${staticBase}${objectName}` : '') ||
(cdnBase ? `${cdnBase}/${ossKey}` : result.url);
console.log(`uploaded bucket=${bucket} region=${region}`);
console.log(`key=${ossKey}`);
console.log(`url=${publicUrl}`);
@@ -1,5 +0,0 @@
-- 门店账单 / 手动提现:确认打款凭证照片
ALTER TABLE `store_bill`
ADD COLUMN `payment_proof_urls` JSON NULL AFTER `payment_ref`;
ALTER TABLE `store_withdraw_request`
ADD COLUMN `payment_proof_urls` JSON NULL AFTER `payment_ref`;
+7 -9
View File
@@ -1953,11 +1953,10 @@ model StoreBill {
redeemAmount Decimal @map("redeem_amount") @db.Decimal(10, 2) redeemAmount Decimal @map("redeem_amount") @db.Decimal(10, 2)
settlementRate Decimal @map("settlement_rate") @db.Decimal(5, 4) settlementRate Decimal @map("settlement_rate") @db.Decimal(5, 4)
payoutAmount Decimal @map("payout_amount") @db.Decimal(10, 2) payoutAmount Decimal @map("payout_amount") @db.Decimal(10, 2)
status FinancePayStatus @default(UNPAID) status FinancePayStatus @default(UNPAID)
paymentRef String? @map("payment_ref") @db.VarChar(128) paymentRef String? @map("payment_ref") @db.VarChar(128)
paymentProofUrls Json? @map("payment_proof_urls") paidAt DateTime? @map("paid_at") @db.DateTime(3)
paidAt DateTime? @map("paid_at") @db.DateTime(3) createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
store Store @relation(fields: [storeId], references: [id], onDelete: Restrict) store Store @relation(fields: [storeId], references: [id], onDelete: Restrict)
payouts StorePayout[] payouts StorePayout[]
@@ -2003,10 +2002,9 @@ model StoreWithdrawRequest {
appliedAt DateTime @default(now()) @map("applied_at") @db.DateTime(3) appliedAt DateTime @default(now()) @map("applied_at") @db.DateTime(3)
reviewedAt DateTime? @map("reviewed_at") @db.DateTime(3) reviewedAt DateTime? @map("reviewed_at") @db.DateTime(3)
reviewedByHqId BigInt? @map("reviewed_by_hq_id") @db.UnsignedBigInt reviewedByHqId BigInt? @map("reviewed_by_hq_id") @db.UnsignedBigInt
paidAt DateTime? @map("paid_at") @db.DateTime(3) paidAt DateTime? @map("paid_at") @db.DateTime(3)
paymentRef String? @map("payment_ref") @db.VarChar(128) paymentRef String? @map("payment_ref") @db.VarChar(128)
paymentProofUrls Json? @map("payment_proof_urls") createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
updatedAt DateTime @updatedAt @map("updated_at") @db.DateTime(3) updatedAt DateTime @updatedAt @map("updated_at") @db.DateTime(3)
store Store @relation(fields: [storeId], references: [id], onDelete: Restrict) store Store @relation(fields: [storeId], references: [id], onDelete: Restrict)
@@ -133,7 +133,7 @@ export class AdminStoreWithdrawController {
approve( approve(
@CurrentUser() user: AuthUser, @CurrentUser() user: AuthUser,
@Param('id') id: string, @Param('id') id: string,
@Body() body: { paymentRef?: string; paymentProofUrls?: string[] }, @Body() body: { paymentRef?: string },
) { ) {
return this.settlementService.approveStoreWithdraw(BigInt(id), user.actorId, body); return this.settlementService.approveStoreWithdraw(BigInt(id), user.actorId, body);
} }
@@ -287,10 +287,8 @@ export class AdminStoreBillController {
batch: true, batch: true,
includeBody: true, includeBody: true,
}) })
batchConfirm( batchConfirm(@Body() body: { ids: string[] }) {
@Body() body: { ids: string[]; paymentRef?: string; paymentProofUrls?: string[] }, return this.settlementService.batchConfirmStoreBills(body.ids ?? []);
) {
return this.settlementService.batchConfirmStoreBills(body.ids ?? [], body);
} }
@Get(':id') @Get(':id')
@@ -304,10 +302,7 @@ export class AdminStoreBillController {
refType: 'STORE_BILL', refType: 'STORE_BILL',
refIdParam: 'id', refIdParam: 'id',
}) })
confirm( confirm(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
@Param('id') id: string,
@Body() body: { paymentRef?: string; paymentProofUrls?: string[] },
) {
return this.settlementService.confirmStoreBill(BigInt(id), body); return this.settlementService.confirmStoreBill(BigInt(id), body);
} }
} }
@@ -4,7 +4,6 @@ import {
DEFAULT_STORE_WITHDRAW_DAILY_LIMIT, DEFAULT_STORE_WITHDRAW_DAILY_LIMIT,
DEFAULT_XFX_LOGISTICS_PRICING, DEFAULT_XFX_LOGISTICS_PRICING,
LOGISTICS_SETTLEMENT_METHOD_LABELS, LOGISTICS_SETTLEMENT_METHOD_LABELS,
PAYMENT_PROOF_IMAGE_MAX_COUNT,
WINERY_SETTLEMENT_LAG_DAYS, WINERY_SETTLEMENT_LAG_DAYS,
WINERY_SETTLEMENT_RATE, WINERY_SETTLEMENT_RATE,
} from '@dukang/shared-types'; } from '@dukang/shared-types';
@@ -51,19 +50,6 @@ function csvEscape(value: string) {
return value; return value;
} }
function parsePaymentProofUrls(raw: unknown): string[] {
if (!Array.isArray(raw)) return [];
return raw
.map((u) => String(u ?? '').trim())
.filter((u) => /^https?:\/\//i.test(u))
.slice(0, PAYMENT_PROOF_IMAGE_MAX_COUNT);
}
function paymentProofUrlsInput(urls?: string[]): Prisma.InputJsonValue | typeof Prisma.JsonNull {
const parsed = parsePaymentProofUrls(urls);
return parsed.length ? (parsed as Prisma.InputJsonValue) : Prisma.JsonNull;
}
/** 上海时区自然日 00:00(用本地 Date 构造;服务器需设 Asia/Shanghai 或等价) */ /** 上海时区自然日 00:00(用本地 Date 构造;服务器需设 Asia/Shanghai 或等价) */
function startOfDay(d: Date) { function startOfDay(d: Date) {
return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0, 0); return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0, 0);
@@ -729,7 +715,6 @@ export class SettlementService implements OnModuleInit {
if (!row) throw new NotFoundException('提现申请不存在'); if (!row) throw new NotFoundException('提现申请不存在');
return serializeBigInt({ return serializeBigInt({
...row, ...row,
paymentProofUrls: parsePaymentProofUrls(row.paymentProofUrls),
overdue: overdue:
row.status === 'PENDING_REVIEW' ? isWithdrawOverdue(row.appliedAt) : false, row.status === 'PENDING_REVIEW' ? isWithdrawOverdue(row.appliedAt) : false,
}); });
@@ -738,7 +723,7 @@ export class SettlementService implements OnModuleInit {
async approveStoreWithdraw( async approveStoreWithdraw(
id: bigint, id: bigint,
hqAccountId: bigint, hqAccountId: bigint,
dto?: { paymentRef?: string; paymentProofUrls?: string[] }, dto?: { paymentRef?: string },
) { ) {
const row = await this.prisma.storeWithdrawRequest.findUnique({ const row = await this.prisma.storeWithdrawRequest.findUnique({
where: { id }, where: { id },
@@ -759,7 +744,6 @@ export class SettlementService implements OnModuleInit {
reviewedByHqId: hqAccountId, reviewedByHqId: hqAccountId,
paidAt, paidAt,
paymentRef: dto?.paymentRef?.trim() || null, paymentRef: dto?.paymentRef?.trim() || null,
paymentProofUrls: paymentProofUrlsInput(dto?.paymentProofUrls),
}, },
}); });
await tx.storePayout.updateMany({ await tx.storePayout.updateMany({
@@ -780,7 +764,6 @@ export class SettlementService implements OnModuleInit {
extraJson: { extraJson: {
amount: Number(row.amount), amount: Number(row.amount),
paymentRef: dto?.paymentRef, paymentRef: dto?.paymentRef,
paymentProofCount: parsePaymentProofUrls(dto?.paymentProofUrls).length,
}, },
}); });
@@ -1442,18 +1425,10 @@ export class SettlementService implements OnModuleInit {
}); });
if (!bill) throw new NotFoundException('门店对账单不存在'); if (!bill) throw new NotFoundException('门店对账单不存在');
const storeAccount = await loadStorePrimaryBank(this.prisma, bill.storeId); const storeAccount = await loadStorePrimaryBank(this.prisma, bill.storeId);
return serializeBigInt({ return serializeBigInt({ ...bill, billDate: shanghaiYmd(bill.billDate), storeAccount });
...bill,
billDate: shanghaiYmd(bill.billDate),
storeAccount,
paymentProofUrls: parsePaymentProofUrls(bill.paymentProofUrls),
});
} }
async confirmStoreBill( async confirmStoreBill(id: bigint, dto: { paymentRef?: string } = {}) {
id: bigint,
dto: { paymentRef?: string; paymentProofUrls?: string[] } = {},
) {
const bill = await this.prisma.storeBill.findUnique({ where: { id } }); const bill = await this.prisma.storeBill.findUnique({ where: { id } });
if (!bill) throw new NotFoundException('门店对账单不存在'); if (!bill) throw new NotFoundException('门店对账单不存在');
if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可确认打款'); if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可确认打款');
@@ -1466,7 +1441,6 @@ export class SettlementService implements OnModuleInit {
status: 'PAID', status: 'PAID',
paidAt, paidAt,
paymentRef: dto.paymentRef?.trim() || null, paymentRef: dto.paymentRef?.trim() || null,
paymentProofUrls: paymentProofUrlsInput(dto.paymentProofUrls),
}, },
}); });
await tx.storePayout.updateMany({ await tx.storePayout.updateMany({
@@ -1475,20 +1449,14 @@ export class SettlementService implements OnModuleInit {
}); });
return b; return b;
}); });
return serializeBigInt({ return serializeBigInt(updated);
...updated,
paymentProofUrls: parsePaymentProofUrls(updated.paymentProofUrls),
});
} }
async batchConfirmStoreBills( async batchConfirmStoreBills(ids: string[]) {
ids: string[],
dto: { paymentRef?: string; paymentProofUrls?: string[] } = {},
) {
const results: Array<{ id: string; ok: boolean; message?: string }> = []; const results: Array<{ id: string; ok: boolean; message?: string }> = [];
for (const id of ids) { for (const id of ids) {
try { try {
await this.confirmStoreBill(BigInt(id), dto); await this.confirmStoreBill(BigInt(id));
results.push({ id, ok: true }); results.push({ id, ok: true });
} catch (e) { } catch (e) {
results.push({ id, ok: false, message: e instanceof Error ? e.message : '失败' }); results.push({ id, ok: false, message: e instanceof Error ? e.message : '失败' });
@@ -1525,7 +1493,6 @@ export class SettlementService implements OnModuleInit {
'状态', '状态',
'打款时间', '打款时间',
'打款凭证', '打款凭证',
'打款凭证照片',
'收款户名', '收款户名',
'收款账号', '收款账号',
'开户行', '开户行',
@@ -1544,7 +1511,6 @@ export class SettlementService implements OnModuleInit {
b.status, b.status,
b.paidAt ? b.paidAt.toISOString().slice(0, 19).replace('T', ' ') : '', b.paidAt ? b.paidAt.toISOString().slice(0, 19).replace('T', ' ') : '',
csvEscape(b.paymentRef ?? ''), csvEscape(b.paymentRef ?? ''),
csvEscape(parsePaymentProofUrls(b.paymentProofUrls).join(' ')),
csvEscape(bank?.bankAccountName ?? ''), csvEscape(bank?.bankAccountName ?? ''),
csvEscape(bank?.bankAccountNo ?? ''), csvEscape(bank?.bankAccountNo ?? ''),
csvEscape(bank?.bankBranch ?? ''), csvEscape(bank?.bankBranch ?? ''),