merge

pages/components/Estate/index.js

@@ -60,12 +60,7 @@ Component({
       wx.getLocation({
         type: 'wgs84',
         success(res) {
-<<<<<<< HEAD
-          HttpSever.Ajax({
-=======
-          console.log(res)
           fetch({
->>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
             url: $api.building.list.url,
             method: $api.building.list.method,
           }).then((data) => {