From 7d2ac77df4dcb918cf11fb7778021ba5eb443afd Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 20 Jul 2023 11:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=92=A8=E8=AF=A2=E5=8F=B3?=
 =?UTF-8?q?=E4=B8=8B=E8=A7=92=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/publicImage/circle-close.png   | Bin 0 -> 1849 bytes
 .../img/publicImage/circle-pop-bj-green.svg   |  12 ++
 src/assets/img/publicImage/circle-pop-bj.svg  |  22 +++
 .../img/publicImage/consult-hollow-out.png    | Bin 0 -> 1331 bytes
 .../img/publicImage/half-circle-green.svg     |   6 +
 src/components/apartment/seachModule.vue      |   5 +-
 src/components/public/circle-btn.vue          | 160 ++++++++++++++++++
 src/components/public/have-questions.vue      |   2 +-
 src/components/public/public-list-item.vue    |  27 ++-
 src/router/index.js                           |   7 +
 src/views/apartmentDetail.vue                 |  14 ++
 src/views/housingView/apartment.vue           |  42 ++---
 src/views/housingView/intermediary.vue        |   5 +-
 src/views/housingView/needHousing.vue         |   8 +-
 src/views/housingView/person.vue              |   6 +-
 src/views/user.vue                            |   7 +-
 16 files changed, 273 insertions(+), 50 deletions(-)
 create mode 100644 src/assets/img/publicImage/circle-close.png
 create mode 100644 src/assets/img/publicImage/circle-pop-bj-green.svg
 create mode 100644 src/assets/img/publicImage/circle-pop-bj.svg
 create mode 100644 src/assets/img/publicImage/consult-hollow-out.png
 create mode 100644 src/assets/img/publicImage/half-circle-green.svg
 create mode 100644 src/components/public/circle-btn.vue
 create mode 100644 src/views/apartmentDetail.vue

diff --git a/src/assets/img/publicImage/circle-close.png b/src/assets/img/publicImage/circle-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3e2e522f93e997aae7d5b7c4aef233ff29a30f7
GIT binary patch
literal 1849
zcmb7Fc{H1e7XR}3kZ5g*N{7)HlW4_QLrpDdn5cvz&(dLNlTxuCol?ZhL@?^1TCHs?
zZBt=dRnnfcbPz&RO?8r523?dCMLS03pkji)_~*U9=bZbyzq|c&?>+b2LRx^2u8xTg
z006pF3OPv4++D!6)LKG3J)|aBYLJf?&?^0WN$rqh!l+Dte*mwx;Q*{49)NaB)G$#4
z05o_oKts*2-53x2UzW?$_`khdNVx=M0Du;sO7;xNge_n5PcaQOx_~+uP-M{mFI<~B
z_OKX9_O=+-t&i!I9ZEtT@ioGpIE8entoYi?oTIhvg~#tf8=th8e4hLCl6S+SeZI3;
zy@f*r`}Emg*{|JFWxuRYDi>65R9&)2S%39k{g9Rc0Q;xn0a+$H$Hc_UulF((%*G(r
zVFF>55gpBsZT_l6)iUwnVOd#OMpLq|U(uf4xm{3_Zh~g8Sev?c6zw4|^ey)N85j`2
z@o;h3VDX1DjjJyY8-o1{UV@3v06CrSO^`>`bo&Sb+uPf-^%tr$UGOA>9a+fz;%NLt
z<C~dTrf@Uu**QV1Kp^NDTiHl4{PD4adHNEmgDmQmI1B~LS{vS2F!N>xF=%4SFBILb
z-*ih}lvEYxDpCmi{Q$ZNt+Zsa-g^&Z0XxrbJ@xPn%TtY^BE198`dTA*ypWvW;9$YS
z?^>Qv$30TaqCJ2cifiA7o!JDla)V9cB?~Qj`ufvF_ntW?90!Q60>e=&xIrY5AQfjN
zISoKFejfP7qiqdBbf&fExB@ZjDgHaD-fF=F#TBe>2HC}Ic6DSR=iu47Qen3v>(4XC
zfq<)m)uoo9Su5=n>>!Hhuq>6yvaeiC{^R{XE7%t_K0bcR-PN_jbF@mrqE0tyZx*(R
zUM{6w$4(s^$%56^hAb>%enmRxya;Lj-P-ap$9D1&&=pJ(8(q*wOBPJNGvsFMMf}va
zG?So=bV~#k(l2_m_tw4tc%=61Jv@MZD}-z@oB4>DW(e80kaTwgxEW7ehl2X-LIB%m
z+6Zhu{SojIS8B|$0^=%3QOZUH&mU}(SK+zF2y6kp0~o=T9_U7alnT-}N-5mjAGDFX
z;kZT!r~H*Vpw*9O!#=2aHWVz8yIFG+k#V}y@vz7%q*SGJ53LP)DM5ch3P&mpy7$A1
zD#cX_Zv?FzBIer#0I!fr<8BHpi8>RljMB8X$q~qljm71VP$+zo=2j#8)Gk|oaKz{%
zy|>Ne$|`e6<tajXR7W@H;;)~xI0fk87W)WOrLM??dTNAAf+ha7!WR!QEWN2bEB3pe
zk8v%q&yBlXVM)F`2X+NGSxQP&CTQAQ<-Ajb?qPU=%W}e(eEq_=X0Bh)xeiZFPs<*P
z^4u@nX=wYNwbNya>lbm~X@A>fBo0yDgxBC`2f0g%hkiU?AVQv4Nh$%_Bop`?9axbL
zoe#aW)7bpLaP|9iy^p%B41IZ_M^CQ@skiE}aqYn57I8aHVq>d%U13J|d;qZLM)d>P
zJ{N<tZ^&XlZZ+dZM@KQkACEEz<8wHV<kFFmk)hAp&NET>F)&ug_Hd6vQ}uN16EtFH
z=&i$W+)~iiLc#CBN%(Xuf{b7g*mRu1mn1{E>QD|GR<w881yP6QT~z#VRU8j{x_26l
zsM{ybSNu>arotk1=$()hF%zY%!JYL5s&+ddfE2j8g8;a>6+0POZp-agI8$kNfUA-T
z3(t5k4o=U58sX}ZE+LI<xdRHEAMG|!BdNlBo(9!hB_nhU#kUlVRK`gFBdNmXgu>W*
z^de{+A}Mczn+HzEs=76-LG!Io68$HjrF4oN6$$)^IkvOaS&ZB-a=AAg7s)eqUZIT=
zrf!F~oDewG{&q{oA9aXLO<l!wVE#fS_>Y?gr8q{HIbGCw{$af}c;1*0LVKK7Rra7(
zbD=gUergP9|4Jkh*_D--rI|%zVCz|;WBEJ&g6f8R?GG#zr`+$-tvbx-7);NI`mV?u
zRp(!a>62ocS7<l`P9OH%8YEmx0-4EY>@CF%dy4AC-24@czfCjrS(s0;nTd-faNe&+
zZ}|wPPo?<AJsis`n|Hb^sh6@{EX7i(^v2p^`M+Z;9o<oK{nei+R=ravn%6VWpsNp-
zAjHnML+}%e$u2)1K1tMgr}gCS?0o%ypsD>p=h!I6Sm?fP!3Q6_S}sU)%q%>0^y1hY
zH>)7M<%G&Wez~;pxT7hPENojmZxG(k&#>CsSp4JD@ZeTt*?_HvPvZTKj=%At%H*1!
zK%Z?5=&0`@P7Q{*uWq@Aq%E_Hh=|C3oRZUM4uJny6n5vFk_kOq;`!aTMfDCKw|X&h
F{|oZN3>p9c

literal 0
HcmV?d00001

diff --git a/src/assets/img/publicImage/circle-pop-bj-green.svg b/src/assets/img/publicImage/circle-pop-bj-green.svg
new file mode 100644
index 0000000..f414402
--- /dev/null
+++ b/src/assets/img/publicImage/circle-pop-bj-green.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="311px" height="156px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="155.5" y1="0" x2="155.5" y2="166.947368421053" id="LinearGradient1149">
+      <stop id="Stop1150" stop-color="#50e3c2" stop-opacity="0.498039215686275" offset="0" />
+      <stop id="Stop1151" stop-color="#ffffff" offset="1" />
+    </linearGradient>
+  </defs>
+  <g transform="matrix(1 0 0 1 0 -150 )">
+    <path d="M 300 19  L 300 132.825678259056  L 310.325751537483 155.551844692598  L 285.147942993635 150  L 8 150  C 3.51999999999998 150  0 146.48  0 142  L 0 19  C 0 19  65.5521020354423 1.06581348766861  149 1  C 233.551997537432 0.933315733733053  300 19  300 19  Z " fill-rule="nonzero" fill="url(#LinearGradient1149)" stroke="none" transform="matrix(1 0 0 1 0 150 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/img/publicImage/circle-pop-bj.svg b/src/assets/img/publicImage/circle-pop-bj.svg
new file mode 100644
index 0000000..186f499
--- /dev/null
+++ b/src/assets/img/publicImage/circle-pop-bj.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="341px" height="336px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <mask fill="white" id="clip1146">
+      <path d="M 300 8  L 300 282.825303133091  L 310.325751537483 305.551844692598  L 285.147942993635 300  L 8 300  C 3.51999999999998 300  0 296.48  0 292  L 0 8  C 0 3.51999999999998  3.51999999999998 0  8 0  L 292 0  C 296.48 0  300 3.51999999999998  300 8  Z " fill-rule="evenodd" />
+    </mask>
+    <filter x="-15px" y="-15px" width="341px" height="336px" filterUnits="userSpaceOnUse" id="filter1147">
+      <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetInner" />
+      <feGaussianBlur stdDeviation="7.5" in="shadowOffsetInner" result="shadowGaussian" />
+      <feComposite in2="shadowGaussian" operator="atop" in="SourceAlpha" result="shadowComposite" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 0.243137254901961 0  " in="shadowComposite" />
+    </filter>
+    <g id="widget1148">
+      <path d="M 300 8  L 300 282.825303133091  L 310.325751537483 305.551844692598  L 285.147942993635 300  L 8 300  C 3.51999999999998 300  0 296.48  0 292  L 0 8  C 0 3.51999999999998  3.51999999999998 0  8 0  L 292 0  C 296.48 0  300 3.51999999999998  300 8  Z " fill-rule="nonzero" fill="#ffffff" stroke="none" />
+      <path d="M 300 8  L 300 282.825303133091  L 310.325751537483 305.551844692598  L 285.147942993635 300  L 8 300  C 3.51999999999998 300  0 296.48  0 292  L 0 8  C 0 3.51999999999998  3.51999999999998 0  8 0  L 292 0  C 296.48 0  300 3.51999999999998  300 8  Z " stroke-width="2" stroke="#ebebeb" fill="none" mask="url(#clip1146)" />
+    </g>
+  </defs>
+  <g transform="matrix(1 0 0 1 15 15 )">
+    <use xlink:href="#widget1148" filter="url(#filter1147)" />
+    <use xlink:href="#widget1148" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/img/publicImage/consult-hollow-out.png b/src/assets/img/publicImage/consult-hollow-out.png
new file mode 100644
index 0000000000000000000000000000000000000000..0231484c25509410775674e1e5804edf7545e8e6
GIT binary patch
literal 1331
zcmeAS@N?(olHy`uVBq!ia0vp^4nS<d!3-p;j`4vwEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZaflAdF7#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10Ut54r
zh$~RRC>Zb%_?#X2ALxk2k|4ie2ED$ccdzXz65^Tn?_<izrlkR9r}{glKfTX9t&)*%
zzw4E=iuG@L9(`_ED5}JNbr1LKoL!TXC3gS(x`<VfDREWaLyj#*>$Lp;9@j6A_|$o0
z{?;{iz2U*%?2UC<f=&xusL^;`Te$bu8SU&9oLoODj%@SfJ)!*PyWzQG>TC_qbkt_d
zG%8&e3v>))lDE4HLkFv@2av;A;1O92q(N*C2Dg*hc0dI?JzX3_JdVGe_S4+SQRI03
z6pv{Fa*Be1DeF5@yuZap3PqltReQZY?_Ra%+|T#+WcDqN|Mjov`JI{XpP$`X{QL~_
z5AKsiMNc!mCN4kof1~&cu4I!S@uPo_hLnY=$}E_2OTIgE!u}rVso@!ygHuJbSEn&#
z-Eds1_x8~BtDBFpG1zkTnz*MYc;9Ea(9<;W)raT_!K@d$nmV}_IGo$2<G^qsPi#V~
zM8Z3PyqkX7iVM8gyxh&nXq&{KthgYY=Yl)O3;7M4H{bR-J_=4~WBIbab^>dP+yj}i
zo(HKW35<F#x2Ig`W$qE&<M!C%01IP+5c`Zz9>12)y%GFjSK5bJrODkhe%hU2dcjbv
zaVD5iY(lZ1L*F5x-up?9?f3RHrMEI|IA!)t>VTEBxzB7n!=KwH<@!m^zx(XnT&cac
z&-7jSda=6x@9xGaD{alh?@U*^!6!7EW2ukKr^^2mpUB$Tbu#-+-kkoh!fX+bhu}GV
ziM*9xjVA8g<+tvvZ@`*1Da-s0ww<k3#`E|2YU+k1zLj;~F+Xv|FW#3AC*D7D*;x1C
z)2aX8S8To{^uYF%V9gbV1gEks%^bE24<3Kk)|l{*ty@xg$~JG)RlwL(Epd$~Nl7e8
zwMs5Z1yT$~21bUu24=bj<{^e=R;K1wMuyr37FGrZU&LY_p=ij>PsvQH#I2##`$-&7
zgD1#_;<9wBq{QM>-O{2=hP2F_R4aXb{fzwFRQ<%1+{`@v%;fw$-L(9?68)0g0x&PW
oxTG}2u&6RGCr7^^GcP@-G*1s`ikG959?(z*Pgg&ebxsLQ08zhs^#A|>

literal 0
HcmV?d00001

diff --git a/src/assets/img/publicImage/half-circle-green.svg b/src/assets/img/publicImage/half-circle-green.svg
new file mode 100644
index 0000000..197905f
--- /dev/null
+++ b/src/assets/img/publicImage/half-circle-green.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="50px" height="50px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -5 -5 )">
+    <path d="M 30 5  C 43.8071187457698 5  55 16.1928812542302  55 30  C 55 36.708490750192  52.3038607582961 43.1355107787992  47.5177003721064 47.8362040152356  L 30 30  L 12.8592828539676 11.801213894336  C 17.4974236322781 7.43273246360162  23.6285025394262 5  30 5  Z " fill-rule="nonzero" fill="#eefcf9" stroke="none" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue
index b92fc91..c1d062a 100644
--- a/src/components/apartment/seachModule.vue
+++ b/src/components/apartment/seachModule.vue
@@ -24,7 +24,7 @@
                                 <div class="dis-f al-item pos-r">
                                     <div class="seach-hiosory-box scrollbar" :class="{ 'seach-history-h': historyShow }">
                                         <div class="seach-history-info">
-                                            <div>
+                                            <div v-if="historyArr.length != 0" style="margin-bottom: 30px;">
                                                 <div class="title">历史搜索</div>
                                                 <div class="info-box">
                                                     <div v-for="(item, i) in historyArr" :key="i" class="btn"
@@ -32,7 +32,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div style="margin-top:30px;">
+                                            <div>
                                                 <div class="title">热门推荐</div>
                                                 <div class="info-box">
                                                     <div v-for="(item, i) in hotArr.data" :key="i" class="btn"
@@ -516,7 +516,6 @@ const selectOption = (type, value) => {
 .option-area {
     flex-wrap: wrap;
     border-top: 1px solid #ebebeb;
-    height: 0;
     overflow: hidden;
 
     .option-left,
diff --git a/src/components/public/circle-btn.vue b/src/components/public/circle-btn.vue
new file mode 100644
index 0000000..d7e1a83
--- /dev/null
+++ b/src/components/public/circle-btn.vue
@@ -0,0 +1,160 @@
+<template>
+    <div class="circle-btn flexcenter" @click="circleState = true">
+        <div class="circle-inside flexcenter">
+            <img class="circle-bj" src="@/assets/img/publicImage/half-circle-green.svg" />
+            <img class="circle-icon" src="@/assets/img/publicImage/consult-hollow-out.png" />
+            <div class="circle-text">咨询</div>
+        </div>
+        <div class="circle-pop flexacenter" v-if="circleState">
+            <img class="close-icon" src="@/assets/img/publicImage/circle-close.png" alt=""
+                @click.stop="circleState = false">
+            <img class="circle-bj" src="@/assets/img/publicImage/circle-pop-bj.svg">
+            <img class="circle-bj-green" src="@/assets/img/publicImage/circle-pop-bj-green.svg">
+            <div class="circle-title flexacenter">欢迎联系 <b>{{ wechat['nickname'] }}</b> 咨询房源</div>
+            <div class="circle-QRcode flexcenter">
+                <img class="circle-QRcode-img" :src="wechat['wechatqrcode']" />
+            </div>
+            <div class="circle-hint">微信扫码添加好友</div>
+            <div class="circle-remark flexacenter">备注：<b>寄托租房</b></div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, toRefs } from 'vue'
+import { useStore } from 'vuex';
+const store = useStore();
+const { wechat } = toRefs(store.state);
+
+let circleState = ref(false)
+</script>
+
+<style lang="less" scoped>
+.circle-btn {
+    position: fixed;
+    bottom: 58px;
+    right: 58px;
+    width: 60px;
+    height: 60px;
+    background-color: #50e3c2;
+    border-radius: 50%;
+    cursor: pointer;
+    z-index: 10000;
+
+    .circle-inside {
+        flex-direction: column;
+        background-color: #cbf7ed;
+        width: 50px;
+        height: 50px;
+        border-radius: 50%;
+        position: relative;
+        z-index: 1;
+        color: #000;
+        font-size: 14px;
+
+        .circle-bj {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 50px;
+            height: 50px;
+            z-index: -1;
+        }
+
+        .circle-icon {
+            width: 20px;
+            height: 17px;
+            margin-bottom: 2px;
+        }
+    }
+}
+
+.circle-pop {
+    position: absolute;
+    bottom: 65px;
+    right: 65px;
+    width: 300px;
+    height: 300px;
+    border-radius: 10px;
+    flex-direction: column;
+    z-index: 1100;
+    padding-top: 45px;
+    font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+    -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.101960784313725);
+    -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.101960784313725);
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.101960784313725);
+
+    .close-icon {
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        width: 16px;
+        height: 16px;
+        cursor: pointer;
+    }
+
+    .circle-bj {
+        position: absolute;
+        top: -15px;
+        left: -15px;
+        width: 341px;
+        height: 336px;
+        z-index: -1;
+    }
+
+    .circle-bj-green {
+        width: 311px;
+        height: 156px;
+        position: absolute;
+        bottom: -7.5px;
+        left: 0;
+        z-index: -1;
+    }
+
+    .circle-title {
+        font-size: 15px;
+        color: #555555;
+        margin-bottom: 24px;
+
+        b {
+            color: #000;
+            font-weight: 650;
+            margin: 0 5px;
+        }
+    }
+
+    .circle-QRcode {
+        width: 120px;
+        height: 120px;
+        border-radius: 20px;
+        -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.101960784313725);
+        -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.101960784313725);
+        box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.101960784313725);
+        margin-bottom: 20px;
+        background: #fff;
+
+        .circle-QRcode-img {
+            width: 100px;
+            height: 100px;
+        }
+    }
+
+    .circle-hint {
+        margin-bottom: 6px;
+    }
+
+    .circle-hint,
+    .circle-remark {
+        font-size: 13px;
+        color: #555555;
+        line-height: 18px;
+    }
+
+    .circle-remark {
+        b {
+            font-weight: 650;
+            color: #000000;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/public/have-questions.vue b/src/components/public/have-questions.vue
index cada835..e4728b6 100644
--- a/src/components/public/have-questions.vue
+++ b/src/components/public/have-questions.vue
@@ -6,7 +6,7 @@
             <template #reference>
                 <div class="have-questions flexcenter">
                     <div class="have-questions-text flexacenter">有疑问？来找<img class="smiling"
-                            src="@/assets/img/publicImage/smiling.png">寄托方同学！</div>
+                            src="@/assets/img/publicImage/smiling.png">{{ wechat['nickname'] }}！</div>
                     <div class="have-questions-btn flexcenter">
                         <img class="have-questions-icon" src="@/assets/img/publicImage/QR-code.svg" />扫码加微信
                     </div>
diff --git a/src/components/public/public-list-item.vue b/src/components/public/public-list-item.vue
index c1a35ca..224a480 100644
--- a/src/components/public/public-list-item.vue
+++ b/src/components/public/public-list-item.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="list-item" ref="list">
+    <div class="list-item" ref="list" @click="goDetail">
         <div class="authentication-box dis-f al-item" v-if="data.verified == 1">
             <img src="../../assets/homeImage/authenticationLogo.png" class="logo" alt="">
             <img src="../../assets/homeImage/topAuthenticationBg.svg" class="bg" alt="">
@@ -87,14 +87,15 @@
                 class="tab-img" alt="">
         </div>
         <div class="publish-footer flexacenter" v-if="ispublish">
-            <div class="publish-item flexcenter" v-if="stateData.btn >= 0 || stateData.btn == -2" @click="handleDelete">删除
+            <div class="publish-item flexcenter" v-if="stateData.btn >= 0 || stateData.btn == -2"
+                @click.stop="handleDelete">删除
             </div>
-            <div class="publish-item flexcenter" v-if="stateData.btn >= 0" @click="goEdit">{{ stateData.btn
+            <div class="publish-item flexcenter" v-if="stateData.btn >= 0" @click.stop="goEdit">{{ stateData.btn
                 == 1 ? "编辑上架" : "编辑" }}</div>
-            <div class="publish-item flexcenter" v-if="stateData.btn == 2" @click="undercarriage">下架</div>
+            <div class="publish-item flexcenter" v-if="stateData.btn == 2" @click.stop="undercarriage">下架</div>
             <div class="publish-item flexcenter go-up"
                 :class="{ 'go-up': data.isding == 0, 'already-go-up': data.isding == 1 }" v-if="stateData.btn == 2"
-                @click="goUp">{{
+                @click.stop="goUp">{{
                     data.isding == 0 ? '顶上去' : '今天已顶' }}
             </div>
             <!-- <div class="publish-item flexcenter already-go-up" v-if="stateData.btn == 2 && item.isding == 1"></div> -->
@@ -107,7 +108,7 @@
                     listData.intermediary[data.intermediary] }}</div>
                 <img src="../../assets/homeImage/intermediaryTabImg.png" v-else class="intermediary-tab-img" alt="">
             </div>
-            <div class="cancel-collection flexcenter" @click="cancelCollection(data.token)">
+            <div class="cancel-collection flexcenter" @click.stop="cancelCollection(data.token)">
                 <img class="icon" src="@/assets/img/publicImage/black-circle-cross.svg">
                 取消收藏
             </div>
@@ -127,9 +128,7 @@ const { proxy } = getCurrentInstance()
 const router = useRouter()
 
 let props = defineProps({
-    item: {
-        type: Object,
-    },
+    item: Object,
     index: Number,
     ispublish: Boolean,
 })
@@ -139,10 +138,6 @@ data = props.item
 
 const emit = defineEmits(['cancelCollection', 'goUp', 'undercarriage'])
 
-
-// console.log("item", props.item);
-
-
 //监听路由
 const route = useRoute()
 let routePath = ref('')
@@ -192,10 +187,10 @@ watch(() => props.item.status, (newValue, oldValue) => {
     stateData.value = stateObj[data.status]
 })
 
-const cancelCollection = token => {
-    emit('cancelCollection', { token, index: props['index'] })
-}
+const cancelCollection = token => emit('cancelCollection', { token, index: props['index'] })
 
+// 点击跳转详情页
+const goDetail = () => router.push(`/detail?uniqid=${data.uniqid}`)
 
 // 跳转编辑页面
 const goEdit = () => router.push(`/edit?token=${data.token}`)
diff --git a/src/router/index.js b/src/router/index.js
index d945a11..cf0e600 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -78,6 +78,13 @@ const routes = [
     meta: {
       title: "品牌公寓"
     }
+  },
+  {
+    path: "/apartmentDetail",
+    component: () => import(/* webpackChunkName: "housing" */ '@/views/apartmentDetail.vue'),
+    meta: {
+      title: "品牌公寓详情"
+    }
   }
 ]
 
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
new file mode 100644
index 0000000..9d78f78
--- /dev/null
+++ b/src/views/apartmentDetail.vue
@@ -0,0 +1,14 @@
+<template>
+    <page-top-bar></page-top-bar>
+
+    asgdaskhjdkhsk jkhkhkjhkjhjhjjjjjhjkhh
+</template>
+
+<script setup>
+import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
+
+const uniqid = "1qfWOLTPbyPH"
+
+</script>
+
+<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue
index 92cd213..cd23320 100644
--- a/src/views/housingView/apartment.vue
+++ b/src/views/housingView/apartment.vue
@@ -1,22 +1,24 @@
 <template>
-    <div>
-        <pageTopBar></pageTopBar>
-        <!-- 筛选 -->
-        <div class="screen-box wid1200">
-            <seach-module @handleTransfer="handleTransfer" :count="listCount"></seach-module>
-        </div>
-
-        <div class="list wid1200 flexflex" ref="gridContainer">
-            <apartment-item v-if="list.length != 0" v-for="item in list" :item="item"></apartment-item>
-        </div>
-        <div v-if="list.length == 0" class="empty-box wid1200 flexcenter">
-            <empty-duck :hintTextTwo="'建议放宽筛选条件'"></empty-duck>
-        </div>
-
-        <have-questions></have-questions>
-
-        <page-footer></page-footer>
+    <pageTopBar></pageTopBar>
+    <!-- 筛选 -->
+    <div class="screen-box wid1200">
+        <seach-module @handleTransfer="handleTransfer" :count="listCount"></seach-module>
     </div>
+
+    <div class="list wid1200 flexflex" ref="gridContainer">
+        <apartment-item v-if="list.length != 0" v-for="item in list" :item="item"></apartment-item>
+    </div>
+    <div v-if="list.length == 0" class="empty-box wid1200 flexcenter">
+        <empty-duck :hintTextTwo="'建议放宽筛选条件'"></empty-duck>
+    </div>
+
+    <have-questions></have-questions>
+
+    <page-footer></page-footer>
+
+    <!-- 右下角咨询 -->
+    <circle-btn></circle-btn>
+
 </template>
   
 <script setup>
@@ -27,6 +29,7 @@ import apartmentItem from '@/components/public/apartment-item.vue';
 import haveQuestions from '@/components/public/have-questions.vue'
 import pageFooter from '@/components/footer/footer.vue'
 import emptyDuck from '@/components/public/empty-duck.vue'
+import circleBtn from '@/components/public/circle-btn.vue'
 import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
 import { ElLoading } from 'element-plus'
 import Masonry from 'masonry-layout';
@@ -114,9 +117,6 @@ const handleTransfer = (data) => {
             list.value = []
             getData()
         }
-        // if () {
-
-        // }
     }
 
 
@@ -151,4 +151,6 @@ const handleTransfer = (data) => {
     justify-content: center;
     margin: 0 auto;
 }
+
+
 </style>
diff --git a/src/views/housingView/intermediary.vue b/src/views/housingView/intermediary.vue
index d602e9f..f5426bd 100644
--- a/src/views/housingView/intermediary.vue
+++ b/src/views/housingView/intermediary.vue
@@ -21,6 +21,8 @@
         </div>
         <listBtmPrompt></listBtmPrompt>
     </div>
+    <!-- 右下角咨询 -->
+    <circle-btn></circle-btn>
 </template>
   
 <script setup>
@@ -30,6 +32,7 @@ import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
 import listBtmPrompt from "../../components/public/have-questions.vue";
 import noList from "../../components/public/empty-duck.vue";
+import circleBtn from '@/components/public/circle-btn.vue'
 import api from "../../utils/api";
 import tool from '../../toolJs/downLoadMore'
 
@@ -66,7 +69,7 @@ let getDataList = (data) => {
     loading.value = false
     let postData = {
         page: pages.value,
-        intermediary:1,
+        intermediary: 1,
         ...data
     }
     api.getLists(postData).then(res => {
diff --git a/src/views/housingView/needHousing.vue b/src/views/housingView/needHousing.vue
index 0f87a08..6c1c873 100644
--- a/src/views/housingView/needHousing.vue
+++ b/src/views/housingView/needHousing.vue
@@ -21,6 +21,9 @@
         </div>
         <listBtmPrompt></listBtmPrompt>
     </div>
+
+    <!-- 右下角咨询 -->
+    <circle-btn></circle-btn>
 </template>
   
 <script setup>
@@ -30,6 +33,7 @@ import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
 import listBtmPrompt from "../../components/public/have-questions.vue";
 import noList from "../../components/public/empty-duck.vue";
+import circleBtn from '@/components/public/circle-btn.vue'
 import api from "../../utils/api";
 import tool from '../../toolJs/downLoadMore'
 
@@ -53,7 +57,7 @@ let setSeachSelectData = (data) => {
         ...data
     }
     loading.value = true
-    console.log('seachSelectData',seachSelectData.data)
+    console.log('seachSelectData', seachSelectData.data)
     return
     getDataList(seachSelectData.data)
 }
@@ -72,7 +76,7 @@ let getDataList = (data) => {
     loading.value = false
     let postData = {
         page: pages.value,
-        intermediary:0,
+        intermediary: 0,
         ...data
     }
     api.getLists(postData).then(res => {
diff --git a/src/views/housingView/person.vue b/src/views/housingView/person.vue
index 3d40c0b..309c908 100644
--- a/src/views/housingView/person.vue
+++ b/src/views/housingView/person.vue
@@ -21,6 +21,9 @@
         </div>
         <listBtmPrompt></listBtmPrompt>
     </div>
+
+    <!-- 右下角咨询 -->
+    <circle-btn></circle-btn>
 </template>
   
 <script setup>
@@ -30,6 +33,7 @@ import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
 import listBtmPrompt from "../../components/public/have-questions.vue";
 import noList from "../../components/public/empty-duck.vue";
+import circleBtn from '@/components/public/circle-btn.vue'
 import api from "../../utils/api";
 import tool from '../../toolJs/downLoadMore'
 import { useRouter } from 'vue-router'
@@ -72,7 +76,7 @@ let getDataList = (data) => {
     loading.value = false
     let postData = {
         page: pages.value,
-        intermediary:0,
+        intermediary: 0,
         ...data
     }
     api.getLists(postData).then(res => {
diff --git a/src/views/user.vue b/src/views/user.vue
index be2b40d..7c512d7 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -144,10 +144,7 @@ const identityObj = {
     "-1": "房源认证"
 }
 
-
-
-
-async function init() {
+const init = () => {
     proxy.$post("/tenement/v2/api/user").then(res => {
         if (res.code != 200) return
         let data = res.data
@@ -160,8 +157,6 @@ async function init() {
             getFavData()
         }
 
-        // getFavData()
-
         user.value = data.user
         count.value = data.count
         newmessagenum.value = data.newmessagenum