whole-estate
/
wxmini
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 6 Activity
Browse Source

merge

zjxpcyc 6 years ago
parent
03e7c06f76
commit
bcea59c2a5
1 changed files with 0 additions and 5 deletions
Unified View Show Diff Stats
  1. 0
    5
      pages/components/Estate/index.js

+ 0
- 5
pages/components/Estate/index.js View File

60 
       wx.getLocation({
 60 
       wx.getLocation({
61 
         type: 'wgs84',
 61 
         type: 'wgs84',
62 
         success(res) {
 62 
         success(res) {
63 
-<<<<<<< HEAD
64 
-          HttpSever.Ajax({
65 
-=======
66 
-          console.log(res)
67 
           fetch({
 63 
           fetch({
68 
->>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
69 
             url: $api.building.list.url,
 64 
             url: $api.building.list.url,
70 
             method: $api.building.list.method,
 65 
             method: $api.building.list.method,
71 
           }).then((data) => {
 66 
           }).then((data) => {