commit

2025-11-07 11:56:13 +08:00
parent 90026a54a3
commit ae86803b17
17 changed files with 381 additions and 159 deletions
@@ -89,72 +89,51 @@ layout("/layouts/platform_h5.html"){
                    }],
                });
            },
-            getLocation(callback) {
-                if (typeof callback !== 'function') {
-                    callback = () => {};
-                }
-                if (!navigator.geolocation) {
-                    this.$toast('当前浏览器不支持定位功能');
-                    callback(null);
-                    return;
-                }
-                const loading = vant.Toast.loading({
-                    message: "获取定位中...",
-                    forbidClick: false,
-                    loadingType: "spinner",
-                    duration: 0,
-                })
-                navigator.geolocation.getCurrentPosition(
-                    (position) => {
-                        callback({
-                            lat: position.coords.latitude,
-                            lng: position.coords.longitude
-                        });
-                        loading.close()
-                    },
-                    (error) => {
-                        let msg = '定位失败，请稍后重试';
-                        switch (error.code) {
-                            case error.PERMISSION_DENIED:
-                                msg = '请允许浏览器获取位置信息';
-                                break;
-                            case error.POSITION_UNAVAILABLE:
-                                msg = '无法获取当前位置';
-                                break;
-                            case error.TIMEOUT:
-                                msg = '定位超时，请重试';
-                                break;
-                        }
-                        this.$toast(msg);
-                        callback(null);
-                        loading.close()
-                    },
-                    {
-                        enableHighAccuracy: true,
-                        timeout: 10000,
-                        maximumAge: 60000
+            getUserLocation() {
+                return new Promise((resolve) => {
+                    if (!navigator.geolocation) {
+                        vant.Toast('浏览器不支持定位');
+                        return resolve(null);
                    }
-                );
+                    const loading = vant.Toast.loading({ message: '定位中...', duration: 0 });
+                    navigator.geolocation.getCurrentPosition(
+                        (pos) => {
+                            loading.close();
+                            resolve({
+                                lat: pos.coords.latitude,
+                                lng: pos.coords.longitude
+                            });
+                            if (this.markerLayer) {
+                                this.markerLayer.remove(["current"])
+                            }
+                            const transPosi = this.$coordinateUtil.wgs84ToGcj02(pos.coords.longitude, pos.coords.latitude)
+                            console.log(transPosi)
+                            const center = new TMap.LatLng(transPosi[0], transPosi[1])
+                            this.createMarker(center, 'current', 'current')
+                        },
+                        (err) => {
+                            console.log(err)
+                            loading.close();
+                            vant.Toast('定位失败，请重试');
+                            resolve(null);
+                        },
+                        { enableHighAccuracy: true, timeout: 3000 }
+                    );
+                });
            },
            async fetchCourse() {
                const res = await this.$axios.post('/platform/trainSignUp/mine/fetchCourse', {courseId: this.courseId})
                this.row = res.data
            },
-            onSign() {
-                if(this.markerLayer) {
-                    this.markerLayer.remove(["current"])
+            async onSign() {
+                const coords = await this.getUserLocation()
+                if (coords) {
+                    this.res = await this.$axios.post('/platform/trainSignUp/mine/drivingScan', {
+                        courseId: this.row.id,
+                        lat: coords.lat,
+                        lng: coords.lng
+                    })
                }
-                this.getLocation(async (coords) => {
-                    if (coords) {
-                        const center = new TMap.LatLng(coords.lat, coords.lng)
-                        this.createMarker(center, 'current', 'current')
-                        this.res = await this.$axios.post('/platform/trainSignUp/mine/drivingScan', {
-                            courseId: this.row.id,
-                            lat: coords.lat,
-                            lng: coords.lng
-                        })
-                    }
-                })
            }
        },
        async created() {