傅行帆 5 years ago
parent
commit
98c51b29fc

+ 4
- 1
src/pages/project/detail/Around/Pannel.js View File

5
 const posIcon = require('@assets/icons/amap/position.png')
5
 const posIcon = require('@assets/icons/amap/position.png')
6
 
6
 
7
 export default function Pannel(props) {
7
 export default function Pannel(props) {
8
+  console.log(props.dataset,"props.datasetprops.datasetprops.datasetprops.dataset")
8
   const { data = [], manualData = [] } = props.dataset || {}
9
   const { data = [], manualData = [] } = props.dataset || {}
9
   const activeKey = props.active
10
   const activeKey = props.active
10
 
11
 
12
+  const ty = Object.prototype.toString
13
+  
11
   return (
14
   return (
12
     <View className="around-pannel">
15
     <View className="around-pannel">
13
       {
16
       {
14
-        data.map((item, index) => {
17
+        (ty.call(data) === '[object String]' ? JSON.parse(data) : []).map((item, index) => {
15
           const { id, name, distance } = item || {}
18
           const { id, name, distance } = item || {}
16
           const dist = distance >= 1000 ? `${Number(distance / 1000).toFixed(1)}km` : `${distance}m`
19
           const dist = distance >= 1000 ? `${Number(distance / 1000).toFixed(1)}km` : `${distance}m`
17
           const active = activeKey === id
20
           const active = activeKey === id

+ 4
- 2
src/pages/project/detail/Around/index.js View File

7
 
7
 
8
 export default function Around(props) {
8
 export default function Around(props) {
9
   const detail = props.building || {}
9
   const detail = props.building || {}
10
+  console.log(detail,"detaildetaildetaildetail")
10
   const [lat, lng] = (detail.coordinate || '').split(',')
11
   const [lat, lng] = (detail.coordinate || '').split(',')
11
   const poiDatas = detail.mapJson ? JSON.parse(detail.mapJson) : []
12
   const poiDatas = detail.mapJson ? JSON.parse(detail.mapJson) : []
12
 
13
 
22
     }
23
     }
23
   })
24
   })
24
 
25
 
26
+  
25
   // 所有的 markers
27
   // 所有的 markers
26
   const markersList = dataList.map((item) => {
28
   const markersList = dataList.map((item) => {
27
-    
28
-    return (item.data || []).map((it) => {
29
+    const mapJson = JSON.parse(item.data) 
30
+    return (mapJson || []).map((it) => {
29
       const [longitude, latitude] = it.location.split(',')
31
       const [longitude, latitude] = it.location.split(',')
30
 
32
 
31
       return {
33
       return {