From 36944296e4f8a7fb05d498c877200d328cbcde3a Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 14:01:48 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index a5f24a1..8b2f8cc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,10 +4,10 @@ import VueRouter from 'vue-router' Vue.use(VueRouter) const routes = [ - { - path: '/', - redirect: '/home' - }, + // { + // path: '/', + // redirect: '/home' + // }, { meta: { title: '首页', index: 0, closeNavBar: true }, path: '/home', -- 2.36.2 From b1e0856a08e964b8662fe8b1f3c795bae47b6904 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 14:03:14 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 ++++---- vue.config.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 8b2f8cc..a5f24a1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,10 +4,10 @@ import VueRouter from 'vue-router' Vue.use(VueRouter) const routes = [ - // { - // path: '/', - // redirect: '/home' - // }, + { + path: '/', + redirect: '/home' + }, { meta: { title: '首页', index: 0, closeNavBar: true }, path: '/home', diff --git a/vue.config.js b/vue.config.js index eafaa91..af9770d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,7 +5,7 @@ function resolve(dir) { return path.join(__dirname, dir) } module.exports = defineConfig({ - publicPath: '/h5/', + publicPath: '/h5', outputDir: 'dist', assetsDir: './static', transpileDependencies: true, -- 2.36.2 From f9bf46aff8524199412e1cd0d69f3386327fac09 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 14:06:46 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index a5f24a1..b37ddc1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,7 +47,7 @@ const routes = [ ] const router = new VueRouter({ - mode: 'history', + // mode: 'history', base: process.env.BASE_URL, routes }) -- 2.36.2 From c553e1b328675bba88aaf7f320bba3cecfb1f352 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 14:54:57 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/permission.js b/src/permission.js index fd3b908..4d1412d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -16,11 +16,15 @@ router.beforeEach(async (to, from, next) => { if (!token) { let paramsTarget = obtainUrlPathParameterTarget(location.href) - console.log('paramsTarget', paramsTarget) sessionStorage.setItem('paramsTarget', JSON.stringify(paramsTarget)) - store.login(paramsTarget).then(() => { - next() - }) + store.login(paramsTarget).then( + () => { + next() + }, + () => { + next() + } + ) return } -- 2.36.2 From 291673d7a8d2557e96e7b2bfae9ace3aec19c4fc Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 15:49:48 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index 4d1412d..9433b40 100644 --- a/src/permission.js +++ b/src/permission.js @@ -22,7 +22,7 @@ router.beforeEach(async (to, from, next) => { next() }, () => { - next() + Notify('登陆失败，请退出重试') } ) return -- 2.36.2 From 493ab7baced6820f667b58038882d62a09aaeeca Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 16:27:29 +0800 Subject: [PATCH 06/17] gengxin --- src/store/piniaIndex.js | 2 ++ src/views/HomeView.vue | 24 ++++++++++++++++++++++++ vue.config.js | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index da1de4e..1e3b42c 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -27,6 +27,8 @@ const instance = defineStore('user', { actions: { getPosition() { + this.position = { latitude: 36.636753, longitude: 119.11914 } + return initAMap().then(() => { // console.log(3) let AMap = Vue.prototype.$AMap diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 0be748e..8073a59 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -125,6 +125,30 @@ export default { return !position?.latitude && !position?.longitude ? true : false }, 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(() => { let AMap = this.$AMap let geolocation = new AMap.Geolocation({ diff --git a/vue.config.js b/vue.config.js index af9770d..413b3af 100644 --- a/vue.config.js +++ b/vue.config.js @@ -16,7 +16,7 @@ module.exports = defineConfig({ // https: true, proxy: { [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: `http://uat.xingoil.com/adminapi`, changeOrigin: true, -- 2.36.2 From ee6ebb71f1cc836eead1867ad91411cddd9740ab Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 6 Apr 2023 17:06:00 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index 9433b40..e0eb11e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -6,13 +6,15 @@ import { obtainUrlPathParameterTarget } from '@/utils/index.js' import { getToken, removeToken } from '@/utils/auth' import { Notify } from 'vant' +let whiteList = ['/home'] + router.beforeEach(async (to, from, next) => { //pinia挂载顺序问题异步处理路由拦截 setTimeout(() => { let store = useStore() //获取状态 let token = getToken() //获取cookie // removeToken() - // store.getPosition() + !whiteList.includes(to.path) && store.getPosition() if (!token) { let paramsTarget = obtainUrlPathParameterTarget(location.href) -- 2.36.2 From 68152e6b429034de5e18d30175a09fdfd9a1a46e Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Fri, 7 Apr 2023 10:39:14 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oil-order.js | 152 +++++----- src/permission.js | 41 ++- src/store/piniaIndex.js | 5 +- src/utils/request.js | 10 +- src/views/cashier/cashierIndex.vue | 465 +++++++++++++++-------------- 5 files changed, 349 insertions(+), 324 deletions(-) diff --git a/src/api/oil-order.js b/src/api/oil-order.js index 4a885cd..4f274b3 100644 --- a/src/api/oil-order.js +++ b/src/api/oil-order.js @@ -1,80 +1,80 @@ import request from '@/utils/request' -const service_name = "oil-site" -const group_name = "oilSiteOrderInfo" +const service_name = 'oil-site' +const group_name = 'oilSiteOrderInfo' const Img_name = 'oil-interfaces' export default { - // 下单 - createOrder(data) { - return request({ - url: `/oil-site/oilSiteOrderInfo/createH5Order`, - method: 'post', - data: data - }) - }, - // 主动支付 - payOrder(data) { - return request({ - url: `/${service_name}/${group_name}/payOrder`, - method: 'post', - data: data - }) - }, - aggregatePay(data) { - return request({ - url: `/${service_name}/${group_name}/aggregatePay`, - method: 'post', - data: data - }) - }, - getOrderInfoByPage(data) { - return request({ - url: `/${service_name}/${group_name}/getOrderInfoByPage`, - method: 'post', - data: data - }) - }, - getOrderPayInfo(id) { - return request({ - url: `/${service_name}/${group_name}/getOrderPayInfoH5/${id}`, - method: 'get' - }) - }, - cancelOrder(id) { - return request({ - url: `/${service_name}/${group_name}/cancelOrder/${id}`, - method: 'get' - }) - }, - delOrder(id) { - return request({ - url: `/${service_name}/${group_name}/delOrder/${id}`, - method: 'get' - }) - }, - selOrder(id) { - return request({ - url: `/${service_name}/${group_name}/selOrder/${id}`, - method: 'get' - }) - }, - //尿素站订单接口 - findXoiUreaPage(data) { - return request({ - url: `/oil-finance/xoilUreaOrder/findXoiUreaPage`, - method: 'post', - data: data - }) - }, - findOneByOrderId(id) { - return request({ - url: `/oil-finance/xoilUreaOrder/findOneByOrderId?orderId=${id}`, - method: 'get' - }) - }, - queryBarrelOrderDetails(id) { - return request({ - url: `/oil-finance/xoilUreaOrderRelation/queryBarrelOrderDetails?orderId=${id}`, - method: 'get' - }) - }, + // 下单 + createOrder(data) { + return request({ + url: `/oil-site/oilSiteOrderInfo/createOrder`, + method: 'post', + data: data + }) + }, + // 主动支付 + payOrder(data) { + return request({ + url: `/${service_name}/${group_name}/payOrder`, + method: 'post', + data: data + }) + }, + aggregatePay(data) { + return request({ + url: `/${service_name}/${group_name}/aggregatePay`, + method: 'post', + data: data + }) + }, + getOrderInfoByPage(data) { + return request({ + url: `/${service_name}/${group_name}/getOrderInfoByPage`, + method: 'post', + data: data + }) + }, + getOrderPayInfo(id) { + return request({ + url: `/${service_name}/${group_name}/getOrderPayInfo/${id}`, + method: 'get' + }) + }, + cancelOrder(id) { + return request({ + url: `/${service_name}/${group_name}/cancelOrder/${id}`, + method: 'get' + }) + }, + delOrder(id) { + return request({ + url: `/${service_name}/${group_name}/delOrder/${id}`, + method: 'get' + }) + }, + selOrder(id) { + return request({ + url: `/${service_name}/${group_name}/selOrder/${id}`, + method: 'get' + }) + }, + //尿素站订单接口 + findXoiUreaPage(data) { + return request({ + url: `/oil-finance/xoilUreaOrder/findXoiUreaPage`, + method: 'post', + data: data + }) + }, + findOneByOrderId(id) { + return request({ + url: `/oil-finance/xoilUreaOrder/findOneByOrderId?orderId=${id}`, + method: 'get' + }) + }, + queryBarrelOrderDetails(id) { + return request({ + url: `/oil-finance/xoilUreaOrderRelation/queryBarrelOrderDetails?orderId=${id}`, + method: 'get' + }) + } } diff --git a/src/permission.js b/src/permission.js index e0eb11e..2481eb6 100644 --- a/src/permission.js +++ b/src/permission.js @@ -3,7 +3,7 @@ import useStore from './store/piniaIndex' import { obtainUrlPathParameterTarget } from '@/utils/index.js' -import { getToken, removeToken } from '@/utils/auth' +import { setToken, getToken, removeToken } from '@/utils/auth' import { Notify } from 'vant' let whiteList = ['/home'] @@ -16,17 +16,25 @@ router.beforeEach(async (to, from, next) => { // removeToken() !whiteList.includes(to.path) && store.getPosition() + // store.login({ username: '15098826302', networkId: '1522478429548756992' }) + if (!token) { + // let paramsTarget = obtainUrlPathParameterTarget(location.href) + // sessionStorage.setItem('paramsTarget', JSON.stringify(paramsTarget)) + // store.login(paramsTarget).then( + // () => { + // next() + // }, + // () => { + // Notify('登陆失败，请退出重试') + // } + // ) let paramsTarget = obtainUrlPathParameterTarget(location.href) - sessionStorage.setItem('paramsTarget', JSON.stringify(paramsTarget)) - store.login(paramsTarget).then( - () => { - next() - }, - () => { - Notify('登陆失败，请退出重试') - } - ) + if (paramsTarget.token) { + setToken(paramsTarget.token) + store.getUser() + next() + } else Notify('登陆失败，请退出重试') return } @@ -40,12 +48,13 @@ router.beforeEach(async (to, from, next) => { // } // } //拦截 如果不是去首页 还没有token直接去首页 - if (to.path !== '/' && !token) { - Notify('请检查登陆状态') - next({ path: '/' }) - } else { - next() - } + // if (to.path !== '/home' && !token) { + // Notify('请检查登陆状态') + // next({ path: '/' }) + // } else { + + // } + next() }, 0) }) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index 1e3b42c..afda4a5 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -119,13 +119,14 @@ const instance = defineStore('user', { }) .then(res => { if (res.code === 20000) { - setToken(res.data.accessToken) - this.getUser() + // setToken(res.data.accessToken) + // this.getUser() } }) } return Promise.reject() }, + clearToken() { removeToken() } diff --git a/src/utils/request.js b/src/utils/request.js index d56eb4d..f70e139 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -63,8 +63,14 @@ service.interceptors.response.use( // let paramsTargetJson = sessionStorage.getItem('paramsTarget') // let paramsTarget = JSON.parse(paramsTargetJson) // instance.login(paramsTarget).then(location.reload()) - removeToken() - location.reload() + // removeToken() + // location.reload() + Notify({ + message: '登陆失败，请退出重试', + onClose: () => { + removeToken() + } + }) return } if (![20000].includes(res.code)) { diff --git a/src/views/cashier/cashierIndex.vue b/src/views/cashier/cashierIndex.vue index a162cd6..34181be 100644 --- a/src/views/cashier/cashierIndex.vue +++ b/src/views/cashier/cashierIndex.vue @@ -1,297 +1,306 @@ \ No newline at end of file + -- 2.36.2 From c50f14f14c4ebcd785067e6beb7eb57c1e7b09b7 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Fri, 7 Apr 2023 11:15:04 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/cashier/cashierIndex.vue | 34 ++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/views/cashier/cashierIndex.vue b/src/views/cashier/cashierIndex.vue index 34181be..cf2f9c9 100644 --- a/src/views/cashier/cashierIndex.vue +++ b/src/views/cashier/cashierIndex.vue @@ -22,6 +22,7 @@ - + diff --git a/src/App.vue b/src/App.vue index 5bb4587..f5a53d4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,20 +1,26 @@ \ No newline at end of file + -- 2.36.2 From 01a5a2ad72821e8194c48dd969c62c7b85fb1ccf Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Mon, 10 Apr 2023 09:02:28 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/piniaIndex.js | 16 +++++++++------- vue.config.js | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index afda4a5..b523f69 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -28,7 +28,7 @@ const instance = defineStore('user', { actions: { getPosition() { this.position = { latitude: 36.636753, longitude: 119.11914 } - return + // return initAMap().then(() => { // console.log(3) let AMap = Vue.prototype.$AMap @@ -36,12 +36,14 @@ const instance = defineStore('user', { // enableHighAccuracy: true // 是否使用高精度定位，默认：true }) geolocation.getCurrentPosition(function (status, result) { - console.log(2) - if (status === 'complete') { - let { lat: latitude, lng: longitude } = result.position - this.position = { latitude, longitude } - console.log('this.position', this.position) - } + console.log('geolocation.getCurrentPosition') + console.log('status', status) + console.log('result', result) + // if (status === 'complete') { + // let { lat: latitude, lng: longitude } = result.position + // this.position = { latitude, longitude } + // console.log('this.position', this.position) + // } }) }) return diff --git a/vue.config.js b/vue.config.js index 413b3af..dae57e4 100644 --- a/vue.config.js +++ b/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]: '' -- 2.36.2 From 843a6031065caa02c9d8fe96fba18c13c09bb66a Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Mon, 10 Apr 2023 09:02:49 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index b3adb6e..a97c730 100644 --- a/public/index.html +++ b/public/index.html @@ -31,8 +31,8 @@ }) - + -- 2.36.2 From 8ab0bd3b098756c75088b8cc2609c4096d66cf02 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Mon, 10 Apr 2023 10:03:55 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 46 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + public/index.html | 6 ------ src/main.js | 5 +++++ 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75a26fa..fc725c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "px2rem-loader": "^0.1.9", "qs": "^6.11.1", "vant": "^2.12.48", + "vconsole": "^3.15.0", "vue": "^2.6.14", "vue-qr": "^4.0.9", "vue-router": "^3.5.1", @@ -4236,6 +4237,14 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, + "node_modules/copy-text-to-clipboard": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.1.0.tgz", + "integrity": "sha512-PFM6BnjLnOON/lB3ta/Jg7Ywsv+l9kQGD4TWDCSlRBGmqnnTM5MrDkhAFgw+8HZt0wW6Q2BBE4cmy9sq+s9Qng==", + "engines": { + "node": ">=12" + } + }, "node_modules/copy-webpack-plugin": { "version": "9.1.0", "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz", @@ -7595,6 +7604,11 @@ "multicast-dns": "cli.js" } }, + "node_modules/mutation-observer": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "node_modules/mz": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz", @@ -10654,6 +10668,17 @@ "node": ">= 0.8" } }, + "node_modules/vconsole": { + "version": "3.15.0", + "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.0.tgz", + "integrity": "sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==", + "dependencies": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + } + }, "node_modules/vue": { "version": "2.7.5", "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.5.tgz", @@ -14913,6 +14938,11 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, + "copy-text-to-clipboard": { + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.1.0.tgz", + "integrity": "sha512-PFM6BnjLnOON/lB3ta/Jg7Ywsv+l9kQGD4TWDCSlRBGmqnnTM5MrDkhAFgw+8HZt0wW6Q2BBE4cmy9sq+s9Qng==" + }, "copy-webpack-plugin": { "version": "9.1.0", "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz", @@ -17571,6 +17601,11 @@ "thunky": "^1.0.2" } }, + "mutation-observer": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz", @@ -19925,6 +19960,17 @@ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true }, + "vconsole": { + "version": "3.15.0", + "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.0.tgz", + "integrity": "sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==", + "requires": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + } + }, "vue": { "version": "2.7.5", "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.5.tgz", diff --git a/package.json b/package.json index 6f3cb91..50c2204 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "px2rem-loader": "^0.1.9", "qs": "^6.11.1", "vant": "^2.12.48", + "vconsole": "^3.15.0", "vue": "^2.6.14", "vue-qr": "^4.0.9", "vue-router": "^3.5.1", diff --git a/public/index.html b/public/index.html index a97c730..c65ec85 100644 --- a/public/index.html +++ b/public/index.html @@ -30,9 +30,3 @@ event.preventDefault() }) - - - diff --git a/src/main.js b/src/main.js index 5176d06..0ccf9ab 100644 --- a/src/main.js +++ b/src/main.js @@ -9,6 +9,11 @@ import * as utils from 'utils/index.js' import 'vant/lib/index.css' import '@/assets/iconfont/iconfont.css' import { createPinia, PiniaVuePlugin } from 'pinia' +import vConsole from 'vconsole' + +if (process.env.VUE_APP_ENV !== 'production') { + new vConsole() +} Vue.use(PiniaVuePlugin) const pinia = createPinia() -- 2.36.2 From c6c1af91a98292c8c95eb504694e7ec1f8cf2c59 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 12 Apr 2023 09:14:17 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/piniaIndex.js | 10 ++++++++++ vue.config.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index b523f69..2fa77d4 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -28,6 +28,16 @@ const instance = defineStore('user', { actions: { getPosition() { this.position = { latitude: 36.636753, longitude: 119.11914 } + + if (navigator?.geolocation?.getCurrentPosition) { + console.log('存在原生定位') + navigator.geolocation.getCurrentPosition(position => { + console.log('原生定位', position) + }) + } else { + console.log('原生定位不可用') + } + // return initAMap().then(() => { // console.log(3) diff --git a/vue.config.js b/vue.config.js index dae57e4..73fd7a9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,6 @@ const { defineConfig } = require('@vue/cli-service') const path = require('path') -const port = 9528 + function resolve(dir) { return path.join(__dirname, dir) } @@ -12,7 +12,7 @@ module.exports = defineConfig({ lintOnSave: false, devServer: { - port: port, + port: 9528, // https: true, proxy: { [process.env.VUE_APP_BASE_API]: { -- 2.36.2 From 1eab02047ea551d1893093a4fad308d1c9af2ced Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 12 Apr 2023 11:08:47 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/store/piniaIndex.js | 35 ++++------------------ src/views/HomeView.vue | 65 +++++++++++++++-------------------------- vue.config.js | 4 +-- 4 files changed, 31 insertions(+), 75 deletions(-) diff --git a/.env.development b/.env.development index 8416491..f85a567 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VUE_APP_UPLOAD_PRIVATE_URL = '/api/oil-dict/imageHandler/uploadProtectedImg' VUE_APP_DOMAIN = '192.168.0.150:38080' # 开发环境，不会进行加密，会打印出数据 -VUE_APP_ENV = 'production' +VUE_APP_ENV = 'development' #production diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index 2fa77d4..6be6362 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -27,37 +27,20 @@ const instance = defineStore('user', { actions: { getPosition() { - this.position = { latitude: 36.636753, longitude: 119.11914 } - - if (navigator?.geolocation?.getCurrentPosition) { - console.log('存在原生定位') - navigator.geolocation.getCurrentPosition(position => { - console.log('原生定位', position) - }) - } else { - console.log('原生定位不可用') - } - - // return initAMap().then(() => { - // console.log(3) let AMap = Vue.prototype.$AMap let geolocation = new AMap.Geolocation({ // enableHighAccuracy: true // 是否使用高精度定位，默认：true }) geolocation.getCurrentPosition(function (status, result) { - console.log('geolocation.getCurrentPosition') - console.log('status', status) - console.log('result', result) - // if (status === 'complete') { - // let { lat: latitude, lng: longitude } = result.position - // this.position = { latitude, longitude } - // console.log('this.position', this.position) - // } + if (status === 'complete') { + let { lat: latitude, lng: longitude } = result.position + this.position = { latitude, longitude } + } else { + } }) }) return - if (navigator?.geolocation?.getCurrentPosition) { navigator.geolocation.getCurrentPosition( position => { @@ -65,14 +48,6 @@ const instance = defineStore('user', { let { latitude, longitude } = position.coords this.position = { latitude, longitude } }, - // function (position) { - // console.log('position', position) - // // that.$patch(state => { - // // ;({ latitude: state.position.latitude, longitude: state.position.longitude } = position.coords) - // // localStorage.setItem('position', JSON.stringify(state.position)) - // // console.log(state.position, position.coords, '检测到地理位置授权') - // // }) - // }, error => { console.log('error', error) switch (error.code) { diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 8073a59..2c55c96 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -22,6 +22,8 @@ import oilSiteApi from '@/api/oil-site.js' import initAMap from '@/utils/amap.js' +import { Notify } from 'vant' + export default { components: { homeNavBar, @@ -125,9 +127,27 @@ export default { return !position?.latitude && !position?.longitude ? true : false }, getlist() { - let position = { latitude: 36.636753, longitude: 119.11914 } - - this.page.params = Object.assign(this.page.params, position) + if (this.position) { + this.obtainData() + return + } + initAMap().then(() => { + let AMap = this.$AMap + let geolocation = new AMap.Geolocation({ + // enableHighAccuracy: true // 是否使用高精度定位，默认：true + }) + geolocation.getCurrentPosition((status, result) => { + if (status === 'complete') { + let { lat: latitude, lng: longitude } = result.position + this.position = { latitude, longitude } + this.obtainData() + } else { + } + }) + }) + }, + obtainData() { + this.page.params = Object.assign(this.page.params, this.position) this.loading = true oilSiteApi .getSiteList(this.page) @@ -148,45 +168,6 @@ export default { .catch(error => { this.finished = true }) - return - initAMap().then(() => { - let AMap = this.$AMap - let geolocation = new AMap.Geolocation({ - // enableHighAccuracy: true // 是否使用高精度定位，默认：true - }) - geolocation.getCurrentPosition((status, result) => { - if (status === 'complete') { - let { lat: latitude, lng: longitude } = result.position - - // this.position = { latitude, longitude } - // console.log('this.position', this.position) - - let position = { latitude, longitude } - - 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 - }) - } - }) - }) } } } diff --git a/vue.config.js b/vue.config.js index 73fd7a9..fcb45ab 100644 --- a/vue.config.js +++ b/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]: '' -- 2.36.2 From 1cdcd53d8a6ccc99263320bac4c2c127a2501b65 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 12 Apr 2023 11:14:01 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/piniaIndex.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index 6be6362..9b712dd 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -27,6 +27,7 @@ const instance = defineStore('user', { actions: { getPosition() { + if (this.position.latitude && this.position.longitude) return initAMap().then(() => { let AMap = Vue.prototype.$AMap let geolocation = new AMap.Geolocation({ -- 2.36.2 From b6b356494c98e857f1a60be66f2fb9e1a25dbc01 Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 12 Apr 2023 11:14:38 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/piniaIndex.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js index 9b712dd..9dd944d 100644 --- a/src/store/piniaIndex.js +++ b/src/store/piniaIndex.js @@ -6,8 +6,6 @@ import serve from 'api/login.js' import { Notify } from 'vant' -import encode from '@/utils/encode' - import initAMap from '@/utils/amap.js' import Vue from 'vue' -- 2.36.2