Merge pull request 'Feature/0723/zr' (#12) from feature/0723/ZR into release/0.01

Reviewed-on: #12
This commit was merged in pull request #12.
This commit is contained in:
2026-08-10 11:23:19 +08:00
4 changed files with 12 additions and 4 deletions
@@ -25,6 +25,8 @@
padding: 12px 16px; padding: 12px 16px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
max-height: 360px;
overflow-y: auto;
} }
.imageGrid { .imageGrid {
+1 -1
View File
@@ -89,7 +89,7 @@ export default defineComponent({
const renderAction = (record: any) => { const renderAction = (record: any) => {
const status = record.status; const status = record.status;
if (status === '0' || status === '1') { if (['0', '1', '2'].includes(status)) {
return ( return (
<Space> <Space>
<Button type="link" size="small" onClick={() => openDetailModal(record)}> <Button type="link" size="small" onClick={() => openDetailModal(record)}>
+6 -2
View File
@@ -180,7 +180,7 @@ export default defineComponent({
}, },
{ {
key: 'totalBalance', key: 'totalBalance',
label: '平台余额(所有用户余额总和)', label: '平台余额(所有用户余额总和 = 总收入 - 提现金额',
value: s.totalBalance, value: s.totalBalance,
bgColor: '#e6f4ff', bgColor: '#e6f4ff',
accentColor: '#1677ff', accentColor: '#1677ff',
@@ -224,7 +224,11 @@ export default defineComponent({
<div class={styles.statValue} style={{ color: item.accentColor }}> <div class={styles.statValue} style={{ color: item.accentColor }}>
¥{formatMoney(item.value)} ¥{formatMoney(item.value)}
</div> </div>
{/* 趋势文字暂时隐藏 */} {/* {item.key === 'totalBalance' && (
<div class={styles.statDesc} style={{ color: 'rgba(0, 0, 0, 0.45)' }}>
= 总收入 - 提现金额
</div>
)} */}
</div> </div>
))} ))}
</div> </div>
@@ -126,7 +126,9 @@ export function useReportsModel() {
// ===== 图表数据 ===== // ===== 图表数据 =====
const chartData = computed(() => { const chartData = computed(() => {
const list = data.value?.monthList || []; const list = data.value?.monthList || [];
return list.map((item) => ({ // 按月份升序排列,确保图表 X 轴时间顺序正确
const sorted = [...list].sort((a, b) => a.month.localeCompare(b.month));
return sorted.map((item) => ({
month: dayjs(item.month).format('MM月'), month: dayjs(item.month).format('MM月'),
order: toNumber(item.orderAmount), order: toNumber(item.orderAmount),
refund: toNumber(item.refundAmount), refund: toNumber(item.refundAmount),