@@ -66,6 +66,7 @@ | |||||
"nprogress": "0.2.0", | "nprogress": "0.2.0", | ||||
"outlayer": "^2.1.1", | "outlayer": "^2.1.1", | ||||
"path-to-regexp": "2.4.0", | "path-to-regexp": "2.4.0", | ||||
"raphael": "git+https://gitee.com/shihairong/raphael", | |||||
"screenfull": "4.2.0", | "screenfull": "4.2.0", | ||||
"script-loader": "0.7.2", | "script-loader": "0.7.2", | ||||
"showdown": "1.9.0", | "showdown": "1.9.0", | ||||
@@ -96,7 +97,7 @@ | |||||
"@vue/test-utils": "1.0.0-beta.29", | "@vue/test-utils": "1.0.0-beta.29", | ||||
"autoprefixer": "^9.5.1", | "autoprefixer": "^9.5.1", | ||||
"babel-core": "7.0.0-bridge.0", | "babel-core": "7.0.0-bridge.0", | ||||
"babel-eslint": "8.2.2", | |||||
"babel-eslint": "10.0.1", | |||||
"babel-jest": "23.6.0", | "babel-jest": "23.6.0", | ||||
"chalk": "2.4.2", | "chalk": "2.4.2", | ||||
"chokidar": "2.1.5", | "chokidar": "2.1.5", | ||||
@@ -103,8 +103,8 @@ export default { | |||||
return { | return { | ||||
loginForm: { | loginForm: { | ||||
username: 13588441519, | username: 13588441519, | ||||
password: 123456, | |||||
// password: '123abc.' | |||||
// password: 123456, | |||||
password: '123abc.', | |||||
mobile: 13588441519, | mobile: 13588441519, | ||||
oauthCode: 13588441519, | oauthCode: 13588441519, | ||||
openId: 13588441519, | openId: 13588441519, | ||||
@@ -46,9 +46,15 @@ module.exports = { | |||||
// 这里写入需要代理的api和对应的目标地址 | // 这里写入需要代理的api和对应的目标地址 | ||||
proxy: { | proxy: { | ||||
'/api': { | '/api': { | ||||
<<<<<<< HEAD | |||||
target: 'http://localhost:8080', | 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', | // target: 'http://a.wms.picaiba.com/api', | ||||
======= | |||||
// target: 'http://localhost:8080', | |||||
// target: 'http://192.168.0.148:8080', | |||||
target: 'http://a.wms.picaiba.com/api', | |||||
>>>>>>> develop | |||||
// target: 'http://192.168.0.127:8080', | // target: 'http://192.168.0.127:8080', | ||||
// target: 'http://192.168.0.165:8080', | // target: 'http://192.168.0.165:8080', | ||||
// target: 'http://192.168.43.105:8080', | // target: 'http://192.168.43.105:8080', | ||||