Merge pull request '更新' (#5) from xiaozy into master

Reviewed-on: #5

src/store/piniaIndex.js

@@ -34,9 +34,9 @@ const instance = defineStore('user', {
         let geolocation = new AMap.Geolocation({
           // enableHighAccuracy: true // 是否使用高精度定位，默认：true
         })
-        geolocation.getCurrentPosition((status, result) => {
-          // console.log('piniaIndex status', status)
-          // console.log('piniaIndex result', result)
+        geolocation.getCurrentPosition(function (status, result) {
+          console.log('piniaIndex status', status)
+          console.log('piniaIndex result', result)
           if (status === 'complete') {
             let { lat: latitude, lng: longitude } = result.position
             this.position = { latitude, longitude }

src/views/HomeView.vue

@@ -137,8 +137,8 @@ export default {
           // enableHighAccuracy: true // 是否使用高精度定位，默认：true
         })
         geolocation.getCurrentPosition((status, result) => {
-          // console.log('status', status)
-          // console.log('result', result)
+          console.log('status', status)
+          console.log('result', result)
           if (status === 'complete') {
             let { lat: latitude, lng: longitude } = result.position
             this.position = { latitude, longitude }

src/views/orderDetails/components/oilNextFooter.vue

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

vue.config.js

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