Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

src/layouts/BasicLayout.jsx

@@ -35,8 +35,6 @@ const menuDataRender = (menuRoles) => (menuList) =>
     const authority =
       (menuRoles.filter((x) => x.code === item.menuCode)[0] || {}).roles || [];
 
-    console.log('-------------->', item.menuCode, authority)
-
     const localItem = { ...item, children: item.children ? menuDataRender(menuRoles)(item.children) : [] };
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
   });

src/pages/building/Edit/Basic/index.jsx

@@ -84,9 +84,28 @@ const BuildingBasic = React.forwardRef((props, ref) => {
     setLoading({ ...loading, arround: true })
     Promise.all(POI_TYPES.map(({ key }) => getPoiData({ type: key, location: lngLat, radius: e }))).then((res) => {
       const pois = POI_TYPES.reduce((acc, { key }, inx) => {
+        const poiArr = (res[inx] || {}).pois || []
+
+        // 只用到部分字段
+        const arrVal = poiArr.map((poi) => ({
+          name: poi.name,
+          id: poi.id,
+          location: poi.location,
+          type: poi.type,
+          typecode: poi.typecode,
+          pname: poi.pname,
+          cityname: poi.cityname,
+          adname: poi.adname,
+          address: poi.address,
+          pcode: poi.pcode,
+          adcode: poi.adcode,
+          citycode: poi.citycode,
+          distance: poi.distance,
+        }))
+
         return {
           ...acc,
-          [key]: (res[inx] || {}).pois || []
+          [key]: arrVal
         }
       }, {})
 

src/utils/map/sdk.js

@@ -46,7 +46,7 @@ export default function amapSDK(key) {
   }
 
   function getPlaceAround(params = {}) {
-    const url = `${prefix}/v5/place/around`
+    const url = `${prefix}/v3/place/around`
     return request(url, { key: key.service, ...params } )
   }