From 107b6a241ea665ab4d61c97773ffb791d3115870 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 27 Jul 2023 12:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexWaterfallBox/indexWaterfallBox.vue   | 175 +++++++++---------
 1 file changed, 91 insertions(+), 84 deletions(-)

diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index 86df1e7..545f5b6 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -1,89 +1,96 @@
 <template>
-        <div class="waterfall-box" v-if="itemData.type !== 'adv'"
-            :class="{ 'waterfall-box-housing': itemData.type === 'housing' }" @click="watchInfo">
-            <div class="flexflex pos-r">
-                <div class="box-tab-type" v-if="itemData.intermediarytext">
-                    {{ itemData.intermediarytext }}
-                </div>
-                <div class="intermediary-type" v-if="itemData.isintermediary">
-                    认证中介
-                </div>
-                <img class="apartment-img" :src="itemData.imageLocal || itemData.image"
-                    v-if="itemData.type === 'housing' || itemData.type === 'apartment'" />
-                <div class="authentication-box"
-                    v-if="(itemData&&itemData.type === 'housing' && itemData&&itemData.verified) || (itemData&&itemData.type === 'apartment' &&itemData&& itemData.isintermediary)">
-                    <img src="../../assets/homeImage/authenticationLogo.png" class="logo" alt="">
-                    <img src="../../assets/homeImage/authenticationBg.svg" class="authentication-bg" alt="">
-                    <img src="../../assets/homeImage/authenticationText.png" class="authentication-text" alt="">
-                </div>
+    <div class="waterfall-box" v-if="itemData.type !== 'adv'"
+        :class="{ 'waterfall-box-housing': itemData.type === 'housing' }" @click="watchInfo">
+        <div class="flexflex pos-r">
+            <div class="box-tab-type" v-if="itemData.intermediarytext">
+                {{ itemData.intermediarytext }}
             </div>
-            <div class="long-title">
-                <span class="type" v-if="itemData.type === 'housing'">{{ itemData.gptype }}</span>{{ itemData&&itemData.title }}
+            <div class="intermediary-type" v-if="itemData.isintermediary">
+                认证中介
             </div>
-            <div class="type-tab">
-                <span v-if="itemData.type === 'housing'">
-                    {{ itemData.housingtype }}
-                    {{ itemData.elevator === -1 || !itemData.elevator ? '' : `· ${itemData.elevator}` }}
-                    {{ itemData.sunshinearea === -1 || !itemData.sunshinearea ? '' : `· ${itemData.sunshinearea}` }}
-                    {{ `· ${itemData.gender}` }}
-                    {{ itemData.leaseterm ? `· ${itemData.leaseterm}` : '' }}
-                </span>
-                <span v-if="itemData.type === 'apartment'">{{ itemData.propaganda }}</span>
+            <img class="apartment-img" :src="itemData.imageLocal || itemData.image"
+                v-if="itemData.type === 'housing' || itemData.type === 'apartment'" />
+            <div class="authentication-box"
+                v-if="(itemData && itemData.type === 'housing' && itemData && itemData.verified) || (itemData && itemData.type === 'apartment' && itemData && itemData.isintermediary)">
+                <img src="../../assets/homeImage/authenticationLogo.png" class="logo" alt="">
+                <img src="../../assets/homeImage/authenticationBg.svg" class="authentication-bg" alt="">
+                <img src="../../assets/homeImage/authenticationText.png" class="authentication-text" alt="">
             </div>
-            <div style="padding: 0 10px;margin-top:15px;" class="dis-f al-item" v-if="itemData.type === 'housing'">
-                <img src="../../assets/homeImage/addMarker.png" class="add-marker" alt="">
-                <span class="address-text">{{ location.data&&location.data[itemData.location&&itemData.location.substring(0,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>
-            <!-- <div class="title">
+        </div>
+        <div class="long-title">
+            <span class="type" v-if="itemData.type === 'housing'">{{ itemData.gptype }}</span>{{ itemData && itemData.title }}
+        </div>
+        <div class="type-tab">
+            <span v-if="itemData.type === 'housing'">
+                {{ itemData.housingtype }}
+                {{ itemData.elevator === -1 || !itemData.elevator ? '' : `· ${itemData.elevator}` }}
+                {{ itemData.sunshinearea === -1 || !itemData.sunshinearea ? '' : `· ${itemData.sunshinearea}` }}
+                {{ `· ${itemData.gender}` }}
+                {{ itemData.leaseterm ? `· ${itemData.leaseterm}` : '' }}
+            </span>
+            <span v-if="itemData.type === 'apartment'">{{ itemData.propaganda }}</span>
+        </div>
+        <div style="padding: 0 10px;margin-top:15px;" class="dis-f al-item" v-if="itemData.type === 'housing'">
+            <img src="../../assets/homeImage/addMarker.png" class="add-marker" alt="">
+            <span class="address-text">{{ location.data && location.data[itemData.location && itemData.location.substring(0, 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>
+        <!-- <div class="title">
                 iRent油麻地二期公寓
             </div> -->
-            <!-- <div class="info-text">
+        <!-- <div class="info-text">
                 年轻有活力且超有玩趣的公寓
             </div> -->
-            <div class="suite-box" v-if="itemData.type === 'apartment'">
-                <div class="dis-f al-item jus-bet">
-                    <div class="suite-type">
-                        {{ itemData.specifications && itemData.specifications[0]&&itemData.specifications[0].title }}
-                    </div>
-                    <div>
-                        <span class="unit">HK$</span>
-                        <span class="price">{{ itemData.specifications && itemData.specifications[0]&&itemData.specifications[0].value }}</span>
-                        <span class="date">/月</span>
-                    </div>
+        <div class="suite-box" v-if="itemData.type === 'apartment'">
+            <div class="dis-f al-item jus-bet">
+                <div class="suite-type">
+                    {{ itemData.specifications && itemData.specifications[0] && itemData.specifications[0].title }}
                 </div>
-                <div class="line"></div>
-                <div class="dis-f al-item jus-bet">
-                    <div class="suite-type">
-                        {{ itemData.specifications && itemData.specifications[1]&&itemData.specifications[1].title }}
-                    </div>
-                    <div>
-                        <span class="unit">HK$</span>
-                        <span class="price">{{ itemData.specifications && itemData.specifications[1]&&itemData.specifications[1].value }}</span>
-                        <span class="date">/月</span>
-                    </div>
+                <div>
+                    <span class="unit">HK$</span>
+                    <span class="price">{{ itemData.specifications &&
+                        itemData.specifications[0] && itemData.specifications[0].value }}</span>
+                    <span class="date">/月</span>
                 </div>
             </div>
-            <div class="corner-box">
-                <img src="../../assets/homeImage/corner.svg" v-if="itemData.type === 'housing'&&itemData.intermediary!==1" class="corner-img" alt="">
-                <img src="../../assets/homeImage/intermediaryCorner.svg" v-if="itemData.type === 'housing'&&itemData.intermediary===1" style="transform: rotate(90deg);" class="tab-img" alt="">
+            <div class="line"></div>
+            <div class="dis-f al-item jus-bet">
+                <div class="suite-type">
+                    {{ itemData.specifications && itemData.specifications[1] && itemData.specifications[1].title }}
+                </div>
+                <div>
+                    <span class="unit">HK$</span>
+                    <span class="price">{{ itemData.specifications &&
+                        itemData.specifications[1] && itemData.specifications[1].value }}</span>
+                    <span class="date">/月</span>
+                </div>
             </div>
-            <!-- <div class="apartment-price-more flexcenter">更多</div> -->
-
-            <!-- <div class="color-scheme" style="background: #b3c7f4;"></div> -->
-            <div class="apartment-top flexcenter" v-if="itemData.type === 'apartment'">
-                <img class="apartment-bottom-icon" src="../../assets/homeImage/apartment-bottom.png" />
-                <img class="apartment-icon" src="../../assets/homeImage/apartment-icon.png" />
-                <img class="apartment-text" src="../../assets/homeImage/apartment-text.png" />
-            </div>
-
-            <!-- 广告 -->
         </div>
-        <img :src="itemData.imageLocal || itemData.image" class="live-img" v-if="itemData.type === 'adv'" alt="" @click="watchAdv">
+        <div class="corner-box">
+            <img src="../../assets/homeImage/corner.svg" v-if="itemData.type === 'housing' && itemData.intermediary !== 1"
+                class="corner-img" alt="">
+            <img src="../../assets/homeImage/intermediaryCorner.svg"
+                v-if="itemData.type === 'housing' && itemData.intermediary === 1" style="transform: rotate(90deg);"
+                class="tab-img" alt="">
+        </div>
+        <!-- <div class="apartment-price-more flexcenter">更多</div> -->
+
+        <!-- <div class="color-scheme" style="background: #b3c7f4;"></div> -->
+        <div class="apartment-top flexcenter" v-if="itemData.type === 'apartment'">
+            <img class="apartment-bottom-icon" src="../../assets/homeImage/apartment-bottom.png" />
+            <img class="apartment-icon" src="../../assets/homeImage/apartment-icon.png" />
+            <img class="apartment-text" src="../../assets/homeImage/apartment-text.png" />
+        </div>
+
+        <!-- 广告 -->
+    </div>
+    <img :src="itemData.imageLocal || itemData.image" class="live-img" v-if="itemData.type === 'adv'" alt=""
+        @click="watchAdv">
 </template>
   
 <script setup>
@@ -99,27 +106,27 @@ const props = defineProps({
     }
 })
 let itemData = props.data
-let location=reactive({data:{}})
-location.data=store.state.indexData.config.location
+let location = reactive({ data: {} })
+location.data = store.state.indexData.config.location
 
-let router=useRouter()
-let watchInfo=()=>{
+let router = useRouter()
+let watchInfo = () => {
     console.log(itemData.type)
     router.push({
-        path:itemData.type==='apartment'?'/apartmentDetail':'/detail',
+        path: itemData.type === 'apartment' ? '/apartmentDetail' : '/detail',
         query: {
             // id: itemData.type=='apartment'?itemData.id:itemData.uniqid,
-            // [itemData.type=='apartment'?itemData.id:itemData.uniqid,]: itemData.type=='apartment'?itemData.id:itemData.uniqid,
-            type:itemData.intermediary=='1'?2:itemData.intermediary=='6'?3:!itemData.intermediary?'':1
+            [itemData.type == 'apartment' ? "uniqid" : "id"]: itemData.type == 'apartment' ? itemData.id : itemData.uniqid,
+            type: itemData.intermediary == '1' ? 2 : itemData.intermediary == '6' ? 3 : !itemData.intermediary ? '' : 1
         }
     })
 }
 
-let watchAdv=()=>{
-    if(itemData.url){
+let watchAdv = () => {
+    if (itemData.url) {
         window.open(itemData.url)
-    }else{
-       watchInfo() 
+    } else {
+        watchInfo()
     }
 }