From e74632e5fa11bf3df5c937c115086f8b2de25395 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 28 Feb 2022 10:45:03 +0800 Subject: [PATCH 1/4] =?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.json | 1 + src/views/login/index.vue | 4 ++-- vue.config.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5252f77..878c9b0 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "vuex": "3.1.0", "xlsx": "0.14.1" }, + "devDependencies": { "@babel/core": "7.0.0", "@babel/plugin-transform-runtime": "^7.12.10", diff --git a/src/views/login/index.vue b/src/views/login/index.vue index eec4c6a..2d04fab 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -103,8 +103,8 @@ export default { return { loginForm: { username: 13588441519, - password: 123456, - // password: '123abc.' + // password: 123456, + password: '123abc.', mobile: 13588441519, oauthCode: 13588441519, openId: 13588441519, diff --git a/vue.config.js b/vue.config.js index e51110b..1e04b4b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - // target: 'http://192.168.0.148:8080', - target: 'http://a.wms.picaiba.com/api', + // target: 'http://192.168.1.56:8080', + target: 'http://a.wms.picaiba.com', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', From 6a338438bfbae8d0b467b908bcdbaf8e028fbc7e Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 28 Feb 2022 10:49:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index 1e04b4b..e51110b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - // target: 'http://192.168.1.56:8080', - target: 'http://a.wms.picaiba.com', + // target: 'http://192.168.0.148:8080', + target: 'http://a.wms.picaiba.com/api', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', From 93be36708d51243bdb2a7f875df413ec071360e2 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 28 Feb 2022 10:53:52 +0800 Subject: [PATCH 3/4] =?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.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c97e3bb..5252f77 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "nprogress": "0.2.0", "outlayer": "^2.1.1", "path-to-regexp": "2.4.0", + "raphael": "git+https://gitee.com/shihairong/raphael", "screenfull": "4.2.0", "script-loader": "0.7.2", "showdown": "1.9.0", @@ -83,7 +84,6 @@ "vuex": "3.1.0", "xlsx": "0.14.1" }, - "devDependencies": { "@babel/core": "7.0.0", "@babel/plugin-transform-runtime": "^7.12.10", @@ -97,7 +97,7 @@ "@vue/test-utils": "1.0.0-beta.29", "autoprefixer": "^9.5.1", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "8.2.2", + "babel-eslint": "10.0.1", "babel-jest": "23.6.0", "chalk": "2.4.2", "chokidar": "2.1.5", From 597934be2e8a71b0d3240452b8c3a59d460c0b72 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 28 Feb 2022 10:58:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/vue.config.js b/vue.config.js index dee72d0..637215f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,18 +46,9 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { -<<<<<<< HEAD - target: 'http://localhost:8080', - // target: 'http://192.168.0.148:8080', -======= -<<<<<<< HEAD // target: 'http://localhost:8080', - target: 'http://192.168.0.148:8080', -======= // target: 'http://192.168.0.148:8080', target: 'http://a.wms.picaiba.com/api', ->>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f ->>>>>>> develop // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080',