finish around

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

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

@@ -2,6 +2,8 @@ import Taro from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import './style.scss'
 
+const posIcon = require('@assets/icons/amap/position.png')
+
 export default function Pannel(props) {
   const { data = [], manualData = [] } = props.dataset || {}
   const activeKey = props.active
@@ -17,7 +19,10 @@ export default function Pannel(props) {
           return (
             <View className={`around-cell ${active ? 'active' : ''}`} key={`auto-${id}`}>
               <View className="around-cell__body">{`${index + 1}、${name}`}</View>
-              <View className="around-cell__action">{dist}</View>
+              <View className="around-cell__action">
+                <Image className="icon" src={posIcon} />
+                {dist}
+              </View>
             </View>
           )
         })

src/pages/project/detail/Around/style.scss

@@ -91,7 +91,17 @@
 
   &__action {
     flex: none;
-    width: 200px;
+    width: 160px;
+    font-size: 30px;
+    line-height: 42px;
+    vertical-align: middle;
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      display: inline-block;
+      margin: 0 10px;
+    }
   }
 }
 

src/utils/amap.js

@@ -1,99 +0,0 @@
-/**
- * 高德地图
- * 
- * POI 类型下载 https://lbs.amap.com/api/webservice/guide/api/search/#around
- * 
- */
-const amapLib = require('../lib/amap-wx');
-const myAmapKey = '766411323b66f7e876f428d8a23aa83c'
-const amap = new amapLib.AMapWX({ key: myAmapKey })
-
-// key 值会被拿到 building 表中 组合为字段名
-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'],
-  },
-]
-
-const getPrefix = str => str.substr(0, 4)
-
-export function getPoiAround(params) {
-  const {
-    lng,
-    lat
-  } = params || {}
-
-  return new Promise((resolve, reject) => {
-    const querytypes = POI_TYPES.reduce((acc, item) => ([ ...acc, ...item.types ]), []).join('|')
-    const location = `${lng},${lat}`
-    const iconPath = undefined
-    const iconPathSelected = undefined
-    const resultList = []
-
-    // 成功回调
-    // https://lbs.amap.com/api/webservice/guide/api/search/#around
-    const successCall = poiType => res => {
-      resultList.push({
-        key: poiType.key,
-        label: poiType.label,
-        poisData: res.poisData,
-        markers: res.markers
-      })
-
-      if (resultList.length === POI_TYPES.length) {
-        resolve(resultList)
-      }
-    }
-
-    // 失败回调
-    // https://lbs.amap.com/api/webservice/guide/tools/info/
-    const failCall = poiType => info => {
-      console.error(poiType, info)
-      reject(info)
-    }
-
-    POI_TYPES.forEach((pt) => {
-      const querytypes = pt.types.join('|')
-
-      amap.getPoiAround({
-        querytypes,
-        location,
-        iconPath,
-        iconPathSelected,
-        success: successCall(pt),
-        fail: failCall(pt),
-      })
-    })
-  })
-}