From 68706050a02e6f0fda3c5c3a70b2b664de90b6a0 Mon Sep 17 00:00:00 2001 From: A1300399510 Date: Tue, 25 Feb 2025 19:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=A0=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/detail/timeIcon.png | Bin 0 -> 1882 bytes src/components/public/apartment-item.vue | 4 ++-- .../user/systematic-notification-pop.vue | 19 +++++++++++++----- src/views/detail.vue | 15 +++++++++----- src/views/edit.vue | 1 - src/views/housingView/apartment.vue | 2 +- src/views/housingView/intermediary.vue | 8 +++++++- src/views/housingView/needHousing.vue | 7 +++++++ src/views/housingView/person.vue | 7 +++++++ src/views/seachIndex.vue | 10 ++++----- 10 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 src/assets/img/detail/timeIcon.png diff --git a/src/assets/img/detail/timeIcon.png b/src/assets/img/detail/timeIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..c5a4560cc2d123af5eff44bcb108aad7784f0e46 GIT binary patch literal 1882 zcmV-g2c`IlP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuC#7RU!RCod1TibEsN)R>J-rwsC ztPGYLfpsHTGC+>NQ02#`@uweEa3e5|;Nl1j5iFa5$iV#idC$>~u!OqB=w+jwsws_n zdV2bt>3K+q##Y5?Fc|E;yu2Kso7VgLdkfb+WXEJ&mdQtn`LWSx%y6CU?CeZ?z1}0r zm8C`%mand^S^&`jU>EiYx=5PA)&#chPESusOsT0f0yxso&(9rr=OGsbt$`!~qut%z zyRssqFaajSk1#@AIJc*HUb39iWQZy9Z&4x&5pZ*J(|LP)8-612RURLk&F10p@$q=I z!uCEF0T^`$;eLxwT-%N+)|+5j93mS0to>vr0HfZKIbmD0=AkyG=Xv+dnxu zxv`!bu&Z|Qr z&~|7M5mqFujQ~sVJpdo(1(l~Ai0FcZ!J4*fNk}E&^768ekv&i8WRALao)a1X3;@8R zZS*k$fjyS9B%U~-KSov;OV~~w9F+hw=N>eN81h))+&l*nIL>G}irNMl7iVW@{iw{Q zYz|^PDyxemeEmn8noX$_8im3Cq&muqfHyXOtlEan&Z^Ajo&&&vpii1Uu@I9~FA`u5 zIbwqnz|#*$a7K~|YDtj=34BhuO}5Hh5c@3W+F)5rDwXfwf1i zt|~cBqwkiseK^mzNZOe{W+n|wxC_J@)ZoSes6JoW74?+_>`O-KZ~#ISB;G7ZSnv)* zo6h?rpdmG?SSFs%vi1oAiu&Fl0lw66%K1Q2&m=?mjxse+l(CABm8zH+$KF;<@NwgR z$r`}tb&$XXEN>*t*}jZ-6zVR3=-T@rs{E31zF)rOq(x!@VaWO&K(LLZoWTCB`x7CsF_M2u z!vk!=HpsfEqyU+x$m=B5Fx(SFuni&<#tI^x&kfeV_ay-aNnb(al=1AX*e+dce03DV{ir-R2Sf$fH+|gi zM`d9dE2sLYNvQMHSB5@D|3UGCqwhrPRwG~wN8@f(AzFrE^;46m-dC0R84P{Y`o{oz zt91zi%+E=|Az@V+_x#l4fgK5TUn-(c^o>3$j@(Ocxe^4hF+M!@a1nn@fV{P7Bt*cs z;GdKh22-L=Bw*dACa|(GBv^pwS8eL2Jt6_5iQ$5Vy#!?+0+R64JZyYOKe5EV=>xjd zMxNmLq2xq!OC^8}&~OL?cUoh}9b}TAow!n(7OTQ)f6l&<9nBJbCkCya^29bMDWkIy zR@aVH7m@MLO{r{0baNNYHaCC)b<}CxfcIEVOI8HXfF%i3<B2pTpfFw6h{ z%xJ&NR0#o52N@aoY0Bl#Q<$#~z&HTK$JQ7z1}Hyw_wg>z=VvX*ld?uS>Ql7*KRyoJ U;EV?2ZvX%Q07*qoM6N<$f}x;Qf&c&j literal 0 HcmV?d00001 diff --git a/src/components/public/apartment-item.vue b/src/components/public/apartment-item.vue index de3c553..edef836 100644 --- a/src/components/public/apartment-item.vue +++ b/src/components/public/apartment-item.vue @@ -61,8 +61,8 @@ const goapArtmentDetails = () => { // 点击收藏后传过父组件 const handleCollect1 = uniqid => emit("handlecollect", uniqid) const loadload = () => { - props.masonryInstance.reloadItems() - props.masonryInstance.layout() + props.masonryInstance && props.masonryInstance.reloadItems() + props.masonryInstance && props.masonryInstance.layout() } diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue index 436bcc4..678dd34 100644 --- a/src/components/user/systematic-notification-pop.vue +++ b/src/components/user/systematic-notification-pop.vue @@ -170,6 +170,8 @@ + +
- end -
@@ -204,13 +206,13 @@ let qrcode = ref("") // 关注二维码 let issubscribe = ref(0) // 是否已经关注公众号 let list = ref([]) // 列表数据 let state = ref(false) // 请求状态 -let page = 1 // 页数 +let page = ref(1) // 页数 const init = () => { - if (page == 0 || state.value) return + if (page.value == 0 || state.value) return state.value = true proxy .$post("/tenement/pc/api/user/messageList", { - page, + page: page.value, }) .then(res => { if (res.code != 200) { @@ -222,7 +224,7 @@ const init = () => { qrcode.value = data["qrcode"] issubscribe.value = data["issubscribe"] list.value = list.value.concat(data["data"]) - page = data["page"] * data["limit"] < data["count"] ? page + 1 : 0 + page.value = data["page"] * data["limit"] < data["count"] ? page.value + 1 : 0 show.value = true }) .catch(err => { @@ -234,7 +236,7 @@ const init = () => { } const handleScroll = event => { - if (page == 0 || state.value) return + if (page.value == 0 || state.value) return const scrollContainer = event.target // 获取滚动容器元素 const scrollHeight = scrollContainer.scrollHeight // 元素内容的总高度 const scrollTop = scrollContainer.scrollTop // 滚动条距离滚动容器顶部的距离 @@ -448,6 +450,13 @@ const goDetail = (uniqid, status) => { } } } + + .end { + color: #7f7f7f; + font-size: 13px; + text-align: center; + margin: 10px 0; + } } .QR-code { diff --git a/src/views/detail.vue b/src/views/detail.vue index d2e282e..4867a63 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -6,7 +6,7 @@
-
+
@@ -497,7 +497,7 @@
- + {{ checkUpdateTime(housingInfo["data"] && housingInfo["data"].info.updatetime) }}更新
@@ -1840,6 +1840,12 @@ img { bottom: 10px; z-index: 1002; + &.intermediary { + .line { + margin: 0 10px; + } + } + .line { width: 1px; height: 19px; @@ -1921,7 +1927,7 @@ img { width: 199px; height: 48px; background: inherit; - background-color: #f3f5f6; + background-color: #f3f5f6; box-sizing: border-box; border-width: 1px; border-style: solid; @@ -2188,7 +2194,7 @@ img { font-family: "Arial-Black", "Arial Black", sans-serif; font-weight: 900; color: #000000; - line-height: 13px; + // line-height: 13px; } .line-h-17 { @@ -3166,5 +3172,4 @@ img { } } } - diff --git a/src/views/edit.vue b/src/views/edit.vue index de520bb..cd97e07 100644 --- a/src/views/edit.vue +++ b/src/views/edit.vue @@ -43,7 +43,6 @@
-
diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue index c8871b9..00d09b0 100644 --- a/src/views/housingView/apartment.vue +++ b/src/views/housingView/apartment.vue @@ -91,6 +91,7 @@ onMounted(() => { onUnmounted(() => { window.removeEventListener("scroll", handleScroll) + window.removeEventListener("scroll", getMoreScroll, true) }) let loading = null // 加载 @@ -179,7 +180,6 @@ let moreLoading = ref(false) // 加载更多数据列表 const getMoreList = () => { if (morePage.value == 0 || moreLoading.value) return - console.log("11111") moreLoading.value = true let postData = { page: morePage.value, diff --git a/src/views/housingView/intermediary.vue b/src/views/housingView/intermediary.vue index dda45ff..18822ea 100644 --- a/src/views/housingView/intermediary.vue +++ b/src/views/housingView/intermediary.vue @@ -60,7 +60,6 @@ provide("count", dataCount) let school = ref("") // 单独提前 选中的学校id 需要 在跳转页面中使用 - //轮播 // let bannerList = reactive({ data: [] }) // let banner = () => { @@ -169,6 +168,12 @@ const getMoreList = data => { .then(res => { if (res.code != 200) return const data = res.data + if (Array.isArray(data)) { + morePage.value = 0 + moreLoading.value = false + window.removeEventListener("scroll", getMoreScroll, true) + return + } moreList.value = moreList.value.concat(data.data) moreState.value = true if (data.data && data.data.length < data.limit) morePage.value = 0 @@ -210,6 +215,7 @@ onMounted(() => { onBeforeUnmount(() => { window.removeEventListener("scroll", downLoadMore, true) + window.removeEventListener("scroll", getMoreScroll, true) })