From bbbeed395aeb2c084055cf618f83b660ff7978f5 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Tue, 1 Aug 2023 11:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/seachPage/input.vue |  2 +
 src/views/detail.vue               | 91 ++++++++++++++++++++----------
 2 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index e1e2b11..57e9bb0 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -246,6 +246,8 @@ console.log('houseingPageType',houseingPageType)
 let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment'
 tabType.value = type
 
+if(isNeedHousing.value)tabType.value = '6'
+
 //页面判断
 let checkPageType = () => {
     // houseingPageType 0个人 1中介 6求房源
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 5487b75..6c6864d 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -800,20 +800,21 @@
                             <div class="user-liner-box dis-f al-item"
                                 :class="{ 'jus-bet': concatData.data && concatData.data.count > 2 }">
                                 <!-- class='s-w-100' -->
-                                <div style="padding:0 0 30px 0;" class="s-w-100">
-                                    <div class="liner-title">
+                                <div class="s-w-100">
+                                    <div class="liner-title" 
+                                    :class="{'mg-b-50':concatData.data && concatData.data.count == 2&&concatData.data.wechatdata.url}">
                                         联系方式
                                     </div>
                                     <div class="dis-f jus-bet s-w-100">
-                                        <div>
-                                            <div
-                                                v-if="concatData.data && concatData.data.wechat && concatData.data.count > 2">
+                                        <div v-if="concatData.data && (concatData.data.count > 2||(!concatData.data.wechatdata.url&&concatData.data.count== 2))">
+                                            <div class="mg-b-30"
+                                                v-if="concatData.data && concatData.data.wechat && concatData.data.count >= 2">
                                                 <div class="dis-f al-item">
                                                     <img src="../assets/img/detail/wxIcon.png" class="whatsapp-icon" alt="">
                                                     微信
                                                 </div>
                                                 <div class="dis-f al-item box-text mg-l-35">
-                                                    <div style="width:120px;">
+                                                    <div class="num-text">
                                                         {{ concatData.data && concatData.data.wechat }}
                                                     </div>
                                                     <div class="clone-btn dis-f al-item jus-x mg-l-50"
@@ -823,15 +824,15 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div
-                                                v-if="concatData.data && concatData.data.whatsapp && concatData.data.count > 2">
+                                            <div class="mg-b-30"
+                                                v-if="concatData.data && concatData.data.count >= 2">
                                                 <div class="dis-f al-item">
                                                     <img src="../assets/img/detail/WhatsAppIcon.png" class="whatsapp-icon"
                                                         alt="">
                                                     WhatsApp
                                                 </div>
                                                 <div class="dis-f al-item box-text mg-l-35">
-                                                    <div style="width:120px;">
+                                                    <div class="num-text">
                                                         {{ concatData.data && concatData.data.whatsapp }}
                                                     </div>
                                                     <div class="clone-btn dis-f al-item jus-x mg-l-50"
@@ -841,14 +842,15 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div v-if="concatData.data && concatData.data.tel && concatData.data.count > 2">
+                                            <div class="mg-b-30"
+                                                v-if="concatData.data && concatData.data.tel && concatData.data.count >= 2">
                                                 <div class="dis-f al-item">
                                                     <img src="../assets/img/detail/phoneIcon.png" class="whatsapp-icon"
                                                         alt="">
                                                     电话号码
                                                 </div>
                                                 <div class="dis-f al-item box-text mg-l-35">
-                                                    <div style="width:120px;">
+                                                    <div class="num-text">
                                                         {{ concatData.data && concatData.data.tel }}
                                                     </div>
                                                     <div class="clone-btn dis-f al-item jus-x mg-l-50"
@@ -859,7 +861,6 @@
                                                 </div>
                                             </div>
                                         </div>
-
                                         <div
                                             v-if="concatData.data && concatData.data.count > 2 && concatData.data.wechatdata.url">
                                             <div class="wx-qrcode-s dis-f jus-x al-item">
@@ -875,9 +876,22 @@
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="round dis-f jus-x al-item"
+                                        :class="{'mg-t-20':concatData.data && concatData.data.count > 2 && !concatData.data.wechatdata.url}"
+                                            v-if="concatData.data && concatData.data.count >= 2 && !concatData.data.wechatdata.url">
+                                            <div class="deepen dis-f jus-x al-item">
+                                                <div class="center-box dis-f jus-x al-item">
+                                                    <div class="center-s dis-f jus-x al-item">
+                                                        <div class="drop">
+
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <div class="dis-f jus-x al-item whatsapp-wx-box s-w-100"
-                                        v-if="concatData.data && concatData.data.count === 2 && concatData.data.wechatdata.aid !== 0">
+                                    <div class="dis-f al-item whatsapp-wx-box s-w-100 jus-sp"
+                                        v-if="concatData.data && concatData.data.count === 2 && concatData.data.wechatdata.aid !== 0&&concatData.data.wechatdata.url">
                                         <div>
                                             <div>
                                                 <div v-if="concatData.data.whatsapp">
@@ -903,8 +917,8 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="liner"></div>
-                                        <div>
+                                        <div class="liner" v-if="concatData.data && concatData.data.wechatdata.url"></div>
+                                        <div v-if="concatData.data && concatData.data.wechatdata.url">
                                             <div class="wx-qrcode-s dis-f jus-x al-item">
                                                 <img :src="concatData.data && concatData.data.wechatdata.url"
                                                     class="user-img" alt="">
@@ -918,18 +932,18 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                </div>
-                                <div class="round dis-f jus-x al-item"
-                                    v-if="concatData.data && !concatData.data.wechatdata.url">
-                                    <div class="deepen dis-f jus-x al-item">
-                                        <div class="center-box dis-f jus-x al-item">
-                                            <div class="center-s dis-f jus-x al-item">
-                                                <div class="drop">
+                                        <!-- <div class="round dis-f jus-x al-item"
+                                            v-if="concatData.data && !concatData.data.wechatdata.url">
+                                            <div class="deepen dis-f jus-x al-item">
+                                                <div class="center-box dis-f jus-x al-item">
+                                                    <div class="center-s dis-f jus-x al-item">
+                                                        <div class="drop">
 
+                                                        </div>
+                                                    </div>
                                                 </div>
                                             </div>
-                                        </div>
+                                        </div> -->
                                     </div>
                                 </div>
                             </div>
@@ -1480,6 +1494,9 @@ img {
 .jus-x {
     justify-content: center;
 }
+.jus-sp{
+    justify-content: space-around;
+}
 
 .al-item {
     align-items: center;
@@ -1657,12 +1674,15 @@ img {
                 letter-spacing: normal;
                 color: #333333;
 
+                .mg-l-80{
+                    margin-left:80px;
+                }
+
                 .round {
                     width: 180px;
                     height: 180px;
                     background: rgba(218, 246, 241, 0.5);
                     border-radius: 50%;
-                    margin-left: 80px;
 
                     .deepen {
                         width: 130px;
@@ -1698,7 +1718,7 @@ img {
                     height: 368px;
                     position: absolute;
                     z-index: 333;
-                    padding: 0px 80px 0 60px;
+                    padding: 0px 80px 0 45px;
                     font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                     font-weight: 400;
                     font-style: normal;
@@ -1720,7 +1740,6 @@ img {
                     }
 
                     .whatsapp-wx-box {
-                        margin-top: 50px;
                         font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
                         font-weight: 400;
                         font-style: normal;
@@ -1744,7 +1763,7 @@ img {
                             width: 1px;
                             height: 190px;
                             border: 1px solid #e2e7ec;
-                            margin: 0 100px 0 100px
+                            margin: 0 30px 0 30px
                         }
                     }
 
@@ -1754,6 +1773,15 @@ img {
                         font-style: normal;
                         font-size: 24px;
                         color: #000000;
+                        margin-bottom: 30px;
+                    }
+
+                    .mg-b-50{
+                        margin-bottom:50px;
+                    }
+
+                    .mg-b-30 {
+                        margin-bottom: 30px;
                     }
 
                     .box-text {
@@ -1763,6 +1791,11 @@ img {
                         font-size: 18px;
                         color: #000000;
                         margin-top: 20px;
+
+                        .num-text {
+                            width:180px;
+                            word-wrap: break-word;
+                        }
                     }
 
                     .mg-l-35 {