feats

app.js

@@ -63,6 +63,23 @@ App({
       }
     })
 
+    wx.getLocation({
+      type: 'wgs84',
+      success(res) {
+        const { latitude, longitude } = res;
+
+        if (store && store.update) {
+          store.data.location = { latitude, longitude }
+          store.update()
+        } else {
+          setTimeout(() => {
+            store.data.location = { latitude, longitude }
+            store.update()
+          }, 2000)
+        }
+      }
+    })
+
     fetch({
       url: $api.dict.list.url,
       method: $api.dict.list.method,

pages/MyCollectEstateList/index.js

@@ -1,5 +1,6 @@
 import store from '../../store'
 import create from '../../utils/create'
+import getDistance from '../../utils/distance'
 import fetch from '../../utils/http'
 import { get as getApi } from '../../config/api'
 
@@ -13,12 +14,21 @@ create(store, {
   },
   onLoad () {
     const userInfo = app.globalData.UserInfo
+    const { latitude, longitude } = this.store.data.location
 
     fetch({
       ...getApi('user.building', { openid: userInfo.openid }),
       query: { pageNum: 1, pageSize: 10 },
     }).then(({ data }) => {
-      const list = data.records || []
+      const list = (data.records || []).map((it) => {
+        const [ lat = 0, lon = 0 ] = it.coordinate.split(',')
+
+        return {
+          ...it,
+          distance: parseInt(getDistance(latitude, longitude, lat - 0, lon - 0))
+        }
+      })
+
       this.setData({ list })
     }).catch((err) => {
       wx.showToast({

pages/MyCollectEstateList/index.wxml

@@ -16,7 +16,7 @@
           </view>
           <text>{{item.name}}</text>
           <text>{{item.address}}</text>
-          <text>距您{{item.Distance}}km</text>
+          <text>距您{{item.distance}}km</text>
           <text class="price">均价：<text>{{item.price}}</text>/平</text>
         </view>
       </view>

pages/components/Mine/index.js

@@ -7,7 +7,7 @@ create({
   behaviors: [],
   properties: {},
   data: {
-    userInfo: null,
+    userInfo: {},
     UserSetList: [{
       value: '个人资料',
       icon: '/assets/images/icon16.png',
@@ -69,7 +69,7 @@ create({
       }
     },
     signup(e) {      
-      signUp(e.detail.userInfo, app).then(() => {
+      signUp(e.detail.userInfo, app).then((dt) => {
         wx.showToast({
           title: '注册成功',
           icon: 'success',

store.js

@@ -3,6 +3,7 @@
 export default {
   data: {
     userInfo: {},
+    location: {},
   },
   globalData: '',
 }

utils/distance.js

@@ -0,0 +1,16 @@
+
+export default function getDistance(lat1, lng1, lat2, lng2) {
+  if (lat1 === lat2 && lng1 === lng2) {
+    return 0
+  }
+  var EARTH_RADIUS = 6378137.0//单位M
+  var PI = Math.PI
+  var radLat1 = lat1 * PI / 180.0
+  var radLat2 = lat2 * PI / 180.0
+  var a = radLat1 - radLat2
+  var b = lng1 * PI / 180.0 - lng2 * PI / 180.0
+  var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)))
+  s = s * EARTH_RADIUS
+  s = Math.round(s * 10000) / 10000.0
+  return s/100
+}

utils/signup.js

@@ -17,6 +17,7 @@ function signUp(userInfo, app) {
       // 更新 store
       store.data.userInfo.avatar = userInfo.avatarUrl
       store.data.userInfo.name = userInfo.nickName
+      store.data.userInfo.hasReg = 1
       store.update()
   
       // 更新 globalData