From a9858985e26c5477da25026fbfea8154df5811c2 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Tue, 8 Aug 2023 14:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E4=BB=8B/=E4=B8=AA=E4=BA=BA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E8=B7=B3=E8=BD=AC=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20=20=E6=88=BF=E6=BA=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E9=99=90=E6=94=B9=E4=B8=BA=E7=A7=9F=E6=9C=9F?=
 =?UTF-8?q?=E4=B8=8D=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biserialListItem/biserialListItem.vue     |  2 +-
 .../seachModule/authenticationInfo.vue        | 32 +++++++-----
 src/components/seachModule/seachModule.vue    |  6 +--
 .../user/systematic-notification-pop.vue      | 27 ++++++----
 src/views/detail.vue                          |  5 +-
 src/views/user.vue                            | 51 +++++++++++--------
 6 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index d0d7de7..18aab12 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -43,7 +43,7 @@
                         <div class="tab-item mg-l-8"
                             v-if="listData.data && listData.data.rentalduration && data && data.data.rentalduration">
                             {{data.data.rentalduration
-                                        === '0'?'不限':
+                                        === '0'?'租期不限':
                                 listData.data.rentalduration[data.data && data.data.rentalduration] || ''
                             }}
                         </div>
diff --git a/src/components/seachModule/authenticationInfo.vue b/src/components/seachModule/authenticationInfo.vue
index a16ffa1..b8e7d5b 100644
--- a/src/components/seachModule/authenticationInfo.vue
+++ b/src/components/seachModule/authenticationInfo.vue
@@ -1,18 +1,19 @@
 <template>
-    <div class="info-box dis-f al-item" :class="{'intermediary-housing-s':path==='/intermediaryHousing'}">
-        <img src="../../assets/img/detail/authenticationInfoR.svg" v-if="path==='/personHousing'" class="tab-img" alt="">
-        <img src="../../assets/img/detail/authenticationInfoInte.svg" v-if="path==='/intermediaryHousing'" class="tab-img" alt="">
+    <div class="info-box dis-f al-item" :class="{'intermediary-housing-s':type==2}">
+
+        <img src="../../assets/img/detail/authenticationInfoR.svg" v-if="type==1" class="tab-img" alt="">
+        <img src="../../assets/img/detail/authenticationInfoInte.svg" v-if="type==2" class="tab-img" alt="">
         <div class="dis-f al-item">
             <div class="tab-text">
                 <div class="dis-f al-item" v-for="(item, i) in tabText" :key="i" :class="{ 'mg-t-25': i > 0 }">
-                    <img src="../../assets/img/detail/authenticationInfoTab.svg" class="tab-icon" alt="" v-if="path==='/personHousing'">
-                    <img src="../../assets/img/detail/authenticationInfoInteTab.svg" class="tab-icon" alt="" v-if="path==='/intermediaryHousing'">{{ item }}
+                    <img src="../../assets/img/detail/authenticationInfoTab.svg" class="tab-icon" alt="" v-if="type==1">
+                    <img src="../../assets/img/detail/authenticationInfoInteTab.svg" class="tab-icon" alt="" v-if="type==2">{{ item }}
                 </div>
             </div>
             <div class="mg-l-100">
                 <div class="qr-code-bg dis-f jus-x al-item">
-                    <img src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth" v-if="path==='/personHousing'" class="qr-code" alt="">
-                    <img src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth" v-if="path==='/intermediaryHousing'" class="qr-code" alt="">
+                    <img src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth" v-if="type==1" class="qr-code" alt="">
+                    <img src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth" v-if="type==2" class="qr-code" alt="">
                 </div>
                 <div class="code-text">
                     微信扫码认证
@@ -22,16 +23,23 @@
     </div>
 </template>
 <script setup>
-import {  } from 'vue'
+import { defineProps } from 'vue'
 import { useRouter } from "vue-router";
 
+const props = defineProps({
+    //1 个人房源认证   2 中介房源认证
+    type:{
+        type:[Number,String]
+    }
+})
+
 //路由
 let router=useRouter()
-let path = router.currentRoute.value.path
+let type = props.type
 
 let tabText=null
-path==='/personHousing'?tabText = ['认证标识', '发布更多房源', '求房源对接']:
-path==='/intermediaryHousing'?tabText = ['身份标识', '发布更多房源', '求房源对接']:[]
+type==1?tabText = ['认证标识', '发布更多房源', '求房源对接']:
+type==2?tabText = ['身份标识', '发布更多房源', '求房源对接']:[]
 
 
 </script>
@@ -65,7 +73,7 @@ img {
 }
 
 .info-box {
-    width: 462px;
+    width: 464px;
     height: 217px;
     border-radius: 16px;
     border: 1px solid #e4e4f6;
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index d1e7707..180802e 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -62,7 +62,7 @@
                             <img src="../../assets/homeImage/authenticationBtnImg.png" class="text-img" alt="">
                             <img src="../../assets/homeImage/authenticationBtnCode.svg" class="code-img" alt="">
                             <div class="btn-qrcode">
-                                <authentication-info></authentication-info>
+                                <authentication-info :type="1"></authentication-info>
                                 <!-- <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
                                 <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth"> -->
                             </div>
@@ -72,7 +72,7 @@
                             <img src="../../assets/homeImage/intermediaryText.png" class="text-img" alt="">
                             <img src="../../assets/homeImage/intermediaryCode.svg" class="code-img" alt="">
                             <div class="btn-qrcode">
-                                <authentication-info></authentication-info>
+                                <authentication-info :type="2"></authentication-info>
                                 <!-- <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
                                 <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth"> -->
                             </div>
@@ -333,7 +333,7 @@ defineExpose({
             border-bottom: 1px solid #ebebeb;
 
             .intermediary-btn {
-                background: rgba(241, 245, 247, 1);
+                background: rgba(241, 245, 247, 1) !important;
             }
 
             .authentication-btn {
diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index d0786ca..5cf0844 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -30,7 +30,7 @@
                         <img class="new" v-if="item['isread'] == 0" src="@/assets/img/user/new.png">
                         <div class="time">{{ item['timestamp'] }}</div>
                         <div class="text">{{ item['message'] }}</div>
-                        <el-popover placement="bottom" :width="360" trigger="click" :show-arrow="false"
+                        <el-popover placement="bottom" :width="464" trigger="click" :show-arrow="false"
                             popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
                             <template #reference>
                                 <div class="footer flexcenter" v-if="item['data'] && item['data']['url']">
@@ -43,13 +43,15 @@
                             <img v-else style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg"> -->
 
                             <div v-if="item['data']['url'].indexOf('middlemanAuth') != -1" class="btn-qrcode">
-                                <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
-                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth">
+                                <authentication-info :type="2" style="height: 217px ;"></authentication-info>
+                                <!-- <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
+                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth"> -->
                             </div>
 
                             <div v-else class="btn-qrcode flexcenter">
-                                <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
-                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth">
+                                <authentication-info :type="1" style="height: 217px ;"></authentication-info>
+                                <!-- <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
+                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth"> -->
                             </div>
 
                         </el-popover>
@@ -58,7 +60,7 @@
                         <img class="new" v-if="item['isread'] == 0" src="@/assets/img/user/new.png">
                         <div class="time">{{ item['timestamp'] }}</div>
                         <div class="text">{{ item['message'] }}</div>
-                        <el-popover placement="bottom" :width="360" trigger="click" :show-arrow="false"
+                        <el-popover placement="bottom" :width="464" trigger="click" :show-arrow="false"
                             popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
                             <template #reference>
                                 <div class="footer flexcenter"
@@ -67,8 +69,9 @@
                                 </div>
                             </template>
                             <div class="btn-qrcode flexcenter">
-                                <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
-                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth">
+                                <authentication-info :type="2" style="height: 217px ;"></authentication-info>
+                                <!-- <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
+                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth"> -->
                             </div>
                             <!-- <img style="width: 360px;" src="@/assets/img/publicImage/mediation-authentication-code.svg"> -->
                         </el-popover>
@@ -85,7 +88,7 @@
                             <div class="title flex1 ellipsis">{{ item['data']['subject'] }}</div>
                             <div class="id">房源ID：{{ item['data']['id'] }}</div>
                         </div>
-                        <el-popover placement="bottom" :width="360" trigger="click" :show-arrow="false"
+                        <el-popover placement="bottom" :width="464" trigger="click" :show-arrow="false"
                             popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
                             <template #reference>
                                 <div class="footer flexcenter"
@@ -94,8 +97,9 @@
                                 </div>
                             </template>
                             <div class="btn-qrcode flexcenter">
-                                <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
-                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth">
+                                <authentication-info :type="1" style="height: 217px ;"></authentication-info>
+                                <!-- <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
+                                <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth"> -->
                             </div>
                             <!-- <img style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg"> -->
                         </el-popover>
@@ -127,6 +131,7 @@
 import emptyDuck from '@/components/public/empty-duck.vue'
 import { onMounted, getCurrentInstance, ref, onUnmounted, defineEmits } from 'vue'
 import { useRouter } from 'vue-router';
+import authenticationInfo from '../seachModule/authenticationInfo.vue';
 import store from '../../store/index';
 
 if (store.state.user) store.state.user['messagenum'] = 0
diff --git a/src/views/detail.vue b/src/views/detail.vue
index a4b1d0f..05ee237 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -790,7 +790,7 @@
             </div>
             <div class="body-maxWidth" v-if="publisherList.length > 0">
                 <div style="margin-top:15px;display: flex;flex-wrap: wrap;margin-bottom: 50px;width:876px">
-                    <biserialItem v-for="(item, i) in publisherList" :detailShow="true" :key="i" :item="item">
+                    <biserialItem v-for="(item, i) in publisherList" :detailShow="true" :key="i" :item="item" v-show="item&&item.verified">
                     </biserialItem>
                 </div>
             </div>
@@ -1280,7 +1280,8 @@ let contacts = reactive({
 //获取房源详情
 let getHousingInfo = () => {
     api.details({
-        uniqid: uniqid.value
+        uniqid: uniqid.value,
+        uid:store.state.user.uid
     }).then(res => {
         // console.log(res)
         if (res.code === 200) {
diff --git a/src/views/user.vue b/src/views/user.vue
index eee5887..226f7a7 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -40,31 +40,30 @@
                 </div>
                 <template v-if="user['uid'] && user.identity != 0">
                     <img class="" src="@/assets/img/publicImage/cut-off-rule.svg">
-                    <el-popover placement="bottom-end" :width="360" trigger="hover" :show-arrow="false"
-                        popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
-                        <template #reference>
-                            <div class="operate-item flexcenter identity">
-                                <div class="operate-item-shell flexcenter"
-                                    :class="{ 'intermediary': user.identity == 1, 'personage': user.identity == -1 }">
-                                    <img class="operate-icon" src="@/assets/img/publicImage/intermediary-icon.png">
-                                </div>
-                                <div class="operate-text">{{ identityObj[user.identity || -1] }}</div>
-                            </div>
-                        </template>
-                        <!-- <img v-if="user.identity == 1" style="width: 360px;"
-                            src="@/assets/img/publicImage/mediation-authentication-code.svg">
-                        <img v-else style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg"> -->
-
+                    <div class="operate-item flexcenter identity">
+                        <div class="operate-item-shell flexcenter"
+                            :class="{ 'intermediary': user.identity == 1, 'personage': user.identity == -1 }">
+                            <img class="operate-icon" src="@/assets/img/publicImage/intermediary-icon.png">
+                        </div>
+                        <div class="operate-text">{{ identityObj[user.identity || -1] }}</div>
                         <div v-if="user.identity == 1" class="btn-qrcode">
-                            <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
-                            <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth">
+                            <authentication-info :type="2" style="height: 217px ;"></authentication-info>
+                            <!-- <img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
+                            <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth"> -->
                         </div>
 
                         <div v-else class="btn-qrcode">
-                            <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
-                            <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth">
+                            <authentication-info :type="1" style="height: 217px ;"></authentication-info>
+                            <!-- <img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
+                            <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth"> -->
                         </div>
-                    </el-popover>
+                    </div>
+                    <!-- <el-popover placement="right-end" :width="360" trigger="hover" :show-arrow="false"
+                        popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
+                        <img v-if="user.identity == 1" style="width: 360px;"
+                            src="@/assets/img/publicImage/mediation-authentication-code.svg">
+                        <img v-else style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg">
+                    </el-popover> -->
                 </template>
             </div>
         </div>
@@ -122,6 +121,7 @@ import publicListItem from '@/components/public/public-list-item.vue'
 import emptyDuck from '@/components/public/empty-duck.vue'
 import choosingIdentity from '@/components/edit/choosingIdentity.vue'
 import backToTop from '@/components/public/backToTop.vue'
+import authenticationInfo from '@/components/seachModule/authenticationInfo.vue';
 
 import { ref, reactive, onMounted, onUnmounted, getCurrentInstance, nextTick, pushScopeId } from 'vue'
 import { useRoute, useRouter } from 'vue-router';
@@ -426,6 +426,10 @@ onUnmounted(() => {
 
         .info-right {
 
+            .operate-item:hover .btn-qrcode{
+                display: block;
+            }
+
             .operate-item {
                 flex-direction: column;
                 padding: 0 52px;
@@ -600,8 +604,13 @@ onUnmounted(() => {
 }
 
 .btn-qrcode {
+    position: absolute;
+    right: 155px;
+    top: 74px;
     width: 360px;
-    margin: 0 auto;
+    z-index: 66;
+    display: none;
+    // margin: 0 auto;
 
     .bj {
         width: 100%;