From 943f9d7a06cc9bb4cd7e8ecd65a7d2d8a7a3dac5 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Mon, 31 Jul 2023 18:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9big?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/apartment/seachModule.vue |  4 +---
 src/components/detail/imageWatch.vue     |  2 +-
 src/components/edit/choosingIdentity.vue |  5 ++++
 src/components/public/apartment-item.vue |  3 ++-
 src/components/public/report.vue         |  7 +++++-
 src/views/apartmentDetail.vue            | 29 ++++++++++++------------
 src/views/edit.vue                       |  5 ++--
 7 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue
index 67a6864..01fd8d9 100644
--- a/src/components/apartment/seachModule.vue
+++ b/src/components/apartment/seachModule.vue
@@ -44,7 +44,7 @@
                                     </div>
                                 </div>
                             </el-popover>
-                            <div class="seach-btn dis-f al-item jus-x" @click="handleKeyword(pitchValue['keyword'])">
+                            <div class="seach-btn dis-f al-item jus-x" @click="pitchValue['keyword'] ? handleKeyword(pitchValue['keyword']) : ''">
                                 <img src="../../assets/homeImage/seachImg.svg" class="img" alt="">
                                 搜索
                             </div>
@@ -267,9 +267,7 @@ const rentInput = () => clearingAmountState = false
 
 // 点击历史搜索和热门推荐
 const handleKeyword = value => {
-
     router.push(`/seachPage?keyword=${value}`)
-
     if (historyArr.value.indexOf(value) == -1 && value) {
         historyArr.value.unshift(value)
         storingHistory()
diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue
index 5d508b6..b35ce41 100644
--- a/src/components/detail/imageWatch.vue
+++ b/src/components/detail/imageWatch.vue
@@ -7,7 +7,7 @@
                     <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:600px" v-if="item['type'] != 'attachment'">
-                                <video autoplay="false" controls :src="item.url || item['videourl']"></video>
+                                <video :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="">
diff --git a/src/components/edit/choosingIdentity.vue b/src/components/edit/choosingIdentity.vue
index 2192c24..1a64f35 100644
--- a/src/components/edit/choosingIdentity.vue
+++ b/src/components/edit/choosingIdentity.vue
@@ -93,7 +93,11 @@ async function init() {
         let data = res.data
         identityList.value = data.data
         housingnum.value = data.housingnum
+        // housingnum.value = 10
         isintermediary.value = data.isintermediary
+        // isintermediary.value = 1
+
+        // console.log("data.isintermediary",data.isintermediary);
         if (data['ispopup'] == 0) overallJump()
         else popType.value = 'choice'
     }).finally(() => {
@@ -127,6 +131,7 @@ let overallJump = () => {
 let confirmIntermediary = (isintermediary) => {
     if (isintermediary == 1) identityKey.value = 1
     overallJump()
+    // return
     proxy.$post("/tenement/pc/api/publish/submitidentity", {
         isintermediary
     }).then(res => {
diff --git a/src/components/public/apartment-item.vue b/src/components/public/apartment-item.vue
index 1fa5d5c..50e0c3a 100644
--- a/src/components/public/apartment-item.vue
+++ b/src/components/public/apartment-item.vue
@@ -72,13 +72,14 @@ const goapArtmentDetails = () => router.push(`/apartmentDetail?uniqid=${props['i
         color: #000000;
         margin-bottom: 10px;
         padding-left: 6px;
+        word-break: break-all;
     }
 
     .hint {
         color: #AAAAAA;
         font-size: 14px;
         margin: 0 6px 20px;
-
+        word-break: break-all;
     }
 
     .tab-box {
diff --git a/src/components/public/report.vue b/src/components/public/report.vue
index 44ac475..237c07f 100644
--- a/src/components/public/report.vue
+++ b/src/components/public/report.vue
@@ -76,6 +76,12 @@ const toConsumableArray = (arr) => {
 </script>
 
 <style lang="less" scoped>
+@media screen and (max-width: 1360px) {
+    .btn {
+        right: 20px !important;
+    }
+}
+
 .btn {
     width: 60px;
     height: 60px;
@@ -85,7 +91,6 @@ const toConsumableArray = (arr) => {
     position: fixed;
     bottom: 98px;
     right: calc((100vw - 1200px) / 2 - 75px);
-
     border: 1px solid #d7d7d7;
     border-radius: 50%;
     background-color: #fff;
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 4c90405..c0d2307 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -1,6 +1,7 @@
 <template>
     <page-top-bar></page-top-bar>
 
+
     <div class="content wid1200">
         <div class="header">
             <div class="top flexflex">
@@ -151,7 +152,7 @@
                                         <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']], i)">
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']], item['videos'].length + i)">
                                         <img class="media-img" v-lazy="it['thumbnail']">
                                     </div>
                                 </div>
@@ -221,17 +222,19 @@
                         公寓设施
                     </div>
                     <div class="facilities-box">
-                        <div class="facilities-item flexflex" v-for="(item, key) of facilitiesKeyValue">
-                            <div class="facilities-header flexflex">
-                                <div class="item-title">{{ item }}</div>
-                            </div>
-                            <div class="facilities-list flexflex flex1">
-                                <div class="item flexcenter" v-for="it in info['facilities'][key]">
-                                    <img class="icon" src="@/assets/img/apartmentDetail/blue-tick.svg" />
-                                    {{ it }}
+                        <template v-for="(item, key) of facilitiesKeyValue">
+                            <div class="facilities-item flexflex" v-if="info['facilities'][key].length != 0">
+                                <div class="facilities-header flexflex">
+                                    <div class="item-title">{{ item }}</div>
+                                </div>
+                                <div class="facilities-list flexflex flex1">
+                                    <div class="item flexcenter" v-for="it in info['facilities'][key]">
+                                        <img class="icon" src="@/assets/img/apartmentDetail/blue-tick.svg" />
+                                        {{ it }}
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        </template>
                     </div>
                 </div>
 
@@ -288,7 +291,7 @@
 
                         <div class="price-box">
                             <div class="price-item flexacenter" v-for="it in item['roomlist']">
-                                <div class="room-name">{{ it['name'] }}</div>
+                                <div class="room-name ellipsis">{{ it['name'] }}</div>
                                 <div class="flexacenter">
                                     <div class="unit">HK$</div>
                                     <div class="quantity">{{ it['price'] }}</div>/月
@@ -976,9 +979,7 @@ const publicJump = path => router.push(path)
                     margin-bottom: 20px;
                 }
 
-                .place-text {
-
-                }
+                .place-text {}
 
                 .place,
                 .else {
diff --git a/src/views/edit.vue b/src/views/edit.vue
index eaf0989..02bacd0 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -61,14 +61,13 @@
                             <img class="arrows-icon-pitch" src="@/assets/img/edit/blue-arrow.svg" />
                         </div>
                     </div>
-
                     <!-- 起租日期 -->
                     <div v-if="item.field === 'leasetime'" class="form-option modeTwo flexacenter">
                         <div class="modeTwo-item flexcenter" :class="{ 'pitch': info['leasetime'] == 0 }" ref="leasetime"
                             @click="setValue('leasetime', 0)">随时</div>
                         <div class="modeTwo-item flexacenter" :class="{ 'pitch': info['leasetime'] }" ref="leasetime">
                             <el-date-picker prefix-icon="" clear-icon="" v-model="info.leasetime" type="date"
-                                placeholder="选择日期"></el-date-picker>
+                                placeholder="选择日期" :locale="locale"></el-date-picker>
                             <img class="arrows-icon rotate0" src="@/assets/img/edit/arrows.svg" />
                             <img class="arrows-icon-pitch rotate0" src="@/assets/img/edit/blue-arrow.svg" />
                         </div>
@@ -671,11 +670,13 @@ import failPop from '@/components/edit/fail-pop.vue'
 import pageTopBar from '@/components/pageTopBar/pageTopBar.vue'
 import userBox from '@/components/edit/user-box.vue'
 import { setSeoTitle } from '@/utils/util.js'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 
 export default {
     name: 'ZufangEdit',
     data() {
         return {
+            locale: zhCn,
             value: '',
             user: {},
             userIntermediary: 0, // 用户是否是 认证中介，需要全局获取