Compare commits

3 Commits

Author SHA1 Message Date
78a4cafc38 Merge pull request '更新' (#3) from xiaozy into master
Reviewed-on: #3
2023-04-12 03:22:44 +00:00
57c4260165 Merge pull request 'xiaozy' (#2) from xiaozy into master
Reviewed-on: #2
2023-04-12 03:19:18 +00:00
b365566e4e Merge pull request '更新' (#1) from xiaozy into master
Reviewed-on: #1
2023-04-06 05:15:52 +00:00
4 changed files with 6 additions and 43 deletions

View File

@@ -14,7 +14,6 @@ import vConsole from 'vconsole'
if (process.env.VUE_APP_ENV !== 'production') { if (process.env.VUE_APP_ENV !== 'production') {
new vConsole() new vConsole()
} }
// new vConsole()
Vue.use(PiniaVuePlugin) Vue.use(PiniaVuePlugin)
const pinia = createPinia() const pinia = createPinia()

View File

@@ -34,29 +34,13 @@ const instance = defineStore('user', {
let geolocation = new AMap.Geolocation({ let geolocation = new AMap.Geolocation({
// enableHighAccuracy: true // 是否使用高精度定位默认true // enableHighAccuracy: true // 是否使用高精度定位默认true
}) })
geolocation.getCurrentPosition((status, result) => { geolocation.getCurrentPosition(function (status, result) {
// console.log('piniaIndex status', status) console.log('piniaIndex status', status)
// console.log('piniaIndex result', result) console.log('piniaIndex result', result)
if (status === 'complete') { if (status === 'complete') {
let { lat: latitude, lng: longitude } = result.position let { lat: latitude, lng: longitude } = result.position
this.position = { latitude, longitude } this.position = { latitude, longitude }
} else { } else {
switch (result.status) {
case 1:
Notify({
message: '用户拒绝对获取地理位置的请求。',
type: 'danger',
duration: 1000
})
break
default:
Notify({
message: '定位获取失败,请退出重试。',
type: 'danger',
duration: 1000
})
break
}
} }
}) })
}) })

View File

@@ -137,29 +137,13 @@ export default {
// enableHighAccuracy: true // 是否使用高精度定位默认true // enableHighAccuracy: true // 是否使用高精度定位默认true
}) })
geolocation.getCurrentPosition((status, result) => { geolocation.getCurrentPosition((status, result) => {
// console.log('status', status) console.log('status', status)
// console.log('result', result) console.log('result', result)
if (status === 'complete') { if (status === 'complete') {
let { lat: latitude, lng: longitude } = result.position let { lat: latitude, lng: longitude } = result.position
this.position = { latitude, longitude } this.position = { latitude, longitude }
this.obtainData() this.obtainData()
} else { } else {
switch (result.status) {
case 1:
Notify({
message: '用户拒绝对获取地理位置的请求。',
type: 'danger',
duration: 1000
})
break
default:
Notify({
message: '定位获取失败,请退出重试。',
type: 'danger',
duration: 1000
})
break
}
} }
}) })
}) })

View File

@@ -126,11 +126,7 @@ export default {
if (this.positionChenk(position)) { if (this.positionChenk(position)) {
position = JSON.parse(localStorage.getItem('position')) position = JSON.parse(localStorage.getItem('position'))
if (this.positionChenk(position)) { if (this.positionChenk(position)) {
Notify({ console.log(position, this.$pinia.state.value.user.position, '地理位置错误')
message: '地理位置错误',
type: 'danger',
duration: 1000
})
return return
} }
} }