Merge branch 'master' of http://git.ycjcjy.com/whole-estate/wxmini

pages/components/Concessions/index.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
     "ConcessionsListItem": "/pages/components/ConcessionsListItem/index"
   }

pages/components/ConcessionsListItem/index.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
   }
 }

pages/components/Estate/index.js

@@ -56,7 +56,24 @@ Component({
         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) {
@@ -64,8 +81,20 @@ Component({
           HttpSever.Ajax({
             url: $api.building.list.url,
             method: $api.building.list.method,
-          }).then((date) => {
-            console.log(date)
+          }).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.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
   }
 }

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>

pages/components/Mine/index.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
   }
 }

pages/components/Radio/index.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
   }
 }

pages/components/SubIndex/index.json

@@ -1,4 +1,5 @@
 {
+  "component": true,
   "usingComponents": {
   }
 }