From 920e1a337c852a1ef858f1b0b5d0a6c9d1a79444 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 27 Jul 2023 10:44:08 +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

---
 src/components/detail/breadcrumb.vue |  1 +
 src/components/public/viewMap.vue    |  7 ++++---
 src/router/index.js                  |  3 ++-
 src/views/apartmentDetail.vue        | 25 ++++++++++++++++++-------
 src/views/detail.vue                 |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue
index 3ea2ed4..ec3300a 100644
--- a/src/components/detail/breadcrumb.vue
+++ b/src/components/detail/breadcrumb.vue
@@ -243,6 +243,7 @@ img {
             font-weight: 400;
             font-style: normal;
             color: #AAAAAA;
+            cursor: pointer;
         }
     }
 
diff --git a/src/components/public/viewMap.vue b/src/components/public/viewMap.vue
index 31b70cf..3eef8a7 100644
--- a/src/components/public/viewMap.vue
+++ b/src/components/public/viewMap.vue
@@ -7,7 +7,7 @@
             </div>
             <div id="container">
                 <div class="location-bj flexcenter" @click="showPop" v-if="!show">
-                    <div class="location-site flexacenter">
+                    <div class="location-site flexacenter" v-if="props['name']">
                         <img class="tracingPoint" src="@/assets/img/publicImage/u1704.png" />
                         <div class="location-name">{{ props['name'] }}</div>
                         <img class="location-arrows" src="@/assets/img/publicImage/u353.svg" />
@@ -28,8 +28,9 @@ const props = defineProps({
 
 let key = ref("MVNBZ-PEFWI-O4OGT-5ADVJ-7QAYJ-NBFY4")
 
+console.log("props.latlng", props.latlng['latitude'], props.latlng['longitude']);
 const initMap = () => {
-    let center = new TMap.LatLng(props.latlng['longitude'], props.latlng['latitude']);
+    let center = new TMap.LatLng(props.latlng['latitude'], props.latlng['longitude']);
     let map = new TMap.Map("container", {
         zoom: 15,
         disableDefaultUI: true,                                                //禁止所有控件
@@ -44,7 +45,7 @@ const initMap = () => {
         id: "marker-layer",
         map: map,
         geometries: [{
-            "position": new TMap.LatLng(props.latlng['longitude'], props.latlng['latitude']),
+            "position": new TMap.LatLng(props.latlng['latitude'], props.latlng['longitude']),
         }]
     });
 }
diff --git a/src/router/index.js b/src/router/index.js
index 0ca6bdd..9b8ad7f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -95,7 +95,8 @@ const routes = [
     path: "/apartmentDetail",
     component: () => import(/* webpackChunkName: "housing" */ '@/views/apartmentDetail.vue'),
     meta: {
-      title: "品牌公寓详情"
+      title: "品牌公寓详情",
+      path:'/apartmentDetail'
     }
   }
 ]
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 2b91422..7b99152 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -179,8 +179,8 @@
                         <img class="icon" src="@/assets/img/apartmentDetail/location-icon.png">
                         {{ info.location || '位置' }}
                     </div>
-                    <view-map :latlng="{ longitude: info['coordinate'][0], latitude: info['coordinate'][1] }"
-                        :name="info['address']"></view-map>
+                    <view-map :latlng="{ latitude: info['coordinate'][0], longitude: info['coordinate'][1] }"
+                        :name="info['address']"></view-map>{{  info['coordinate'][0]  }} 11 {{ info['coordinate'][1] }}
 
                     <!-- 交通 -->
                     <div class="traffic-box" v-if="info['traffic']">
@@ -290,7 +290,7 @@
 
                         <div class="site flexacenter">
                             <img class="site-icon" src="@/assets/img/publicImage/location-icon.png">
-                            {{ item['address'] }}
+                            <div class="site-text ellipsis">{{ item['address'] }}</div>
                         </div>
 
                         <div class="price-box">
@@ -355,7 +355,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, toRefs, watch, getCurrentInstance, nextTick } from 'vue';
+import { ref, onMounted, onUnmounted, toRefs, watch, getCurrentInstance, nextTick } from 'vue';
 import { ElMessage, valueEquals } from 'element-plus'
 import { useStore } from 'vuex';
 
@@ -371,7 +371,6 @@ let router = useRouter()
 let { uniqid } = router.currentRoute.value.query
 
 import { copyToClipboard } from '@/utils/util.js'
-// const uniqid = "aWqSz58aKKvn"
 
 const { proxy } = getCurrentInstance()
 const store = useStore();
@@ -422,8 +421,6 @@ proxy.$get("/tenement/pc/api/apartment/details", { uniqid }).then(res => {
     token = data['token']
     qrcode.value = data['qrcode']
 
-
-
     handleAllCarouselsData()
 
 
@@ -617,6 +614,20 @@ const slideshowType = type => slideshowItem(carouselsconfig.value[type].index)
 let detailsLeft = ref(null)
 
 
+onMounted(() => {
+    window.addEventListener('scroll', handleScroll);
+});
+
+onUnmounted(() => {
+    window.removeEventListener('scroll', handleScroll);
+});
+
+const handleScroll = () => {
+
+
+  // 处理滚动事件
+}
+
 
 </script>
 
diff --git a/src/views/detail.vue b/src/views/detail.vue
index bddf54e..ab6602e 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -427,8 +427,8 @@
                             <div class="dis-f jus-x" style="margin-top:15px;">
                                 <div v-if="housingInfo['data']">
                                     <mapInfo :latlng="{
-                                        latitude: housingInfo['data'].info.longitude * 1,
-                                        longitude: housingInfo['data'].info.latitude * 1
+                                        longitude: housingInfo['data'].info.longitude * 1,
+                                        latitude: housingInfo['data'].info.latitude * 1
                                     }" :name="housingInfo['data'].info.address"></mapInfo>
                                 </div>
                             </div>