From d3e9c2d50ccefb24b59ccd712bc344fa857d95b2 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期二, 19 八月 2025 17:15:48 +0800 Subject: [PATCH] fix: bug --- packages/components/src/Input/ChooseInputWithDatePicker.vue | 7 +++++-- apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue | 15 ++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue index 1c4f0c5..b33d8d1 100644 --- a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue @@ -3,7 +3,12 @@ <IncomeDetailListItem :item="'鏀跺叆:锟�600.00'"> <template #title> <div class="income-detail-time-picker"> - <ChooseInputWithPicker v-model="form.month" :value-enum="TaskStatusText" /> + <ChooseInputWithDatePicker + v-model="form.month" + type="year-month" + format="YYYY骞碝鏈�" + :max-date="nowDate" + /> </div> </template> </IncomeDetailListItem> @@ -18,19 +23,19 @@ </template> <script setup lang="ts"> -import { List, IncomeDetailListItem, ChooseInputWithPicker } from '@12333/components'; -import { TaskStatusText, TaskStatus } from '@/constants'; +import { List, IncomeDetailListItem, ChooseInputWithDatePicker } from '@12333/components'; import { useUserStore } from '@/stores/modules/user'; import Taro from '@tarojs/taro'; +import dayjs from 'dayjs'; defineOptions({ name: 'InnerPage', }); const userStore = useUserStore(); - +const nowDate = dayjs().toDate(); const form = reactive({ - month: TaskStatus.All, + month: dayjs().format('YYYY骞碝鏈�'), }); function goIncomeDetailInfo() { diff --git a/packages/components/src/Input/ChooseInputWithDatePicker.vue b/packages/components/src/Input/ChooseInputWithDatePicker.vue index ca4897c..a2d8450 100644 --- a/packages/components/src/Input/ChooseInputWithDatePicker.vue +++ b/packages/components/src/Input/ChooseInputWithDatePicker.vue @@ -18,9 +18,12 @@ minDate?: Date; maxDate?: Date; type?: string; + format?: string; }; -const props = withDefaults(defineProps<Props>(), {}); +const props = withDefaults(defineProps<Props>(), { + format: 'YYYY-MM-DD', +}); const emit = defineEmits<{ (e: 'update:modelValue', val: string | number): void; @@ -49,7 +52,7 @@ type: props.type, maxDate: props.maxDate, onConfirm: ({ selectedValue }) => { - emit('update:modelValue', dayjs(selectedValue.join('-')).format('YYYY-MM-DD')); + emit('update:modelValue', dayjs(selectedValue.join('-')).format(props.format)); onClose(); }, minDate: props.minDate, -- Gitblit v1.9.1