合并修改

master
李靖 2 years ago
commit 28b51b24af

@ -15,7 +15,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[vue]": { "[vue]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[json]": { "[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
@ -57,7 +57,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[typescript]": { "[typescript]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint" "editor.defaultFormatter": "vscode.typescript-language-features"
}, },
"editor.quickSuggestions": { "editor.quickSuggestions": {
"strings": true "strings": true

@ -2,14 +2,24 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
target: 'http://192.168.3.93:81', // target: 'http://192.168.3.93:81',
target: 'http://192.168.3.81:80',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '', '^/api': '',
}, },
}, },
// '/apiwms': {
// // target: 'http://192.168.3.93:81',
// target: 'http://192.168.3.81:9205',
// changeOrigin: true,
// pathRewrite: {
// '^/api': '',
// },
// },
}, },
}, },
lintOnSave: false, lintOnSave: false,
transpileDependencies: ['@dcloudio/uni-ui', 'uview-ui'], transpileDependencies: ['@dcloudio/uni-ui', 'uview-ui'],
assetsDir: 'nwp/static', assetsDir: 'nwp/static',

18784
yarn.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save