From 2e14894e320939d33a1c589470d5e1b2ffbd4bf3 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Thu, 3 Aug 2023 19:37:17 +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

---
 .../biserialListItem/biserialListItem.vue     |  6 +--
 src/components/detail/imageWatch.vue          |  2 +-
 .../indexWaterfallBox/indexWaterfallBox.vue   |  2 +-
 src/views/detail.vue                          | 42 ++++++++++++-------
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index 7973e3a..e1d673c 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -42,9 +42,9 @@
                         </div>
                         <div class="tab-item mg-l-8"
                             v-if="listData.data && listData.data.rentalduration && data && data.data.rentalduration">
-                            {{
-                                listData.data.rentalduration[data.data && data.data.rentalduration] ||
-                                ''
+                            {{data.data.rentalduration
+                                        === '0'?'不限':
+                                listData.data.rentalduration[data.data && data.data.rentalduration] || ''
                             }}
                         </div>
                     </div>
diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue
index d4dde80..eb751ec 100644
--- a/src/components/detail/imageWatch.vue
+++ b/src/components/detail/imageWatch.vue
@@ -187,7 +187,7 @@ img {
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 999;
+    z-index: 1003;
 
     .tab-text {
         font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index 04cad7b..f2f35ec 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -117,7 +117,7 @@ location.data = store.state.indexData.config.location
 let router = useRouter()
 let watchInfo = () => {
     // console.log(router,window.location.href)
-    window.open(`${router,window.location.href}${itemData.type === 'apartment' ? 'apartmentDetail' : 'detail'}?${itemData.type == 'apartment' ? "uniqid" : "id"}=${itemData.type == 'apartment' ? itemData.id : itemData.uniqid}`)
+    window.open(`${document.location.origin}/${itemData.type === 'apartment' ? 'apartmentDetail' : 'detail'}?${itemData.type == 'apartment' ? "uniqid" : "id"}=${itemData.type == 'apartment' ? itemData.id : itemData.uniqid}`)
     // router.push({
     //     path: itemData.type === 'apartment' ? '/apartmentDetail' : '/detail',
     //     query: {
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 46e8524..2cff8cb 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -72,9 +72,10 @@
                                                     <span>
                                                         转发
                                                     </span>
-                                                    <transmit-btn v-if="housingInfo.data" :concatType="concatType" 
+                                                    <transmit-btn v-if="housingInfo.data" :concatType="concatType"
                                                         :qrcode="housingInfo.data['qrcode']"
-                                                        :title="housingInfo.data.info['subject']" type="housingTop"></transmit-btn>
+                                                        :title="housingInfo.data.info['subject']"
+                                                        type="housingTop"></transmit-btn>
                                                 </div>
                                             </div>
                                             <div class="concat-btn-box" :class="{ 'concat-btn-show': concatType }">
@@ -515,7 +516,8 @@
                                 <div class="dis-f al-item" style="position:relative;" @click="setShowDistance">
                                     <!-- <img src="../assets/img/detail/line.svg" class="line-img" alt=""> -->
                                     <div class="dis-f al-item s-w-100" style="position:absolute;">
-                                        <div class="line-school-box dis-f al-item s-w-100" style="justify-content:space-around;">
+                                        <div class="line-school-box dis-f al-item s-w-100"
+                                            style="justify-content:space-around;">
                                             <div v-for="(item, i) in distanceList" class="box-text" :key="item && item.id"
                                                 v-show="i < 9 && item.id">
                                                 <div :class="{ 'far-s': item && item.recently_distance > 4 }"
@@ -559,7 +561,8 @@
                         <div class="houseing-info-box dis-f al-item jus-bet">
                             <div class="dis-f al-item">
                                 房源ID : &nbsp<span class="houseing-id" @click="clone(housingInfo['data'] &&
-                                    housingInfo['data'].info.id)">{{ housingInfo['data'] && housingInfo['data'].info.id}}</span>
+                                    housingInfo['data'].info.id)">{{ housingInfo['data'] &&
+        housingInfo['data'].info.id }}</span>
                                 <span class="browse-box">
                                     浏览 :<span class="text">{{ housingInfo['data'] && housingInfo['data'].info.count_view
                                     }}</span>
@@ -598,21 +601,26 @@
                                 发布者对房源信息的真实性、合法性等负责，平台不负责甄别和审核具体内容真实性和有效性等，请务必仔细核实相关信息，谨防上当受骗。
                                 <div>
                                     如房源信息中有内容侵犯了您的合法权益，可点击屏幕右侧的举报或联系寄托方同学（微信号
-                                    <el-dropdown style="border-color:#fff;">
-                                        <span class="text-line line-h-30" style="border-color: #fff;"
+                                    <el-popover placement="bottom" trigger="hover" >
+                                              <div class="wx-qrcode-s">
+                                                <img :src="concatInfo.data && concatInfo.data.wechatqrcode"
+                                                    style="width:130px;height:130px" alt="">
+                                            </div>  
+                                        <template #reference>
+                                            <span class="text-line line-h-30" style="border-color: #fff;"
                                             @click="clone(concatInfo.data && concatInfo.data.wechat)">{{
                                                 concatInfo.data && concatInfo.data.wechat }}</span>
+                                        </template>
+                                    </el-popover>
+                                    <!-- <el-dropdown style="border-color:#fff;">
                                         <template #dropdown>
                                             <el-dropdown-menu>
                                                 <el-dropdown-item>
-                                                    <div class="wx-qrcode-s">
-                                                        <img :src="concatInfo.data && concatInfo.data.wechatqrcode"
-                                                            style="width:130px;height:130px" alt="">
-                                                    </div>
+                                                    
                                                 </el-dropdown-item>
                                             </el-dropdown-menu>
                                         </template>
-                                    </el-dropdown>
+                                    </el-dropdown> -->
                                     ），我们会及时处理。谢谢！
                                 </div>
                             </div>
@@ -1289,6 +1297,7 @@ let getHousingInfo = () => {
             })
             concatInfo['data'] = store.state.indexData.wechat
             if (res.data.contacts) contacts['data'] = res.data.contacts
+
             if ((pageType.value == 2 && housingInfo['data'].isintermediary) || (pageType.value == 1 && housingInfo['data']['info'].verified)) {
                 getPublisherList()
             } else if (pageType.value != 3) {
@@ -1301,6 +1310,7 @@ let getHousingInfo = () => {
             ElMessage({
                 message: res.message
             })
+            loadMore.value = false
         }
     })
 }
@@ -2731,7 +2741,7 @@ img {
 
     .show-distance-info-box {
         border-width: 1px;
-        /* border-style: solid; */
+        border-style: solid;
         border-color: rgba(235, 235, 235, 1);
         -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
         -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
@@ -2762,7 +2772,8 @@ img {
             height: 500px;
             overflow-y: scroll;
         }
-        .distance-box-s ::-webkit-scrollbar{
+
+        .distance-box-s ::-webkit-scrollbar {
             width: 8px;
         }
 
@@ -2832,7 +2843,6 @@ img {
             background: linear-gradient(180deg, rgba(209, 248, 239, 1) 0%, rgba(255, 255, 255, 1) 144%);
             box-sizing: border-box;
             border-width: 1px;
-            border-style: solid;
             border-color: rgba(235, 235, 235, 1);
             border-radius: 16px;
             border-bottom-right-radius: 0px;
@@ -2978,6 +2988,10 @@ img {
     left: 0;
     z-index: 999;
 }
+
+::deep .el-dropdown {
+    color: #fff;
+}
 </style>
 <style>
 .message-info {