xcx

app.json

@@ -19,5 +19,10 @@
     "navigationBarBackgroundColor": "#bb9c79",
     "navigationBarTitleText": "",
     "navigationBarTextStyle":"white"
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "您的位置将用于效果展示"
+    }
   }
 }

config/api.js

@@ -16,6 +16,9 @@ const $api = {
       methods: 'GET',
       url: `${BaseAPIURl}/api/wx/buildingDynamiceList`
     }
+  },
+  activity: {
+    
   }
 }
 

config/baseUrl.js

@@ -1,4 +1,4 @@
 module.exports.basePath = {
-  BASE_API_URL: 'https://api.jinchengjiaye.com/newnbapi',
+  BASE_API_URL: 'https://dev.jinchengjiaye.com/api',
   BASE_IMG_URL: 'https://whole-estate.oss-cn-beijing.aliyuncs.com/',
 }

pages/components/Estate/index.js

@@ -1,6 +1,8 @@
 //index.js
 //获取应用实例
 const app = getApp()
+const HttpSever = require('../../../utils/http.js').HttpSever;
+const $api = require('../../../config/api.js').$api;
 
 Component({
   behaviors: [],
@@ -28,7 +30,23 @@ Component({
     }]
   },
   lifetimes: {},
-  ready: function() {},
+  ready: function() {
+    const _that = this
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userLocation']) {
+          wx.authorize({
+            scope: 'scope.userLocation',
+            success() {
+              _that.ShowLocation()
+            }
+          })
+        } else {
+          _that.ShowLocation()
+        }
+      }
+    })
+  },
   pageLifetimes: {
     show: function() {},
   },
@@ -37,6 +55,49 @@ Component({
       wx.navigateTo({
         url: '/pages/EstateDetail/index?id='
       })
+    },
+    GetGreatCircleDistance(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
+      console.log(s)
+      return s
+    },
+    ShowLocation() {
+      const _that = this
+      wx.getLocation({
+        type: 'wgs84',
+        success(res) {
+          console.log(res)
+          HttpSever.Ajax({
+            url: $api.building.list.url,
+            method: $api.building.list.method,
+          }).then((data) => {
+            const eslist = data.data.map(x => {
+              const distance = parseInt(_that.GetGreatCircleDistance(res.latitude, res.longitude, x.coordinate.split(',')[0], x.coordinate.split(',')[1] || res.longitude))
+              return {
+                buildingName: x.buildingName,
+                price: x.price,
+                address: x.address,
+                buildingImg: (x.buildingImg[0] || {}).url,
+                distance: distance / 1000
+              }
+            })
+            _that.setData({
+              EstateList: eslist
+            })
+          })
+        }
+      })
     }
   }
 })

pages/components/Estate/index.wxml

@@ -9,12 +9,12 @@
     <text>附近楼盘</text>
     <view class="list">
       <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key" bindtap="ListTap">
-        <image mode="aspectFill" src="{{item.Img}}" class="centerLabel cover"></image>
-        <text class="price">均价：{{item.Price}}万/平</text>
-        <text class="name">{{item.Name}}</text>
+        <image mode="aspectFill" src="{{item.buildingImg}}" class="centerLabel cover"></image>
+        <text class="price">均价：{{item.price}}</text>
+        <text class="name">{{item.buildingName}}</text>
         <view class="address flex-h">
           <image mode="widthFix" src="/assets/images/icon8.png"></image>
-          <text class="flex-item">{{item.Address}} 距您{{item.Distance}}km</text>
+          <text class="flex-item">{{item.address}} 距您{{item.distance}}km</text>
         </view>
       </view>
     </view>

utils/http.js

@@ -2,8 +2,6 @@ const apiCode = require('../config/code.js').apiCode;
 const $api = require('../config/api.js').$api;
 const $HttpSever = function () { }
 
-const app = getApp();
-
 $HttpSever.prototype = {
   /**
    *  通用请求方法
@@ -17,15 +15,14 @@ $HttpSever.prototype = {
         url: config.url,
         method: config.method,
         data: {
-          ...config.data,
-          openid: app.globalData.OpenID
+          ...config.data
         },
         header: {
           'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'
         },
         success(res) {
           if (res.statusCode && res.statusCode === apiCode.common.successCode) {
-            resolve(res.data.message)
+            resolve(res.data)
           } else {
             resolve(res.data.message + "失败")
           }