From c395c9f64138e3254f680bc4129f75b02e6894e6 Mon Sep 17 00:00:00 2001 From: kaeery <3491123437@qq.com> Date: Wed, 26 Feb 2025 12:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8B=9B=E7=94=9F=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E3=80=91=20=E6=96=B0=E5=A2=9E#=20=E6=8B=9B=E7=94=9F?= =?UTF-8?q?=E8=80=81=E5=B8=88=E5=92=8C=E7=94=B5=E9=94=80=E8=80=81=E5=B8=88?= =?UTF-8?q?=E7=9A=84=E6=80=BB=E7=BB=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bundle/pages/summary-list/index.vue | 65 +++++++++++++++++++ .../pages/summary-list/summary-card.vue | 32 +++++++++ src/components/date-picker/date-picker.vue | 2 - src/components/date-strip/date-strip-item.vue | 2 +- src/components/date-strip/index.vue | 6 +- src/components/date-strip/stripItemProps.ts | 4 -- src/components/widgets/card/card.vue | 10 ++- .../widgets/date-more/date-more.vue | 32 +++++++++ .../widgets/date-strip/date-strip.vue | 26 -------- .../widgets/navbarComp/navbarComp.vue | 4 +- .../widgets/summary-form/summary-form.vue | 6 +- src/pages.json | 7 ++ src/pages/recruitsale/summary/index.vue | 12 ++-- src/pages/telesale/summary/index.vue | 2 + src/static/iconfont/iconfont.css | 14 +++- 15 files changed, 176 insertions(+), 48 deletions(-) create mode 100644 src/bundle/pages/summary-list/index.vue create mode 100644 src/bundle/pages/summary-list/summary-card.vue create mode 100644 src/components/widgets/date-more/date-more.vue delete mode 100644 src/components/widgets/date-strip/date-strip.vue diff --git a/src/bundle/pages/summary-list/index.vue b/src/bundle/pages/summary-list/index.vue new file mode 100644 index 0000000..ebfde5e --- /dev/null +++ b/src/bundle/pages/summary-list/index.vue @@ -0,0 +1,65 @@ + + + + diff --git a/src/bundle/pages/summary-list/summary-card.vue b/src/bundle/pages/summary-list/summary-card.vue new file mode 100644 index 0000000..b616921 --- /dev/null +++ b/src/bundle/pages/summary-list/summary-card.vue @@ -0,0 +1,32 @@ + + + + diff --git a/src/components/date-picker/date-picker.vue b/src/components/date-picker/date-picker.vue index 960a6dc..e5fb8f8 100644 --- a/src/components/date-picker/date-picker.vue +++ b/src/components/date-picker/date-picker.vue @@ -57,8 +57,6 @@ function handleToggle() { diff --git a/src/components/widgets/date-more/date-more.vue b/src/components/widgets/date-more/date-more.vue new file mode 100644 index 0000000..1dcaf46 --- /dev/null +++ b/src/components/widgets/date-more/date-more.vue @@ -0,0 +1,32 @@ + + + + diff --git a/src/components/widgets/date-strip/date-strip.vue b/src/components/widgets/date-strip/date-strip.vue deleted file mode 100644 index a768232..0000000 --- a/src/components/widgets/date-strip/date-strip.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/src/components/widgets/navbarComp/navbarComp.vue b/src/components/widgets/navbarComp/navbarComp.vue index 23ba364..f5deeba 100644 --- a/src/components/widgets/navbarComp/navbarComp.vue +++ b/src/components/widgets/navbarComp/navbarComp.vue @@ -10,7 +10,8 @@ - {{ title }} + + {{ title }} @@ -43,6 +44,7 @@ const setStyle = computed(() => { width: slots.left ? '80%' : '100%' } }) +const isSlotTitle = computed(() => slots.title) onLoad(() => { const menuButtonInfo = uni.getMenuButtonBoundingClientRect() statusBarHeight.value = menuButtonInfo.top diff --git a/src/components/widgets/summary-form/summary-form.vue b/src/components/widgets/summary-form/summary-form.vue index c2c71fe..5695bed 100644 --- a/src/components/widgets/summary-form/summary-form.vue +++ b/src/components/widgets/summary-form/summary-form.vue @@ -23,7 +23,7 @@ - + 确认 @@ -43,6 +43,10 @@ defineProps({ modelValue: { type: Array as PropType, default: () => [] + }, + readonly: { + type: String, + default: '' } }) const emit = defineEmits(['handleConfirm']) diff --git a/src/pages.json b/src/pages.json index 76c036e..db51a30 100644 --- a/src/pages.json +++ b/src/pages.json @@ -120,6 +120,13 @@ { "root": "bundle", "pages": [ + { + "path": "pages/summary-list/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { "path": "pages/complete_add/index", "style": { diff --git a/src/pages/recruitsale/summary/index.vue b/src/pages/recruitsale/summary/index.vue index 96f41cb..06f1143 100644 --- a/src/pages/recruitsale/summary/index.vue +++ b/src/pages/recruitsale/summary/index.vue @@ -1,7 +1,8 @@ @@ -31,11 +32,14 @@ const templateItems = ref([ { formType: 2, formTitle: '有遇到什么问题', value: '' } ]) const handleConfirm = () => { + if (date <= curDate.value) return console.log(templateItems.value) } -const value = ref(new Date().getTime()) +const curDate = ref(new Date().getTime()) +const type = ref('') + const handleDateChange = item => { - console.log(item) + type.value = item.type } diff --git a/src/pages/telesale/summary/index.vue b/src/pages/telesale/summary/index.vue index bae2787..1dd203c 100644 --- a/src/pages/telesale/summary/index.vue +++ b/src/pages/telesale/summary/index.vue @@ -1,5 +1,6 @@