From 29882f84a23fb910c96dcc142504c04df30fe03a Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 2 Aug 2023 17:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/apartmentDetail/introduce-icon.png    | Bin 0 -> 1400 bytes
 src/components/detail/imageWatch.vue          |   9 ++++---
 src/components/public/viewMap.vue             |   3 ++-
 src/views/apartmentDetail.vue                 |  24 ++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/img/apartmentDetail/introduce-icon.png

diff --git a/src/assets/img/apartmentDetail/introduce-icon.png b/src/assets/img/apartmentDetail/introduce-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea23bb1c8356919dbd810fdd2e466a0c04eec43e
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuA;z>k7RCodHR?&6aMi7*f0)o%{
z>Cyp8xKt2!U~~|6V0`A!>_A8bW-1_EfsqP`R3M}RXGYffomRWxfjGdR!+mdz+r8bH
z-3281?(Sx{4cs>Hf8M~Gg@-SpcMtGMb5H-?-F45;7SDeGKEE6L4U;?okHF_dFqbu~
zy-F+4_3yw5NFCbBBgb3dYHWi}*|as#rEzk4V711#{s3G$U~1j_oEymXOVFXI4?vmN
z9DmVuBG<vc7ct9iaq%nATM0|XIrJki^aj~z15`i(SjM{w*aJg+y!!+Uap8J?V*}@g
zZ;<1FvF1?F07HxT=1X7$R)a0>N?@va5cGhhbC@b{Y5i`XsUz+RgV-Vd7I+6dJcDP(
ztQy8!;In}m@kPx;&1$AGI$_Pw7Zdmn$YZW%LrW;Ng1KVWAZ)M@qVzdb7%=t88jY(n
zxR}3)ZJ?qJ(If6e2POPRK+8{wana<6jlNau<HWhn2cv;n2s-#vh7UuYz*7kB9sF<~
zKldUpyXy?$4sqF}^<xq@oO(WhKQ?OhfL1U2i0dYww}vR=u~l%i=BC8R8QTty##hBj
zxz9%sYNAdE<@ofa&Pix^_%ern1I%WcU@O!%@U^@gu~KODiq=Ww47xuI-oCsnUb<hs
z<JZ%d0~autRf4z`K3%88%+Qzxlm<&L;!gNEUD<=S0P4v+vxhMYut?+r?ybZb;!-<E
z6yb30nPUN+5OKm^wVPuB@^kyR>WM{jITj!&XLaQ#FP9(0WnPHCdX8B@`>Og&KsK>A
z@^XYFxAptR>UDAt+TU{irzbWCN6X6*D<UCFXVmaxz5r_f6*Ul!Y-$r6JUc+ki&8E+
z{)wtSs`Sx0K8{*IT$pm+B1wCbjVN|To>rR@<KTtRI2almk(bqVhA4;dKy22sQU;be
zRZNVt2V@R?ZBYp4wLR!G@q;4M7`a-#6{{8Alfm04x!FTIL!1NftxKyBu!cJquOu1#
zA^lp(&l+-IJJ+;V6d5}L=W4?}b4x&4g+R#Bp8Shc$fBJ7;Y<T;icNSxvkig`&;fD)
z#`t!%!4ZD?OCxJEzhUwm=0U0nTCpmj35T4NH}(#BmW~$p$j@#kFlu5$u@9(m6FOn-
z0T|NI?pTx6YOrZSsj>H{w?1vHQRY5O)T}gO8G9oGiqB8<1f+bbO8JXW2X7Cw0MD^G
zI3=(Fc%EuK2z~+hoMa8EQ{VL3^6E*Gqu2v$8)|Gn4l`VApHMkgaBcaAOQ)~CgW<!=
z@MD)ypn(6O2?W>vJXs6)(YW{nac|t^41WaKzrfEqNfj=>Q2xa`DtE6!4v{6^_%Tv$
z7trJv?IKO{SmS1i1-PgKzmR4XX_`lVE;X<RI$(}v?7%CHdUI&?;3fA~3exA##W^dG
zPy+rLJpTk-YW$gZKraXwYk?`;r2HE=0^|z7F|Rq$Rlpt?`_{Iov8=|$SiS}|72tty
zVhvPNo8}uCvI3VKkjmE}cNNCLQkwP&-ByWQO#;_qDSUJ1mareu%@Mgn3#HcTj7#VM
zt8s_BRP#u*csM+@R%s==>H*n&eL=U4!qXwP+TqdLlgTA;A(u4G8rFto@>~K}VH<QA
z8m}gFTtD+%)$n0nE@2y-2~TpA6Y6iJw+-AjaNB^nf&T#dsOldc3+4s@0000<MNUMn
GLSTY!zj&?y

literal 0
HcmV?d00001

diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue
index db786d0..7dc19f0 100644
--- a/src/components/detail/imageWatch.vue
+++ b/src/components/detail/imageWatch.vue
@@ -1,16 +1,17 @@
 <template>
     <div class="watch-box" v-show="show">
         <div class="pos-r dis-f al-item mg-t-60">
-            <div class="s-w-100">
+            <div class="s-w-100" style="">
                 <el-carousel arrow="never" height="600px" :autoplay="false" :initial-index="props.index"
                     indicator-position="none" ref="carousel" @change="carouselChange">
                     <el-carousel-item v-for="(item, i) in list" :key="i">
                         <div class="dis-f jus-x al-item" v-if="item">
                             <div class="img-box dis-f jus-x" style="width:auto;" v-if="item['type'] != 'attachment'">
-                                <video :autoplay="false" controls :src="item.url || item['videourl']"></video>
+                                <video style="width: 666px;" :autoplay="false" controls :src="item.url || item['videourl']"></video>
                             </div>
                             <div class="img-box dis-f jus-x" v-else>
-                                <img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
+                                <!-- <img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt=""> -->
+                                <img src="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
                             </div>
                         </div>
                     </el-carousel-item>
@@ -253,7 +254,7 @@ img {
     }
 
     .img-box {
-        width: 1200px;
+        /* width: 1200px; */
         height: 600px;
         border-radius: 10px;
         overflow: hidden;
diff --git a/src/components/public/viewMap.vue b/src/components/public/viewMap.vue
index 88d53a0..d27dc06 100644
--- a/src/components/public/viewMap.vue
+++ b/src/components/public/viewMap.vue
@@ -82,11 +82,12 @@ const showPop = () => show.value = !show.value
     left: 50%;
     transform: translate(-50%, -50%);
     width: 1200px;
-    height: 800px;
+    height: calc(100% - 100px);
     background: #fff;
     border-radius: 20px;
     padding: 20px;
     max-width: 90vw;
+    // max-height: 85vh;
 
     .close {
         display: block;
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 864b220..0f14d9e 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -5,8 +5,6 @@
     <div class="content wid1200">
         <div class="header">
             <div class="top flexflex">
-                <!-- <div class="brand-name flexcenter">{{ company.title }}</div> -->
-                <!-- <div class="brand-abstract">{{ info['propaganda'] }}</div> -->
                 <div class="brand-abstract flexflex">
                     <div class="flexacenter" style="height: min-content;">
                         <div class="item" @click="publicJump('/')">港校租房</div>
@@ -20,10 +18,6 @@
                 </div>
 
                 <img class="arc-bj" src="@/assets/img/publicImage/angle.png">
-
-                <!-- <div class="arc-bj"> -->
-                    <!-- <div class="arc"></div> -->
-                <!-- </div> -->
             </div>
             <div class="header-content flexflex">
                 <div class="header-left">
@@ -35,7 +29,7 @@
                             <el-carousel-item class="flexcenter" v-for="(item, index) in allCarouselsData">
                                 <img v-if="index >= carouselIndex - 1 && index <= carouselIndex + 1" class="img"
                                     :src="item['image'] || item['imageurl']"
-                                    @click="cloaseImageShow(allCarouselsData, carouselIndex)">
+                                    @click="cloaseImageShow(allCarouselsData, carouselIndex, 'carousel')">
                             </el-carousel-item>
                         </el-carousel>
                         <div class="indicate-type flexacenter" v-if="indicateTypeState()">
@@ -150,12 +144,12 @@
                                 </div>
                                 <div class="media-list flexacenter no-scrollbar" :class="`element${index}`">
                                     <div class="media-item flexcenter" v-for="(it, i) in item['videos']"
-                                        @click="cloaseImageShow([...item['videos'], ...item['images']], i)">
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']], i, `media${index}`)">
                                         <img class="media-img" v-lazy="it['thumbnail']">
                                         <img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
                                     </div>
                                     <div class="media-item flexcenter" v-for="(it, i) in item['images']"
-                                        @click="cloaseImageShow([...item['videos'], ...item['images']], item['videos'].length + i)">
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']], item['videos'].length + i, `media${index}`)">
                                         <img class="media-img" v-lazy="it['thumbnail']">
                                     </div>
                                 </div>
@@ -253,7 +247,8 @@
                 <!-- 品牌介绍 -->
                 <div class="details-item company" v-if="company" ref="companyEle">
                     <div class="details-header flexacenter">
-                        <img class="icon" src="@/assets/img/apartmentDetail/live.png">
+                        <img class="icon" style="width: 20px;height: 20px;"
+                            src="@/assets/img/apartmentDetail/introduce-icon.png">
                         品牌介绍
                     </div>
                     <img class="company-img flexflex" v-lazy="company['imageurl']">
@@ -410,10 +405,12 @@ const store = useStore();
 let imageShow = ref(false)  // 查看大图弹窗的状态
 let imageList = ref([])  // 查看大图弹窗的状态
 let imageIndex = ref(0)  // 查看大图弹窗的状态
-const cloaseImageShow = (list, index) => {
-    if (list) {
+let imageType = ""  // 查看大图弹窗的状态
+const cloaseImageShow = (list, index, type) => {
+    if (list && imageType != type) {
         imageList.value = list
         imageIndex.value = index
+        imageType = type
     }
     imageShow.value = !imageShow.value
 }
@@ -1563,6 +1560,7 @@ const publicJump = path => router.push(path)
                             font-weight: 650;
                             font-size: 14px;
                             color: #000000;
+                            line-height: 18px;
                             height: 18px;
                             background-color: #fddf6d;
                             border-radius: 9px;
@@ -1598,7 +1596,7 @@ const publicJump = path => router.push(path)
         background: -webkit-linear-gradient(315deg, rgba(253, 218, 85, 1) 0%, rgba(229, 215, 190, 1) 50%, rgba(203, 254, 191, 1) 100%);
         background: -moz-linear-gradient(135deg, rgba(253, 218, 85, 1) 0%, rgba(229, 215, 190, 1) 50%, rgba(203, 254, 191, 1) 100%);
         background: linear-gradient(135deg, rgba(253, 218, 85, 1) 0%, rgba(229, 215, 190, 1) 50%, rgba(203, 254, 191, 1) 100%);
-        border: 1px solid rgba(230, 221, 185, 1);
+        // border: 1px solid rgba(230, 221, 185, 1);
         -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.235294117647059);
         -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.235294117647059);
         box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.235294117647059);