fix map around

config/dev.js

@@ -7,10 +7,10 @@ module.exports = {
     // WSS_HOST: '"wss://47.101.36.130:8085"',
     // HOST:  '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.238:8080"',
-    WSS_HOST: '"ws://192.168.0.238:8080"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"http://192.168.0.238:8080"',
+    // WSS_HOST: '"ws://192.168.0.238:8080"',
   },
   weapp: {},
   h5: {}

src/pages/project/detail/Around/Pannel.js

@@ -36,7 +36,7 @@ export default class Pannel extends Component {
 
   initData = (props) => {
     const { data = [] } = props.dataset || {}
-    const markerList = JSON.parse(data)
+    const markerList = data
     let activeIndex = -1
     let currentMarkerPos = undefined
 
@@ -100,7 +100,7 @@ export default class Pannel extends Component {
             })
           }
           {
-            manualData.length && (
+            manualData.length && this.state.markerList.length && (
               <View className="around-cell-title">其他</View>
             )
           }

src/pages/project/detail/Around/index.js

@@ -3,30 +3,32 @@ import { View } from '@tarojs/components'
 import PoiAround from '@components/amap/PoiAround'
 import Tab from './Tab'
 import Pannel from './Pannel'
+import { POI_TYPES } from '@utils/amap'
 import './style.scss'
 
 export default function Around(props) {
   const detail = props.building || {}
   
   const [lat, lng] = (detail.coordinate || '').split(',')
-  const poiDatas = detail.mapJson ? JSON.parse(detail.mapJson) : []
-  const ty = Object.prototype.toString
+  const poiDatas = typeof detail.mapJson === 'string' ? JSON.parse(detail.mapJson) : []
 
   // 展示内容数组
-  const dataList = poiDatas.map((item) => {
-    const key = item.key
-    const manualData = (detail[`building${key}`] === '' ? [] : (detail[`building${key}`] || '').split(','))
-    
+  const dataList = POI_TYPES.map((poi) => {
+    const jsonData = poiDatas.filter(x => x.key === poi.key)[0] || {}
+    const data = JSON.parse(jsonData.data || '[]')
+    const manualData = (detail[`building${poi.key}`] === '' ? [] : (detail[`building${poi.key}`] || '').split(','))
+
     return {
-      ...item,
+      ...poi,
+      data,
       manualData,
-      num: (ty.call(item.data) === '[object String]' ? JSON.parse(item.data) : []).length + manualData.length,
+      num: data.length + manualData.length,
     }
   }).filter(x => x.num)
-
+  
   // 所有的 markers
   const markersList = dataList.map((item) => {
-    const mapJson = JSON.parse(item.data) 
+    const mapJson = item.data || '[]'
     return (mapJson || []).map((it) => {
       const [longitude, latitude] = (it.location || '').split(',')
 

src/utils/amap.js

@@ -0,0 +1,40 @@
+const POI_TYPES = [
+  {
+    key: 'Transport',
+    label: '交通',
+    types: ['150100', '150200', '150300', '150400', '150500', '150600'],
+  },
+  {
+    key: 'Mall',
+    label: '商业',
+    types: ['060100', '060200', '060300', '060400', '060500', '060600',
+            '060700', '060800', '060900', '061000', '061100', '061200',
+            '061300', '061400', '080100', '080200', '080300', '080400',
+            '080500', '080600'],
+  },
+  {
+    key: 'Edu',
+    label: '学校',
+    types: ['141200'],
+  },
+  {
+    key: 'Hospital',
+    label: '医院',
+    types: ['090100', '090200', '090300', '090400', '090500', '090600', '090700'],
+  },
+  {
+    key: 'Bank',
+    label: '银行',
+    types: ['160100'],
+  },
+  {
+    key: 'Restaurant',
+    label: '餐饮',
+    types: ['050100', '050200', '050300', '050400', '050500', '050600',
+            '050700', '050800', '050900'],
+  },
+]
+
+export {
+  POI_TYPES,
+}