From 75b43189029a951086fa4e4272ee479bbe7f80e2 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期四, 20 八月 2026 14:03:54 +0800
Subject: [PATCH] 又又更新
---
talent-card-admin/src/views/MerchantCreateView.vue | 2 +-
talent-card-admin/src/style.css | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/talent-card-admin/src/style.css b/talent-card-admin/src/style.css
index f215596..97c1ca6 100644
--- a/talent-card-admin/src/style.css
+++ b/talent-card-admin/src/style.css
@@ -343,6 +343,21 @@
max-width: 100%;
}
+/* Keep required and optional label text aligned; the required marker sits outside the text flow. */
+.admin-main .el-form-item__label {
+ position: relative;
+ box-sizing: border-box;
+ padding-left: 12px;
+ text-align: left;
+ justify-content: flex-start;
+}
+
+.admin-main .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+ position: absolute;
+ left: 0;
+ margin-right: 0;
+}
+
.main-breadcrumb {
display: flex;
align-items: center;
@@ -597,6 +612,19 @@
white-space: nowrap;
}
+.merchant-settings-form .el-form-item__label {
+ justify-content: flex-start;
+ position: relative;
+ box-sizing: border-box;
+ padding-left: 12px;
+}
+
+.merchant-settings-form .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+ position: absolute;
+ left: 0;
+ margin-right: 0;
+}
+
.merchant-form-row .el-input,
.merchant-account-form .el-input {
width: 210px;
@@ -721,6 +749,10 @@
margin-bottom: 12px;
}
+.merchant-settings-form .merchant-form-row.recommend-row > label {
+ padding-left: 12px;
+}
+
.merchant-form-row.recommend-row .el-switch {
justify-self: start;
}
@@ -731,6 +763,15 @@
.merchant-account-form .el-form-item {
margin-bottom: 18px;
+}
+
+.merchant-account-form .merchant-account-login-toggle > .el-form-item__label,
+.merchant-account-form .merchant-account-field > .el-form-item__label {
+ position: relative;
+ box-sizing: border-box;
+ padding-left: 12px;
+ text-align: left;
+ justify-content: flex-start;
}
.merchant-account-form .merchant-account-field {
@@ -752,9 +793,9 @@
}
.merchant-account-form .merchant-account-field.is-required:not(.is-no-asterisk) .el-form-item__label::before {
- content: "*";
- margin-right: 4px;
- color: var(--el-color-danger);
+ position: absolute;
+ left: 0;
+ margin-right: 0;
}
.merchant-account-form .el-form-item__label {
@@ -1724,6 +1765,8 @@
.product-image-row label,
.product-detail-row label,
.product-notice-field label {
+ box-sizing: border-box;
+ padding-left: 12px;
color: #334155;
font-size: 12px;
line-height: 28px;
diff --git a/talent-card-admin/src/views/MerchantCreateView.vue b/talent-card-admin/src/views/MerchantCreateView.vue
index 4fd1fa6..53f9c31 100644
--- a/talent-card-admin/src/views/MerchantCreateView.vue
+++ b/talent-card-admin/src/views/MerchantCreateView.vue
@@ -2329,7 +2329,7 @@
<section class="merchant-account-panel">
<h3>账户设置</h3>
<el-form ref="accountFormRef" class="merchant-account-form" :model="accountForm" :rules="accountRules" label-width="72px" label-position="left">
- <el-form-item v-if="supportsMerchantAppLogin" label="登录商户端" label-width="100px">
+ <el-form-item v-if="supportsMerchantAppLogin" class="merchant-account-login-toggle" label="登录商户端" label-width="100px">
<el-switch v-model="form.canLoginMerchantApp" :active-value="1" :inactive-value="0" />
</el-form-item>
<el-form-item class="merchant-account-field" label="登录账号" prop="loginAccount" :required="requiresMerchantOperator" :error="accountTaken ? '登录账号已存在，请更换' : ''">
--
Gitblit v1.7.1