Compare commits

..

No commits in common. "9f45efb1de26f9601b7c894615e88538b00f50e6" and "d290da2b805c269cbea5b065c01da4c4e79eb7a0" have entirely different histories.

5 changed files with 14 additions and 15 deletions

14
package-lock.json generated
View File

@ -11,7 +11,7 @@
"axios": "^1.6.5", "axios": "^1.6.5",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"simple-keyboard": "^3.7.47", "simple-keyboard": "^3.7.45",
"simple-keyboard-layouts": "^3.3.55", "simple-keyboard-layouts": "^3.3.55",
"vant": "^2.13.2", "vant": "^2.13.2",
"vue": "^2.6.14", "vue": "^2.6.14",
@ -10891,9 +10891,9 @@
"dev": true "dev": true
}, },
"node_modules/simple-keyboard": { "node_modules/simple-keyboard": {
"version": "3.7.47", "version": "3.7.45",
"resolved": "https://registry.npmmirror.com/simple-keyboard/-/simple-keyboard-3.7.47.tgz", "resolved": "https://registry.npmmirror.com/simple-keyboard/-/simple-keyboard-3.7.45.tgz",
"integrity": "sha512-NwtNAJF0OEjT6Qyn22AgybJPkxEJVHL56NYA8z/4lyrDQAyC2SoNLHdFK1ugsmL27AS80Jk473rboC31roj/fQ==" "integrity": "sha512-53BSay9h99V8GuHvBmiUiNesG4oFwTJpMcE/nf3VXWYX95njPJeLdhDzgFljIITjZ6nKXe8E2Lp7OMArI+R/Cw=="
}, },
"node_modules/simple-keyboard-layouts": { "node_modules/simple-keyboard-layouts": {
"version": "3.3.55", "version": "3.3.55",
@ -21253,9 +21253,9 @@
"dev": true "dev": true
}, },
"simple-keyboard": { "simple-keyboard": {
"version": "3.7.47", "version": "3.7.45",
"resolved": "https://registry.npmmirror.com/simple-keyboard/-/simple-keyboard-3.7.47.tgz", "resolved": "https://registry.npmmirror.com/simple-keyboard/-/simple-keyboard-3.7.45.tgz",
"integrity": "sha512-NwtNAJF0OEjT6Qyn22AgybJPkxEJVHL56NYA8z/4lyrDQAyC2SoNLHdFK1ugsmL27AS80Jk473rboC31roj/fQ==" "integrity": "sha512-53BSay9h99V8GuHvBmiUiNesG4oFwTJpMcE/nf3VXWYX95njPJeLdhDzgFljIITjZ6nKXe8E2Lp7OMArI+R/Cw=="
}, },
"simple-keyboard-layouts": { "simple-keyboard-layouts": {
"version": "3.3.55", "version": "3.3.55",

View File

@ -11,7 +11,7 @@
"axios": "^1.6.5", "axios": "^1.6.5",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"element-ui": "^2.15.14", "element-ui": "^2.15.14",
"simple-keyboard": "^3.7.47", "simple-keyboard": "^3.7.45",
"simple-keyboard-layouts": "^3.3.55", "simple-keyboard-layouts": "^3.3.55",
"vant": "^2.13.2", "vant": "^2.13.2",
"vue": "^2.6.14", "vue": "^2.6.14",

View File

@ -13,8 +13,9 @@ import { MessageBox } from 'element-ui'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const service = axios.create({ const service = axios.create({
// baseURL: 'http://192.168.1.20:48080',
// baseURL: 'http://192.168.1.78:48082/admin-api',
baseURL: 'http://192.168.0.33:48082/admin-api', baseURL: 'http://192.168.0.33:48082/admin-api',
// baseURL: 'http://10.70.2.2:8080/admin-api',
timeout: 30000, timeout: 30000,
withCredentials: false withCredentials: false
}) })

View File

@ -176,16 +176,14 @@ export default {
} }
.rightDiv { .rightDiv {
border-radius: 7px; border-radius: 7px;
/* height: 72px; */ height: 72px;
display: flex; line-height: 36px;
justify-content: center;
align-items: center;
line-height: 24px;
width: 140px; width: 140px;
text-align: left; text-align: left;
padding-left: 10px; padding-left: 10px;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-box-pack: center; -webkit-box-pack: center;
/* text-align: justify; */ /* text-align: justify; */

View File

@ -8,7 +8,7 @@
const { defineConfig } = require('@vue/cli-service') const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({ module.exports = defineConfig({
transpileDependencies: true, transpileDependencies: true,
publicPath: './',
// 配置代理服务器 // 配置代理服务器
devServer: { devServer: {
// proxy: { // proxy: {