refactor: API 请求整合与 Bug 修复

前端重构:
- 新增 api/ 目录统一管理所有 API 请求
- 所有 stores 和 pages 改为使用 api 模块
- 修复日期格式化函数,支持 Date 对象和 ISO 字符串
- 修复 TransactionItem 使用 CategoryIcon 组件
- 优化 ChartWrapper 区分 H5 和小程序环境

后端修复:
- 修复 auth 中间件 PUBLIC_PATHS 缺少 demo-login
- 修复备份工具命令注入漏洞,改用 execFile
- 修复 stats 路由 type 参数验证
- 优化分类排序为批量 SQL 更新
- 合并迁移和删除为数据库事务原子操作
- 修复交易和统计日期返回格式
- 新增自动备份功能(启动时备份)
This commit is contained in:
2026-06-02 17:41:35 +08:00
parent d5e5655b88
commit db81ad8eb2
26 changed files with 908 additions and 258 deletions

View File

@@ -20,51 +20,129 @@
<view class="cat-list">
<view v-for="cat in currentCategories" :key="cat.id" class="cat-row">
<view class="cat-info">
<view class="cat-info" @tap="cat.is_custom && onEdit(cat)">
<CategoryIcon :label="cat.name[0]" :color="cat.color" :bg-color="cat.color + '15'" size="sm" />
<text class="cat-name">{{ cat.name }}</text>
<text class="cat-badge" v-if="cat.is_custom">自定义</text>
</view>
<view class="cat-actions" v-if="cat.is_custom" @tap="onDelete(cat)">
<Icon name="trash" :size="28" color="#FF6B6B" />
<view class="cat-actions" v-if="cat.is_custom">
<view class="action-btn" @tap="onEdit(cat)">
<Icon name="edit" :size="24" color="#8B7E7E" />
</view>
<view class="action-btn" @tap="onDelete(cat)">
<Icon name="trash" :size="24" color="#FF6B6B" />
</view>
</view>
</view>
</view>
<view class="add-section">
<text class="add-title">添加自定义分类</text>
<view class="add-form">
<input class="add-input" v-model="newName" placeholder="分类名称" maxlength="10" />
<!-- 浮动添加按钮 -->
<view class="fab" @tap="showAddModal = true">
<text class="fab-icon">+</text>
</view>
<!-- 添加弹窗 -->
<view class="modal-mask" v-if="showAddModal" @tap="showAddModal = false">
<view class="modal" @tap.stop>
<text class="modal-title">添加自定义分类</text>
<input class="modal-input" v-model="newName" placeholder="分类名称" maxlength="10" />
<view class="color-picker">
<view
v-for="c in colorOptions" :key="c"
class="color-dot"
:class="{ selected: selectedColor === c }"
:style="{ background: c }"
@tap="selectedColor = c"
/>
</view>
<view class="modal-btns">
<view class="modal-btn cancel" @tap="showAddModal = false">取消</view>
<view class="modal-btn confirm" :class="{ disabled: !newName.trim() }" @tap="onAdd">添加</view>
</view>
</view>
<view class="color-picker">
<view
v-for="c in colorOptions" :key="c"
class="color-dot"
:class="{ selected: selectedColor === c }"
:style="{ background: c }"
@tap="selectedColor = c"
/>
</view>
<!-- 编辑弹窗 -->
<view class="modal-mask" v-if="showEditModal" @tap="showEditModal = false">
<view class="modal" @tap.stop>
<text class="modal-title">编辑分类</text>
<input class="modal-input" v-model="editName" placeholder="分类名称" maxlength="10" />
<view class="color-picker">
<view
v-for="c in colorOptions" :key="c"
class="color-dot"
:class="{ selected: editColor === c }"
:style="{ background: c }"
@tap="editColor = c"
/>
</view>
<view class="modal-btns">
<view class="modal-btn cancel" @tap="showEditModal = false">取消</view>
<view class="modal-btn confirm" @tap="onEditConfirm">确定</view>
</view>
</view>
</view>
<!-- 迁移弹窗 -->
<view class="modal-mask" v-if="showMigrateModal" @tap="showMigrateModal = false">
<view class="modal" @tap.stop>
<text class="modal-title">迁移记录</text>
<text class="modal-desc">{{ deletingCat?.name }}下有 {{ migrateCount }} 条记录请选择迁移到</text>
<scroll-view class="migrate-list" scroll-y>
<view
v-for="cat in migrateTargets"
:key="cat.id"
class="migrate-item"
:class="{ selected: migrateTargetId === cat.id }"
@tap="migrateTargetId = cat.id"
>
<CategoryIcon :label="cat.name[0]" :color="cat.color" :bg-color="cat.color + '15'" size="sm" />
<text class="migrate-name">{{ cat.name }}</text>
</view>
</scroll-view>
<view class="modal-btns">
<view class="modal-btn cancel" @tap="showMigrateModal = false">取消</view>
<view class="modal-btn confirm" :class="{ disabled: !migrateTargetId }" @tap="onMigrateConfirm">确认迁移并删除</view>
</view>
</view>
<view class="add-btn" :class="{ disabled: !newName.trim() }" @tap="onAdd">添加</view>
</view>
</view>
</template>
<script setup lang="ts">
import { ref, computed, onMounted } from 'vue'
import { useCategoryStore } from '@/stores/category'
import { useCategoryStore, type Category } from '@/stores/category'
import { getCategoryTransactionCount } from '@/api/category'
import CategoryIcon from '@/components/CategoryIcon/CategoryIcon.vue'
import Icon from '@/components/Icon/Icon.vue'
import { statusBarHeight } from '@/utils/system'
const catStore = useCategoryStore()
const tabType = ref<'expense' | 'income'>('expense')
const showAddModal = ref(false)
const newName = ref('')
const colorOptions = ['#FF8C69', '#7BC67E', '#5B9BD5', '#FFD700', '#FF69B4', '#8B5CF6', '#F97316', '#06B6D4']
const selectedColor = ref(colorOptions[0])
// 编辑相关
const showEditModal = ref(false)
const editingCat = ref<Category | null>(null)
const editName = ref('')
const editColor = ref('')
// 迁移相关
const showMigrateModal = ref(false)
const deletingCat = ref<Category | null>(null)
const migrateCount = ref(0)
const migrateTargetId = ref<number | null>(null)
const currentCategories = computed(() => catStore.getByType(tabType.value))
// 迁移目标列表(同类型且非当前删除的分类)
const migrateTargets = computed(() => {
return currentCategories.value.filter(c => c.id !== deletingCat.value?.id)
})
onMounted(() => catStore.fetchCategories())
function goBack() {
@@ -83,36 +161,66 @@ async function onAdd() {
type: tabType.value
})
newName.value = ''
showAddModal.value = false
uni.showToast({ title: '添加成功', icon: 'success' })
} catch {
uni.showToast({ title: '添加失败', icon: 'none' })
}
}
async function onDelete(cat: any) {
function onEdit(cat: Category) {
editingCat.value = cat
editName.value = cat.name
editColor.value = cat.color
showEditModal.value = true
}
async function onEditConfirm() {
if (!editingCat.value) return
const name = editName.value.trim()
if (!name) {
uni.showToast({ title: '请输入名称', icon: 'none' })
return
}
try {
// 查询关联记录数
const { request: req } = await import('@/utils/request')
const { count } = await req<{ count: number }>({ url: `/categories/${cat.id}/transaction-count` })
const tip = count > 0
? `该分类下有 ${count} 条记录,删除后会变为"未分类"。`
: '删除后不可恢复。'
uni.showModal({
title: '删除分类',
content: `确定删除「${cat.name}」?${tip}`,
success: async (res) => {
if (res.confirm) {
try {
await catStore.deleteCategory(cat.id)
uni.showToast({ title: '已删除', icon: 'success' })
} catch {
uni.showToast({ title: '删除失败', icon: 'none' })
await catStore.updateCategory(editingCat.value.id, { name, color: editColor.value })
showEditModal.value = false
uni.showToast({ title: '修改成功', icon: 'success' })
} catch {
uni.showToast({ title: '修改失败', icon: 'none' })
}
}
async function onDelete(cat: Category) {
try {
const { count } = await getCategoryTransactionCount(cat.id)
if (count > 0) {
// 有关联记录,需要迁移
deletingCat.value = cat
migrateCount.value = count
migrateTargetId.value = null
showMigrateModal.value = true
} else {
// 无关联记录,直接删除
uni.showModal({
title: '删除分类',
content: `确定删除「${cat.name}」?删除后不可恢复。`,
success: async (res) => {
if (res.confirm) {
try {
await catStore.deleteCategory(cat.id)
uni.showToast({ title: '已删除', icon: 'success' })
} catch {
uni.showToast({ title: '删除失败', icon: 'none' })
}
}
}
}
})
})
}
} catch {
// 查询失败时仍允许删除
// 查询失败时仍允许直接删除
uni.showModal({
title: '删除分类',
content: `确定删除「${cat.name}」?`,
@@ -129,6 +237,21 @@ async function onDelete(cat: any) {
})
}
}
async function onMigrateConfirm() {
if (!deletingCat.value || !migrateTargetId.value) return
try {
// 服务端原子操作:迁移记录 + 删除分类
await catStore.migrateCategory(deletingCat.value.id, migrateTargetId.value)
showMigrateModal.value = false
// 刷新分类列表
await catStore.fetchCategories()
uni.showToast({ title: '已迁移并删除', icon: 'success' })
} catch {
uni.showToast({ title: '操作失败', icon: 'none' })
}
}
</script>
<style lang="scss" scoped>
@@ -207,6 +330,7 @@ async function onDelete(cat: any) {
display: flex;
align-items: center;
gap: 16rpx;
flex: 1;
}
.cat-name { font-size: 28rpx; color: #2D1B1B; font-weight: 500; }
@@ -220,42 +344,43 @@ async function onDelete(cat: any) {
}
.cat-actions {
display: flex;
gap: 8rpx;
}
.action-btn {
width: 64rpx;
height: 64rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
&:active { background: #F0E0D6; }
}
.add-section {
margin: 48rpx 40rpx 0;
padding: 32rpx;
background: #FFFFFF;
border-radius: 32rpx;
border: 2rpx solid #F0E0D6;
}
.add-title {
font-size: 28rpx;
font-weight: 500;
color: #2D1B1B;
display: block;
margin-bottom: 24rpx;
}
.add-form {
.fab {
position: fixed;
right: 40rpx;
bottom: 120rpx;
width: 112rpx;
height: 112rpx;
background: linear-gradient(135deg, #FF8C69, #E67355);
border-radius: 50%;
display: flex;
gap: 16rpx;
margin-bottom: 24rpx;
align-items: center;
justify-content: center;
box-shadow: 8rpx 8rpx 24rpx rgba(255, 140, 105, 0.4);
z-index: 50;
&:active { transform: scale(0.95); }
}
.add-input {
flex: 1;
height: 88rpx;
background: #FFF8F0;
border-radius: 20rpx;
padding: 0 24rpx;
font-size: 28rpx;
.fab-icon {
font-size: 56rpx;
color: #FFFFFF;
font-weight: 300;
line-height: 1;
}
.color-picker {
@@ -279,17 +404,100 @@ async function onDelete(cat: any) {
&:active { opacity: 0.7; }
}
.add-btn {
.modal-mask {
position: fixed;
top: 0; left: 0; right: 0; bottom: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 200;
}
.modal {
width: 600rpx;
background: #FFFFFF;
border-radius: 32rpx;
padding: 48rpx;
}
.modal-title {
font-size: 32rpx;
font-weight: 600;
color: #2D1B1B;
display: block;
text-align: center;
margin-bottom: 32rpx;
}
.modal-desc {
font-size: 28rpx;
color: #8B7E7E;
display: block;
margin-bottom: 24rpx;
}
.modal-input {
width: 100%;
height: 96rpx;
background: #FFF8F0;
border-radius: 24rpx;
padding: 0 32rpx;
font-size: 28rpx;
margin-bottom: 24rpx;
box-sizing: border-box;
}
.migrate-list {
max-height: 400rpx;
margin-bottom: 24rpx;
}
.migrate-item {
display: flex;
align-items: center;
gap: 16rpx;
padding: 20rpx 16rpx;
border-radius: 16rpx;
margin-bottom: 8rpx;
transition: background 0.2s;
&.selected {
background: #FFE8E0;
}
&:active { background: #FFF0E6; }
}
.migrate-name {
font-size: 28rpx;
color: #2D1B1B;
font-weight: 500;
}
.modal-btns {
display: flex;
gap: 24rpx;
}
.modal-btn {
flex: 1;
height: 88rpx;
background: linear-gradient(135deg, #FF8C69, #E67355);
border-radius: 20rpx;
border-radius: 24rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 28rpx;
font-weight: 600;
color: #FFFFFF;
&.cancel {
background: #FFF8F0;
color: #8B7E7E;
}
&.confirm {
background: linear-gradient(135deg, #FF8C69, #E67355);
color: #FFFFFF;
}
&.disabled { opacity: 0.5; }
&:active { opacity: 0.8; }

View File

@@ -117,6 +117,7 @@ import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
import { useTransactionStore } from '@/stores/transaction'
import { useStatsStore } from '@/stores/stats'
import { useBudgetStore } from '@/stores/budget'
import { getOverview } from '@/api/stats'
import { formatAmount, formatAmountRaw } from '@/utils/format'
import { statusBarHeight } from '@/utils/system'
import BudgetBar from '@/components/BudgetBar/BudgetBar.vue'
@@ -173,8 +174,7 @@ async function loadData() {
async function fetchTodayData(today: string) {
try {
const { request } = await import('@/utils/request')
const data = await request<any>({ url: '/stats/overview', data: { startDate: today, endDate: today } })
const data = await getOverview({ startDate: today, endDate: today })
todayExpense.value = data.expense || 0
todayIncome.value = data.income || 0
todayCount.value = data.count || 0

View File

@@ -72,9 +72,9 @@ import { ref, onMounted } from 'vue'
import { useTransactionStore } from '@/stores/transaction'
import { useStatsStore } from '@/stores/stats'
import { useBudgetStore } from '@/stores/budget'
import { getTransactions } from '@/api/transaction'
import { formatAmount } from '@/utils/format'
import { statusBarHeight } from '@/utils/system'
import { request } from '@/utils/request'
import Icon from '@/components/Icon/Icon.vue'
const txStore = useTransactionStore()
@@ -119,7 +119,7 @@ function getLocalDateStr(): string {
async function exportData() {
uni.showLoading({ title: '导出中...' })
try {
const data = await request<any>({ url: '/transactions', data: { page: 1, pageSize: 9999 } })
const data = await getTransactions({ page: 1, pageSize: 9999 })
const list = data.list
if (!list || list.length === 0) {
uni.showToast({ title: '暂无数据', icon: 'none' })

View File

@@ -121,6 +121,8 @@
import { ref, computed, onMounted, watch } from 'vue'
import { onPullDownRefresh } from '@dcloudio/uni-app'
import { useStatsStore } from '@/stores/stats'
import { getTransactions } from '@/api/transaction'
import { getOverview } from '@/api/stats'
import { formatAmount, formatMonth, getCurrentMonth } from '@/utils/format'
import { statusBarHeight } from '@/utils/system'
import Icon from '@/components/Icon/Icon.vue'
@@ -261,11 +263,7 @@ async function fetchMaxSingle() {
const startDate = `${currentMonth.value}-01`
const lastDay = new Date(y, m, 0).getDate()
const endDate = `${currentMonth.value}-${String(lastDay).padStart(2, '0')}`
const { request } = await import('@/utils/request')
const data = await request<any>({
url: '/transactions',
data: { page: 1, pageSize: 1, type: tabType.value, startDate, endDate, sortBy: 'amount' }
})
const data = await getTransactions({ page: 1, pageSize: 1, type: tabType.value, startDate, endDate, sortBy: 'amount' })
maxSingle.value = data.list?.[0]?.amount || 0
} catch {
maxSingle.value = 0
@@ -276,11 +274,7 @@ async function fetchPrevMonthData() {
try {
const [y, m] = currentMonth.value.split('-').map(Number)
const prevMonth = m === 1 ? `${y - 1}-12` : `${y}-${String(m - 1).padStart(2, '0')}`
const { request } = await import('@/utils/request')
const data = await request<any>({
url: '/stats/overview',
data: { month: prevMonth }
})
const data = await getOverview({ month: prevMonth })
prevMonthData.value = data
} catch {
prevMonthData.value = null
@@ -517,7 +511,7 @@ function getBarWidth(amount: number) {
}
.trend-date {
width: 48rpx;
width: 52rpx;
font-size: 24rpx;
color: #8B7E7E;
text-align: right;