From b47aa3f145bd9758711ef520c3829bde58453872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com> Date: Thu, 10 Oct 2024 12:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/components/Cropper/src/Cropper.vue | 2 +- src/components/Upload/Image.vue | 5 +++-- src/components/Upload/Images.vue | 9 ++++++--- src/views/system/user/edit.vue | 3 +-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index 023afc4..09628d1 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VITE_DROP_CONSOLE = true # 跨域代理,可以配置多个,请注意不要换行 #VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]] -VITE_PROXY=[["/api","http://127.0.0.1:8081/api"]] +VITE_PROXY=[["/api","http://192.168.124.203:8081/api"]] # API 接口地址 VITE_GLOB_API_URL = diff --git a/src/components/Cropper/src/Cropper.vue b/src/components/Cropper/src/Cropper.vue index 9fd6926..91aa8d3 100644 --- a/src/components/Cropper/src/Cropper.vue +++ b/src/components/Cropper/src/Cropper.vue @@ -56,7 +56,7 @@ title: { type: String, default: '图片上传' }, src: { type: String, required: true }, circled: { type: Boolean, default: false }, - width: { type: [String, Number], default: 150 }, + width: { type: [String, Number], default: 120 }, uploadApi: { type: Function as PropType<(params) => Promise>, }, diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue index 0e341d9..1d8bcba 100644 --- a/src/components/Upload/Image.vue +++ b/src/components/Upload/Image.vue @@ -296,6 +296,7 @@ background-color: transparent; border: 1px dashed var(--el-border-color-darker); border-radius: v-bind(borderRadius); + padding:5px; &:hover { border: 1px dashed var(--el-color-primary); } @@ -305,8 +306,8 @@ border: 2px dashed var(--el-color-primary) !important; } .upload-image { - width: 90%; - height: 90%; + width: 100%; + height: 100%; object-fit: contain; } .upload-empty { diff --git a/src/components/Upload/Images.vue b/src/components/Upload/Images.vue index 0227c9e..90c56d3 100644 --- a/src/components/Upload/Images.vue +++ b/src/components/Upload/Images.vue @@ -75,11 +75,11 @@ }, width: { type: String, - default: '150px', + default: '120px', }, height: { type: String, - default: '150px', + default: '120px', }, borderRadius: { type: String, @@ -279,6 +279,7 @@ height: v-bind(height); border: 1px dashed var(--el-border-color-darker); border-radius: v-bind(borderRadius); + padding: 5px; } &:hover { @@ -293,7 +294,9 @@ height: 100%; object-fit: contain; } - + :deep(.el-upload--picture-card) { + --el-upload-picture-card-size: v-bind(width); + } .upload-handle { position: absolute; top: 0; diff --git a/src/views/system/user/edit.vue b/src/views/system/user/edit.vue index 548bb66..248bfa8 100644 --- a/src/views/system/user/edit.vue +++ b/src/views/system/user/edit.vue @@ -156,8 +156,7 @@ class="flex-1" :rules="[ { required: true, message: '请输入手机号码', trigger: 'blur' }, - { validator: rule.validatePhone, trigger: 'blur' }, - ]" + { validator: rule.validatePhone, trigger: 'blur' }]" >