fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s

This commit is contained in:
SunCheng
2026-02-20 14:57:19 +08:00
parent 6e95568906
commit 32d5ed62d0
27 changed files with 1520 additions and 1114 deletions

View File

@@ -209,10 +209,10 @@
</div>
<!-- 关联账单列表弹窗 -->
<PopupContainer
v-model="showBillListModal"
<PopupContainerV2
v-model:show="showBillListModal"
title="关联账单列表"
height="75%"
:height="'75%'"
>
<BillListComponent
data-source="custom"
@@ -225,7 +225,7 @@
@click="handleBillClick"
@delete="handleBillDelete"
/>
</PopupContainer>
</PopupContainerV2>
</div>
<!-- 不记额预算卡片 -->
@@ -406,10 +406,10 @@
</div>
<!-- 关联账单列表弹窗 -->
<PopupContainer
v-model="showBillListModal"
<PopupContainerV2
v-model:show="showBillListModal"
title="关联账单列表"
height="75%"
:height="'75%'"
>
<BillListComponent
data-source="custom"
@@ -422,14 +422,14 @@
@click="handleBillClick"
@delete="handleBillDelete"
/>
</PopupContainer>
</PopupContainerV2>
</div>
</template>
<script setup>
import { computed, ref } from 'vue'
import { BudgetPeriodType } from '@/constants/enums'
import PopupContainer from '@/components/PopupContainer.vue'
import PopupContainerV2 from '@/components/PopupContainerV2.vue'
import BillListComponent from '@/components/Bill/BillListComponent.vue'
import { getTransactionList } from '@/api/transactionRecord'

View File

@@ -187,13 +187,14 @@
</div>
<!-- 详细描述弹窗 -->
<PopupContainer
v-model="showDescriptionPopup"
<PopupContainerV2
v-model:show="showDescriptionPopup"
:title="activeDescTab === 'month' ? '预算额度/实际详情(月度)' : '预算额度/实际详情(年度)'"
height="70%"
:height="'70%'"
>
<div
class="rich-html-content popup-content-padding"
class="rich-html-content"
style="padding: 16px"
v-html="
activeDescTab === 'month'
? overallStats.month?.description ||
@@ -202,14 +203,14 @@
'<p style=\'text-align:center;color:var(--van-text-color-3)\'>暂无数据</p>'
"
/>
</PopupContainer>
</PopupContainerV2>
</template>
<script setup>
import { ref, computed } from 'vue'
import { BudgetCategory, BudgetPeriodType } from '@/constants/enums'
import { getCssVar } from '@/utils/theme'
import PopupContainer from '@/components/PopupContainer.vue'
import PopupContainerV2 from '@/components/PopupContainerV2.vue'
import BaseChart from '@/components/Charts/BaseChart.vue'
import { useChartTheme } from '@/composables/useChartTheme'
import { chartjsGaugePlugin } from '@/plugins/chartjs-gauge-plugin'

View File

@@ -1,18 +1,18 @@
<template>
<PopupContainer
v-model="visible"
<PopupContainerV2
v-model:show="visible"
:title="
isEdit
? `编辑${getCategoryName(form.category)}预算`
: `新增${getCategoryName(form.category)}预算`
"
height="75%"
:height="'75%'"
>
<div class="add-budget-form">
<van-form>
<van-cell-group inset>
<van-field
v-model="form.name"
v-model:show="form.name"
name="name"
label="预算名称"
placeholder="例如:每月餐饮、年度奖金"
@@ -22,7 +22,7 @@
<van-field label="不记额预算">
<template #input>
<van-checkbox
v-model="form.noLimit"
v-model:show="form.noLimit"
@update:model-value="onNoLimitChange"
>
不记额预算
@@ -34,7 +34,7 @@
<template #input>
<div class="mandatory-wrapper">
<van-checkbox
v-model="form.isMandatoryExpense"
v-model:show="form.isMandatoryExpense"
:disabled="form.noLimit"
>
{{ form.category === BudgetCategory.Expense ? '硬性消费' : '硬性收入' }}
@@ -49,7 +49,7 @@
>
<template #input>
<van-radio-group
v-model="form.type"
v-model:show="form.type"
direction="horizontal"
:disabled="isEdit || form.noLimit"
>
@@ -65,7 +65,7 @@
<!-- 仅当未选中"不记额预算"时显示预算金额 -->
<van-field
v-if="!form.noLimit"
v-model="form.limit"
v-model:show="form.limit"
type="number"
name="limit"
label="预算金额"
@@ -95,7 +95,7 @@
</template>
</van-field>
<ClassifySelector
v-model="form.selectedCategories"
v-model:show="form.selectedCategories"
:type="budgetType"
multiple
:show-add="false"
@@ -114,7 +114,7 @@
保存预算
</van-button>
</template>
</PopupContainer>
</PopupContainerV2>
</template>
<script setup>
@@ -122,7 +122,7 @@ import { ref, reactive, computed } from 'vue'
import { showToast } from 'vant'
import { createBudget, updateBudget } from '@/api/budget'
import { BudgetPeriodType, BudgetCategory } from '@/constants/enums'
import PopupContainer from '@/components/PopupContainer.vue'
import PopupContainerV2 from '@/components/PopupContainerV2.vue'
import ClassifySelector from '@/components/ClassifySelector.vue'
const emit = defineEmits(['success'])

View File

@@ -1,8 +1,8 @@
<template>
<PopupContainer
v-model="visible"
<PopupContainerV2
v-model:show="visible"
title="设置存款分类"
height="60%"
:height="'60%'"
>
<div class="savings-config-content">
<div class="config-header">
@@ -16,7 +16,7 @@
可多选分类
</div>
<ClassifySelector
v-model="selectedCategories"
v-model:show="selectedCategories"
:type="2"
multiple
:show-add="false"
@@ -35,14 +35,14 @@
保存配置
</van-button>
</template>
</PopupContainer>
</PopupContainerV2>
</template>
<script setup>
import { ref } from 'vue'
import { showToast, showLoadingToast, closeToast } from 'vant'
import { getConfig, setConfig } from '@/api/config'
import PopupContainer from '@/components/PopupContainer.vue'
import PopupContainerV2 from '@/components/PopupContainerV2.vue'
import ClassifySelector from '@/components/ClassifySelector.vue'
const emit = defineEmits(['success'])