diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue index 4cf62a2..12d4eda 100644 --- a/src/components/apartment/seachModule.vue +++ b/src/components/apartment/seachModule.vue @@ -225,7 +225,7 @@ const selectOption = (type, value) => { break; } - console.log(pitchValue.value); + // console.log(pitchValue.value); emit('handleTransfer', pitchValue) } diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue index aabf3e1..f520f9e 100644 --- a/src/views/housingView/apartment.vue +++ b/src/views/housingView/apartment.vue @@ -55,38 +55,40 @@ onUnmounted(() => { window.removeEventListener('scroll', handleScroll); }); -let loading = ref(null) // 加载 +let loading = null // 加载 +let requestLoading = false // 接口加载中 let page = 1 const getData = () => { - - if (page == 0 || loading['visible']) return - - + if (page == 0 || requestLoading) return loading = ElLoading.service({ lock: true, text: 'Loading', background: 'rgba(0, 0, 0, 0.7)', }) + requestLoading = true - proxy.$post("/tenement/pc/api/apartment", { - page + proxy.$get("/tenement/pc/api/apartment", { + page, + ...pitchValue }).then(res => { if (res.code != 200) return let data = res.data list.value = list.value.concat(data.data) - page = data.page * data.limit >= data.count ? 0 : page + 1, - nextTick(() => { - masonryInstance.reloadItems(); - masonryInstance.layout(); - loading.close() - }) + page = data.page * data.limit >= data.count ? 0 : page + 1 + nextTick(() => { + masonryInstance.reloadItems(); + masonryInstance.layout(); + loading.close() + requestLoading = false + }) + }).catch(err => { loading.close() + requestLoading = false }) } - const handleScroll = () => { const scrollHeight = document.documentElement.scrollHeight; const clientHeight = document.documentElement.clientHeight; @@ -100,9 +102,16 @@ const handleScroll = () => { } }; +let pitchValue = {} + // 筛选组件的参数的中转 const handleTransfer = (data) => { - console.log("data", data); + // console.log("data", data.value); + pitchValue = { ...data.value } + // console.log("data", pitchValue); + page = 1 + list.value = [] + getData() }