From 7e95fd62f8a43bb134684f1f5f31f888f53a84a9 Mon Sep 17 00:00:00 2001 From: luJianJun <2587063613@qq.com> Date: Tue, 25 Jul 2023 19:32:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=88=BF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/detail/presonNumIcon.png | Bin 0 -> 1744 bytes .../biserialListItem/biserialListItem.vue | 96 +++++++++++++----- src/components/detail/breadcrumb.vue | 14 ++- src/components/detail/imageWatch.vue | 18 ++-- src/utils/api.js | 3 + src/views/detail.vue | 72 ++++++++++--- 6 files changed, 151 insertions(+), 52 deletions(-) create mode 100644 src/assets/img/detail/presonNumIcon.png diff --git a/src/assets/img/detail/presonNumIcon.png b/src/assets/img/detail/presonNumIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..54afae0043c29fca511d185d312bc5c3300bd3bd GIT binary patch literal 1744 zcmV;>1~2)EP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuCI!Q!9RCodHnrUbqRTO~pvb{8F zVl@j!TNh&X5L4Gcg;3i-jR|of#Z)PXZ8fwCg8tC|1)){6D$>?JEeUFiU>BvuNDv!Z zCH~0vL(!zz63wR4m>9G9osfh(_syF(NoMBd*|{*xIp>}^+dXscG7}f)H$MV?1pEkG z!x0EX!T0#m($XEXv$M~m`(CajuAjJ01OkBrot>S30DIOv4M0Ib!Oe+@i67(L<}e;! zo|&0>s;8&tVwir%$q9~23?s0xu<&l2|BCJh!mtQAjVyRJJ3G5~U|^urg3qxoPXbU< zQc@KkAAb(3Z?j=}B0P_0W@fG#92{)1!M`FF*8_m_FJa+Pu2j`hYCsEDZ9+oAe(u-P zw?XMA5ds^tva)j1($db1jEqbxeU5^z)qu*%%0x!+Z5-L7Ta3epQc_a(w70iUF7#0t zcR_y-T#BOFE`Zc^b#?u&5}krw2|#gi@lB-saU9yD89Gfs-k{RIsnO?9vSkavr(8E` z{k;^&8j54LMqe@NcmSl>k=7@%tU$BwD)`fk-VH}L#vjlLq( z(HbBl7^c|$jFp=(zAciqLqkI&6u@ROMP`dT75*UbHtNEk%n*)Ela2*I-eC-E;<`>T zTEK6Ul9H-AIyx?C^sp$kW4x%SsA+6$EEA^t6~=hrtpq4%{rdH1`}_N6l)hzwD}Du} z*fDBvp?$B31xJFxV53^>On59wWYxve);@0@T}5j3EIwp z`C@kfX|lA{+eeIiBP0K>-r*7+U?5&Y=RV{ciX+)^A~`vE2gPyBj&554K$$1S&W^z< z4|V8C96k!ou+M;Yk$O?bfc&QNo52wSU{UNw8G#0rNFj_`!@hfPSXQ3vG$XF?O4c$% z{GibdsAT{c`OP>fYx9s|M}%wLSeqNHvx(&A=jTuyKZpH3?GYKI?F^Cx$h3tmf>P{w z*lcCjMr60RS?o+LwIEU)ucoG^9wP{MkqxB^YchB}2P_jTpU*4wMKB}-=8N4sa5OG* zDF8tUdRXif&9=Y*Q*^lH@rM~18GBn>Tc=b>GJO~t>+tu9noM=3Z52B&_F7GUFR)~n ze#5{TrVx>U^V{V9KWz=VUm*d2;X8#%j;mw3@yhSLO zaB6DG({p-*bq*l-ut8=5L`{y5k2mWgLyDlzKv6NgS5*Iq&*(C|#FuKX*(>0sy;0ZY z2O#Q05M=|d`3wk|1>72t+}zwCA47Jr&e%>>EjA)OS%s~2E^j1Icc+>0Zv9U7G?Pv5R0Scq|J6Rz;G%oKRi2WfRnPy%gg1bDzzDG zS34G9I{~<~z$|x;nIBW})dX{dU#;2GtKlK2odC!m-iwXR%)Zr_1@aFAyGi+BLTzVN z#0-uY031HTgNr{aqa=rqC+(cSS65V2tT7YnB~5I=`A4y<4ZXK0x+mFPitU!o)<+JU z{QxO1T1r}do%`8cz8cA_h#4RPMn^|q;b!`MJ(7ZG^pg!O{6zV>9o@D9(AU@Z4+5(Y zC_hZB<~B>(AD)<)sJ8oes;yT*^_YXojVO5zS|yj9+{#bP(QNXM;1z6Y;W+&;$LZfk m(->d39|1oCegtAF0{;QN$n{WTlivjZ0000 -
-
+
+ + +
@@ -19,17 +21,19 @@ v-if="listData && listData.data && listData.data.type[data && data.data && data.data.type]"> {{ listData && listData.data && listData.data.type[data && data.data && data.data.type] || '' }}
-
+
{{ listData && listData.data && listData.data.elevator[data && data.data && data.data.elevator] || '' }}
-
+
{{ listData && listData.data && listData.data.sunshinearea[data && data.data && data.data.sunshinearea] || '' }}
+ v-if="listData && listData.data && listData.data.gender[data && data.data && data.data.gender] && data.data.gender"> {{ listData && listData.data && listData.data.gender[data && data.data && data.data.gender] || '' }} @@ -45,9 +49,9 @@ }} {{ location && location.data && location.data[data && data.data && - data.data.location && data.data.location[0].substring(0, 1)] + data.data.location && data.data.location[0].substring(0, 1)] }}> - + {{ location && location.data[item] }} @@ -55,8 +59,10 @@
HK$ - {{ data && data.data && data.data.rent }} - {{ data && data.data && data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }} + {{ data && data.data + && data.data.rent }} + {{ data && data.data && + data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }} /月 [ 租期{{ data && data.data && data.data.rentalduration }}{{ @@ -79,15 +85,21 @@
-
- - {{ data && data.data && data.data.author }} -
{{ - listData && listData.data && listData.data.intermediary[data && data.data && data.data.intermediary] }} +
+
+ + {{ data && data.data && data.data.author }} +
+ {{ + listData && listData.data && listData.data.intermediary[data && data.data && data.data.intermediary] }} +
+
{{ + data && + data.data.intermediary_text + }}
-
{{ data && - data.data.intermediary_text - }}
+
@@ -103,13 +115,23 @@ let props = defineProps({ type: Object }, imgLoad: { - type: Function + type: Function, + default: function () { + return () => { } + } }, listId: { - type: [String, Number] + type: [String, Number], + default: '' + }, + detailShow: { + type: Boolean, + default: false } }) let data = reactive({ data: {} }) +//显示样式 +let detailShow = props.detailShow watchEffect(() => { data.data = props.item }) @@ -118,7 +140,7 @@ watchEffect(() => { let listId = props.listId let imgRef = null let loadFinish = () => { - let height = imgRef.ctx.$refs&&imgRef.ctx.$refs.list&&imgRef.ctx.$refs.list.offsetHeight + let height = imgRef.ctx.$refs && imgRef.ctx.$refs.list && imgRef.ctx.$refs.list.offsetHeight // console.log(data.id, listId, height) props.imgLoad(data.id, listId, height) } @@ -136,19 +158,29 @@ location.data = store.state.indexData && store.state.indexData.config && store.s let listData = reactive({ data: {} }) listData.data = store.state.indexData && store.state.indexData.config +let pageType=ref('') + //跳转 -let router=useRouter() -let watchInfo = ()=>{ +let router = useRouter() +let watchInfo = () => { router.push({ - path:'/detail', - query:{ - id:data.data.uniqid + path: '/detail', + query: { + id: data.data.uniqid, + type:pageType.value } }) } onMounted(() => { imgRef = getCurrentInstance() + let {type}=router.currentRoute.value.query + console.log('type',type) + if(type){ + pageType.value=type + }else{ + pageType.value=routePath.value==='/personHousing'?1:routePath.value==='/intermediaryHousing'?2:routePath.value==='/needHousing'?3:'' + } }) @@ -187,7 +219,7 @@ img { } .s-w-100 { - width: 100%; + width: 100% !important; } .authentication-box { @@ -226,6 +258,15 @@ img { margin-bottom: 20px; cursor: pointer; + .detail-tab{ + width:32px; + height:32px; + position: absolute; + top:0; + right:0; + z-index:66; + } + .mg-t-10 { margin-top: 10px; } @@ -394,8 +435,7 @@ img { text-align: center; } } -} - +} \ No newline at end of file diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue index 3c818d4..9fd18d1 100644 --- a/src/components/detail/breadcrumb.vue +++ b/src/components/detail/breadcrumb.vue @@ -1,6 +1,6 @@