张延森 4 years ago
parent
commit
fc26621a79

+ 2
- 2
config/dev.js View File

4
     NODE_ENV: '"development"'
4
     NODE_ENV: '"development"'
5
   },
5
   },
6
   defineConstants: {
6
   defineConstants: {
7
-    // HOST: '"http://localhost:7080"',
7
+    HOST: '"http://localhost:7080"',
8
     // HOST: '"https://sgl.njyunzhi.com"',
8
     // HOST: '"https://sgl.njyunzhi.com"',
9
-    HOST: '"http://192.168.31.211:7080"',
9
+    // HOST: '"http://192.168.31.211:7080"',
10
     // HOST: '"http://192.168.211.105:7080"',
10
     // HOST: '"http://192.168.211.105:7080"',
11
  
11
  
12
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
12
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",

+ 5
- 0
src/app.config.js View File

24
   usingComponents: {
24
   usingComponents: {
25
     "recycle-view": "./compents/miniprogram-recycle-view/recycle-view",
25
     "recycle-view": "./compents/miniprogram-recycle-view/recycle-view",
26
     "recycle-item": "./compents/miniprogram-recycle-view/recycle-item"
26
     "recycle-item": "./compents/miniprogram-recycle-view/recycle-item"
27
+  },
28
+  permission: {
29
+    'scope.userLocation': {
30
+      'desc': '你的位置信息将用于房源信息定位'
31
+    }
27
   }
32
   }
28
 }
33
 }

+ 0
- 8
src/pages/account/edit/index.jsx View File

67
         })
67
         })
68
     }
68
     }
69
 
69
 
70
-    const onChooseLocation = () => {
71
-        console.log(333)
72
-        wx.chooseLocation({
73
-            success: (res) => {
74
-                console.log(res)
75
-            }
76
-        })
77
-    }
78
     const formSubmit = (e) => {
70
     const formSubmit = (e) => {
79
         console.log(e, 'formSubmit')
71
         console.log(e, 'formSubmit')
80
     }
72
     }

+ 3
- 3
src/pages/guide/index.jsx View File

44
 
44
 
45
   const onOpenLocation = lngLat => {
45
   const onOpenLocation = lngLat => {
46
     const [latitude, longitude] = lngLat.split(",");
46
     const [latitude, longitude] = lngLat.split(",");
47
-    console.log(lngLat, latitude, longitude);
47
+
48
     wx.openLocation({
48
     wx.openLocation({
49
-      latitude: Number(latitude),
50
-      longitude: Number(longitude),
49
+      latitude: latitude ? latitude - 0 : undefined,
50
+      longitude: longitude ? longitude - 0 : undefined,
51
       scale: 18,
51
       scale: 18,
52
       fail: err => {
52
       fail: err => {
53
         console.log(err);
53
         console.log(err);

+ 29
- 20
src/pages/house/addnewhouse/index.jsx View File

23
     const [address, setAddress] = useState({})
23
     const [address, setAddress] = useState({})
24
     const [parking, setParking] = useState({})
24
     const [parking, setParking] = useState({})
25
 
25
 
26
-
27
-    useEffect(() => {
28
-
29
-
30
-    }, [])
31
-
32
-
33
     const onChooseLocation = (type) => {
26
     const onChooseLocation = (type) => {
34
-        console.log(333)
35
-        wx.chooseLocation({
36
-            success: (res) => {
37
-                console.log(res)
38
-                if (type == 'address') {
39
-                    setAddress(res)
40
-                } else {
41
-                    setParking(res)
42
-                }
43
-
44
-
27
+        wx.getLocation({
28
+            type: 'gcj02',
29
+            success: data => {
30
+                console.log('--定位-->', data)
31
+                wx.chooseLocation({
32
+                    latitude: data.latitude,
33
+                    longitude: data.longitude,
34
+                    success: (res) => {
35
+                        console.log('--选择-->', res)
36
+                        if (type == 'address') {
37
+                            setAddress(res)
38
+                        } else {
39
+                            setParking(res)
40
+                        }
41
+                    },
42
+                    fail: (err) => {
43
+                        console.error(err)
44
+                    }
45
+                })
46
+            },
47
+            fail: e => {
48
+                Taro.showToast({
49
+                    title: '获取位置授权失败',
50
+                    icon: 'none'
51
+                })
52
+                console.error(e)
45
             }
53
             }
46
         })
54
         })
47
     }
55
     }
56
+    
48
     const formSubmit = (e) => {
57
     const formSubmit = (e) => {
49
         // console.log(e.detail, 'formSubmit')
58
         // console.log(e.detail, 'formSubmit')
50
 
59
 
63
             ...value,
72
             ...value,
64
             // address: `${value.address}____${value.addressdetail}`,
73
             // address: `${value.address}____${value.addressdetail}`,
65
             // parking: `${value.parking}____${value.parkingdetail}`,
74
             // parking: `${value.parking}____${value.parkingdetail}`,
66
-            lngLat: `${address.latitude},${address.longitude}`,
67
-            parkLngLat: `${address.latitude},${address.longitude}`,
75
+            lngLat: `${address.latitude || ''},${address.longitude || ''}`,
76
+            parkLngLat: `${parking.latitude || ''},${parking.longitude || ''}`,
68
             
77
             
69
             desc:imgUrl,
78
             desc:imgUrl,
70
         }
79
         }

+ 0
- 8
src/pages/label/edit/index.jsx View File

67
         })
67
         })
68
     }
68
     }
69
 
69
 
70
-    const onChooseLocation = () => {
71
-        console.log(333)
72
-        wx.chooseLocation({
73
-            success: (res) => {
74
-                console.log(res)
75
-            }
76
-        })
77
-    }
78
     const formSubmit = (e) => {
70
     const formSubmit = (e) => {
79
         console.log(e, 'formSubmit')
71
         console.log(e, 'formSubmit')
80
     }
72
     }

+ 25
- 14
src/pages/map/index.jsx View File

97
     }
97
     }
98
 
98
 
99
     const onChooseLocation = () => {
99
     const onChooseLocation = () => {
100
-        console.log(333)
101
-        wx.chooseLocation({
102
-            success: (res) => {
103
-                console.log(res)
104
-
105
-                setAddress({
106
-                    ...res,
107
-                    shortAddress:res.name
100
+        wx.getLocation({
101
+            type: 'gcj02',
102
+            success: data => {
103
+                console.log('--定位-->', data)
104
+                wx.chooseLocation({
105
+                    latitude: data.latitude,
106
+                    longitude: data.longitude,
107
+                    success: (res) => {
108
+                        console.log('--选择-->', res)        
109
+                        setAddress({
110
+                            ...res,
111
+                            shortAddress:res.name
112
+                        })
113
+                        setValue(res.address)
114
+                    },
115
+                    fail: (err) => {
116
+                        console.log(err)
117
+                    },
108
                 })
118
                 })
109
-                setValue(res.address)
110
-            },
111
-            fail: (err) => {
112
-                console.log(err)
113
-
114
-                // setAddress(res)
115
             },
119
             },
120
+            fail: e => {
121
+                Taro.showToast({
122
+                    title: '获取位置授权失败',
123
+                    icon: 'none'
124
+                })
125
+                console.error(e)
126
+            }
116
         })
127
         })
117
     }
128
     }
118
 
129