From d2e325e5fc1c3934aa6b8f337d221dc7f7565838 Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Mon, 26 May 2025 10:24:33 +0800 Subject: [PATCH] dev --- src/assets/scss/main.scss | 38 ++++++++++++++++++------- src/components/inventory/goods/Edit.vue | 18 +++++------- src/components/registration/Edit.vue | 16 +++++------ 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index bfc7774..84e7dd9 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -143,24 +143,40 @@ $lighter-color: rgba(#4D6DE4, 0.5); color: #FFF; font-size: 16px; text-align: center; - margin-left: 10px; - &:first-child{ - margin-left: 0; - } + margin-left: 9px; &:hover{ background: $lighter-color; } } + .small-btn{ - display: inline-block; - background: $btn-color; - border-radius: 3px; - color: #FFF; - font-size: 12px; - text-align: center; + cursor: pointer; + display: inline-block; + line-height: 1; + background: $btn-color; + border-radius: 4px; + color: #FFF; + font-size: 14px; + text-align: center; + margin-left: 9px; + padding: 8px 15px; + &:hover{ + background: $lighter-color; + } +} + +.danger-btn{ cursor: pointer; + display: inline-block; + line-height: 1; + background: #EB5757; + border-radius: 4px; + color: #FFF; + font-size: 14px; + text-align: center; + margin-left: 9px; padding: 8px 15px; &:hover{ - background: $lighter-color; + background: rgba(#EB5757, 0.5); } } diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue index 7a5cd64..0f92641 100644 --- a/src/components/inventory/goods/Edit.vue +++ b/src/components/inventory/goods/Edit.vue @@ -425,12 +425,13 @@ @@ -915,11 +916,6 @@ const enableSale = () => { justify-content: flex-end; align-items: center; padding: 0 24px; - .default-btn{ - &:nth-child(1){ - width: 200px; - } - } } diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index adb4afc..f927cad 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -204,9 +204,9 @@ 退出医保
- 保存 - 取消 - 退号 + 退号 + 保存 + 取消
@@ -548,11 +548,9 @@ defineExpose({init}) :deep(.el-form-item) { margin-bottom: 2px !important; -} - -.small-btn { - margin-left: 5px; - height: 32px; - line-height: 1; + .small-btn{ + height: 33px; + line-height: 33px; + } } \ No newline at end of file