pull/2/head
xiaozhiyong 2 years ago
parent 291673d7a8
commit 493ab7bace
  1. 2
      src/store/piniaIndex.js
  2. 24
      src/views/HomeView.vue
  3. 2
      vue.config.js

@ -27,6 +27,8 @@ const instance = defineStore('user', {
actions: { actions: {
getPosition() { getPosition() {
this.position = { latitude: 36.636753, longitude: 119.11914 }
return
initAMap().then(() => { initAMap().then(() => {
// console.log(3) // console.log(3)
let AMap = Vue.prototype.$AMap let AMap = Vue.prototype.$AMap

@ -125,6 +125,30 @@ export default {
return !position?.latitude && !position?.longitude ? true : false return !position?.latitude && !position?.longitude ? true : false
}, },
getlist() { getlist() {
let position = { latitude: 36.636753, longitude: 119.11914 }
this.page.params = Object.assign(this.page.params, position)
this.loading = true
oilSiteApi
.getSiteList(this.page)
.then(res => {
if (res.code == 20000) {
if (res.data.list.length < 10) {
this.finished = true
}
if (this.page.currentPage == 1) {
this.list = res.data.list
} else {
this.list = this.list.concat(res.data.list)
}
this.loading = false
this.refreshing = false
}
})
.catch(error => {
this.finished = true
})
return
initAMap().then(() => { initAMap().then(() => {
let AMap = this.$AMap let AMap = this.$AMap
let geolocation = new AMap.Geolocation({ let geolocation = new AMap.Geolocation({

@ -16,7 +16,7 @@ module.exports = defineConfig({
// https: true, // https: true,
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.110.230:38080`, // target: `http://192.168.1.83:38080`,
// target: `https://www.xingoil.com/adminapi`, // target: `https://www.xingoil.com/adminapi`,
target: `http://uat.xingoil.com/adminapi`, target: `http://uat.xingoil.com/adminapi`,
changeOrigin: true, changeOrigin: true,

Loading…
Cancel
Save