From 8104cbbb8ca86d6fc3f0cf8ecc95f0456ad346bc Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Mon, 31 Jul 2023 18:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biserialListItem/biserialListItem.vue     | 20 +++++++++++--------
 .../indexWaterfallBox/indexWaterfallBox.vue   | 16 ++++++++++-----
 src/components/seachPage/input.vue            |  1 +
 src/views/detail.vue                          |  9 +++++++--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index 5a646fe..3eb7b3b 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -66,14 +66,14 @@
                     </div>
 
                     <div class="price-text dis-f" style="align-items: end;">
-                        <span class="unit">HK$</span>
-                        <span class="price" v-if="!Array.isArray(data && data.data && data.data.rent)">{{ data && data.data
-                            && data.data.rent }}</span>
-                        <span class="price" v-if="Array.isArray(data && data.data && data.data.rent)">{{ data && data.data
+                        <div class="unit">HK$</div>
+                        <div class="price" v-if="!Array.isArray(data && data.data && data.data.rent)">{{ data && data.data
+                            && data.data.rent }}</div>
+                        <div class="price" v-if="Array.isArray(data && data.data && data.data.rent)">{{ data && data.data
                             &&
-                            data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}</span>
+                            data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}</div>
                         <span>/{{ data && data.data && data.data.rentalperiod }}</span>
-                        <span class="time" v-show="data && data.data && data.data.rentalduration != 0">[ 租期{{
+                        <span class="time" v-show="data && data.data && data.data.rentalduration != 0&&pageType ==2">[ 租期{{
                             listData.data.rentalduration[data.data && data.data.rentalduration]
                         }}]</span>
                     </div>
@@ -372,6 +372,7 @@ img {
             font-size: 14px;
             color: #555555;
             margin-top: 20px;
+            line-height:20px;
 
             .time {
                 font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
@@ -380,6 +381,7 @@ img {
                 font-size: 14px;
                 color: #7F7F7F;
                 margin-left: 15px;
+                line-height:19px;
             }
 
             .price {
@@ -387,7 +389,8 @@ img {
                 font-weight: 900;
                 font-size: 20px;
                 color: #F95D5D;
-                line-height: 20px;
+                line-height: 23px;
+                margin:0 5PX;
             }
 
             .unit {
@@ -395,6 +398,7 @@ img {
                 font-weight: 900;
                 color: #000000;
                 font-size: 14px;
+                line-height:20px;
             }
         }
 
@@ -431,7 +435,7 @@ img {
 
         .btn {
             margin-left: 10px;
-            padding: 3px 5px;
+            padding: 0px 5px;
             background: inherit;
             background-color: rgba(242, 242, 242, 0);
             box-sizing: border-box;
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index e26de9d..f14c1fe 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -37,10 +37,10 @@
                 1)]
             }} > {{ location.data && location.data[itemData.location] }}</span>
         </div>
-        <div style="padding:0 10px;margin-top:12px;" v-if="itemData.type === 'housing'">
-            <span class="unit">{{ itemData.currency }}</span>
-            <span class="price">{{ itemData.rent }}</span>
-            <span class="date">/月</span>
+        <div style="padding:0 10px;margin-top:12px;align-items: end;" class="rent-box dis-f" v-if="itemData.type === 'housing'">
+            <div class="unit">HK$</div>
+            <div class="price">{{ itemData.rent }}</div>
+            <div class="date">/月</div>
         </div>
         <!-- <div class="title">
                 iRent油麻地二期公寓
@@ -55,7 +55,7 @@
                     <div class="suite-type">
                         {{ item.title }}
                     </div>
-                    <div>
+                    <div class="dis-f" style="align-items: end;line-height:20px;">
                         <span class="unit">HK$</span>
                         <span class="price">{{ item.value }}</span>
                         <span class="date">/月</span>
@@ -160,6 +160,7 @@ watchEffect(()=>{
     font-weight: 900;
     color: #000000;
     font-size: 14px;
+    line-height:19px;
 }
 
 .price {
@@ -168,6 +169,7 @@ watchEffect(()=>{
     font-size: 20px;
     color: #F95D5D;
     margin-left: 3px;
+    line-height:23px;
 }
 
 .date {
@@ -255,6 +257,9 @@ watchEffect(()=>{
         margin-top: 15px;
         padding: 0 10px;
     }
+    .rent-box{
+        line-height:20px;
+    }
 
     .address-text {
         font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
@@ -283,6 +288,7 @@ watchEffect(()=>{
         display: -webkit-box;
         -webkit-line-clamp: 3;
         -webkit-box-orient: vertical;
+        line-height:28px;
 
         .type {
             width: 40px;
diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index 097aff9..e1e2b11 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -883,6 +883,7 @@ img {
     width: 150px;
     background: inherit;
     background-color: rgba(255, 255, 255, 1);
+    padding:10px;
 }
 
 .dropdown-check-text {
diff --git a/src/views/detail.vue b/src/views/detail.vue
index d5c800d..87235f1 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -80,7 +80,7 @@
                 <breadcrumb :data="housingInfo['data']" :operation='setOperation'></breadcrumb>
                 <div class="dis-f jus-bet" style="margin-top: -15px;">
                     <div class="info-box">
-                        <div class="detail-price-box">
+                        <div class="detail-price-box dis-f" style="align-items: end;">
                             <span class="need-houing-type" v-if="pageType == 3">预算</span>
                             <span class="unit" :style="{ 'font-size': pageType === 3 ? '20px' : '' }">HK$</span><span
                                 class="rent" v-if="pageType != 3">{{
@@ -1534,9 +1534,11 @@ img {
     font-style: normal;
     color: #FFFFFF;
     text-align: center;
-    padding: 2px 5px;
+    padding: 0px 5px;
     font-size: 14px;
     margin-right: 10px;
+    height:24px;
+    line-height:24px;
 }
 
 .clone-btn {
@@ -2221,6 +2223,7 @@ img {
         font-weight: 400;
         font-size: 16px;
         color: #555555;
+        line-height:16px;
 
         .rent {
             font-family: 'Arial-Black', 'Arial Black', sans-serif;
@@ -2228,12 +2231,14 @@ img {
             font-size: 28px;
             color: #F95D5D;
             margin: 0 5px;
+            line-height:22px;
         }
 
         .unit {
             font-family: 'Arial-Black', 'Arial Black', sans-serif;
             font-weight: 900;
             color: #000000;
+            line-height:20px;
         }
     }