diff --git a/src/assets/images/reset.png b/src/assets/images/reset.png new file mode 100644 index 0000000..e07f69b Binary files /dev/null and b/src/assets/images/reset.png differ diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index 035df9f..e0d6965 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -67,7 +67,7 @@ function newFilterOk() { filterModalRef.value.pagination.page, filterModalRef.value.pagination.pageSize, ) - filterModalRef.value.showModal() + filterModalRef.value.closeModal() } const mousetrap = inject('mousetrap') as any diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index 0c771b7..907b752 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -310,7 +310,7 @@ function closeModal() { } defineExpose({ - showModal, + showModal,closeModal, query, pagination, }) diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index e498ba0..de73535 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -224,7 +224,8 @@ function newFilterOk() { filterModalRef.value.pagination.page, filterModalRef.value.pagination.pageSize, ) - filterModalRef.value.showModal() + filterModalRef.value.closeModal() + } // 滚动容器,让key对应模块处于可视区域 diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue index 3ff92ab..78773ed 100644 --- a/src/views/home/aside/comp/modals/FilterModal.vue +++ b/src/views/home/aside/comp/modals/FilterModal.vue @@ -358,6 +358,7 @@ function closeModal() { defineExpose({ showModal, + closeModal, query, pagination, }) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 68b60b3..fdc561a 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -263,6 +263,7 @@ async function featchList(userSearchId?: string) { imgName: item.imgname, states: item.states, loadOver: false, + isRepeatHis: item.isRepeatHis, } }) @@ -283,7 +284,10 @@ async function loadMore() { // listData.value = [] // isInitSeaerch.value = false // } + + console.log(more) listData.value.push(...more) + console.log(listData.value) } const gridHeight = computed(() => { @@ -751,11 +755,24 @@ defineExpose({ src="@/assets/images/task/tag-pass.png" alt="" > - + +