Compare commits

...

6 Commits

Author SHA1 Message Date
gtz
9f45efb1de flex 2024-01-30 16:30:33 +08:00
gtz
890f9f4fb7 Merge branch 'dy' of git.picaiba.com:mt-fe-group/xc-pad into dy 2024-01-30 16:25:43 +08:00
gtz
d0ee6eb354 Merge branch 'dy' of git.picaiba.com:mt-fe-group/xc-pad into dy 2024-01-30 14:52:46 +08:00
gtz
292b795bd1 Merge branch 'dy' of git.picaiba.com:mt-fe-group/xc-pad into dy 2024-01-30 09:00:32 +08:00
gtz
0769e77c53 1 2024-01-29 18:39:20 +08:00
gtz
4ece565d5a 1 2024-01-29 18:38:19 +08:00
5 changed files with 15 additions and 14 deletions

14
package-lock.json generated
View File

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

View File

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

View File

@ -13,9 +13,8 @@ import { MessageBox } from 'element-ui'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
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://10.70.2.2:8080/admin-api',
timeout: 30000,
withCredentials: false
})

View File

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

View File

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