diff --git a/src/App.tsx b/src/App.tsx index d91f281..e25c41f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,7 +4,6 @@ import zhCN from 'ant-design-vue/locale/zh_CN'; import { RouterView } from 'vue-router'; import dayjs from 'dayjs'; import 'dayjs/locale/zh-cn'; - dayjs.locale('zh-cn'); /** diff --git a/src/assets/styles/index.less b/src/assets/styles/index.less index 5619000..af15fdb 100644 --- a/src/assets/styles/index.less +++ b/src/assets/styles/index.less @@ -73,6 +73,9 @@ a { column-gap: 16px; row-gap: 12px; flex-shrink: 0; + padding: 16px; + background-color: #fff; + border-radius: 10px; } // 筛选区域操作按钮组:横向 flex @@ -90,12 +93,20 @@ a { display: flex; flex-direction: column; flex: 1; + background-color: #fff; min-height: 0; min-width: 0; margin-top: 16px; overflow: hidden; + border-radius: 10px; } +.page-pagination { + flex-shrink: 0; + display: flex; + justify-content: flex-end; + padding: 14px; +} // ===== antd 组件覆盖 ===== // Tag 默认 margin-right: 8px,会挤开表格列或卡片内间距,统一去掉 diff --git a/src/layouts/BasicLayout.module.less b/src/layouts/BasicLayout.module.less index b3a1f17..412b4a4 100644 --- a/src/layouts/BasicLayout.module.less +++ b/src/layouts/BasicLayout.module.less @@ -34,8 +34,6 @@ .content { margin: 16px; - padding: 24px; - background: #fff; border-radius: 8px; flex: 1; min-height: 0; diff --git a/src/pages/events/banner/components/BannerFormModal.tsx b/src/pages/events/banner/components/BannerFormModal.tsx index dc71c8f..4d2536a 100644 --- a/src/pages/events/banner/components/BannerFormModal.tsx +++ b/src/pages/events/banner/components/BannerFormModal.tsx @@ -12,6 +12,7 @@ import { } from 'ant-design-vue'; import { JUMP_TYPE_OPTIONS, EVENT_OPTIONS, REGION_OPTIONS } from '../model/useBannerModel'; import { uploadFilesOneByOne, OssUploadType } from '@/utils/oss'; +import dayjs from 'dayjs'; import styles from './BannerFormModal.module.less'; /** 默认表单数据 */ @@ -397,9 +398,14 @@ export default defineComponent({ { - formData.displayTimeRange = [v, formData.displayTimeRange?.[1] || '']; + formData.displayTimeRange = [ + v ? v.format('YYYY-MM-DD') : '', + formData.displayTimeRange?.[1] || '', + ]; }} style={{ width: '100%' }} /> @@ -425,9 +431,14 @@ export default defineComponent({ { - formData.displayTimeRange = [formData.displayTimeRange?.[0] || '', v]; + formData.displayTimeRange = [ + formData.displayTimeRange?.[0] || '', + v ? v.format('YYYY-MM-DD') : '', + ]; }} style={{ width: '100%' }} /> diff --git a/src/pages/events/list/index.tsx b/src/pages/events/list/index.tsx index ec18d4c..393b2c5 100644 --- a/src/pages/events/list/index.tsx +++ b/src/pages/events/list/index.tsx @@ -271,14 +271,7 @@ export default defineComponent({ {/* 独立分页,右下方 */} -
+