From 6a972c54fe99a186b5885db1b1319643ce9679dd Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期三, 26 八月 2026 18:43:38 +0800
Subject: [PATCH] 又又更新

---
 talent-card-admin/src/style.css |   88 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/talent-card-admin/src/style.css b/talent-card-admin/src/style.css
index be3b682..de90cad 100644
--- a/talent-card-admin/src/style.css
+++ b/talent-card-admin/src/style.css
@@ -617,6 +617,11 @@
 
 .merchant-form-row.address-row {
   grid-template-columns: 68px minmax(0, 1fr) 88px;
+  align-items: start;
+}
+
+.merchant-form-row.address-row > .el-form-item__label {
+  line-height: 32px;
 }
 
 .merchant-form-row.three-columns {
@@ -695,6 +700,11 @@
   grid-template-columns: 58px minmax(0, 1fr);
   align-items: center;
   margin: 84px 0 18px;
+}
+
+.merchant-create-right .merchant-form-row,
+.merchant-create-right .merchant-hours-block {
+  column-gap: 18px;
 }
 
 .merchant-hours-list {
@@ -2146,6 +2156,34 @@
   box-shadow: 0 0 0 1px #d9dee8 inset !important;
 }
 
+/* Keep every editable product control visually consistent with the merchant form. */
+.merchant-product-form-panel {
+  --el-fill-color-blank: #ffffff;
+  --el-fill-color-light: #ffffff;
+  --el-disabled-bg-color: #ffffff;
+  --el-disabled-text-color: #334155;
+}
+
+.merchant-product-form-panel .el-input__wrapper,
+.merchant-product-form-panel .el-input-number .el-input__wrapper,
+.merchant-product-form-panel .el-select__wrapper,
+.merchant-product-form-panel .el-date-editor.el-input__wrapper,
+.merchant-product-form-panel .el-time-editor.el-input__wrapper {
+  background: #ffffff !important;
+  box-shadow: 0 0 0 1px #d9dee8 inset !important;
+}
+
+.merchant-product-form-panel .el-input__wrapper:hover,
+.merchant-product-form-panel .el-input__wrapper.is-focus,
+.merchant-product-form-panel .el-select__wrapper:hover,
+.merchant-product-form-panel .el-select__wrapper.is-focused,
+.merchant-product-form-panel .el-date-editor.el-input__wrapper:hover,
+.merchant-product-form-panel .el-date-editor.el-input__wrapper.is-focus,
+.merchant-product-form-panel .el-time-editor.el-input__wrapper:hover,
+.merchant-product-form-panel .el-time-editor.el-input__wrapper.is-focus {
+  box-shadow: 0 0 0 1px #b8c2d1 inset !important;
+}
+
 .merchant-product-form-panel .el-button,
 .product-form-actions .el-button {
   height: 28px;
@@ -2281,7 +2319,7 @@
 
 .coupon-requirement-row .coupon-full-amount-control > span {
   color: #334155;
-  font-size: 12px;
+  font-size: 14px;
   line-height: 28px;
   white-space: nowrap;
 }
@@ -2493,6 +2531,14 @@
 
 .detail-money-field {
   grid-template-columns: 56px 160px auto;
+}
+
+.detail-period-field {
+  grid-template-columns: 84px minmax(0, 1fr);
+}
+
+.detail-period-field label {
+  white-space: nowrap;
 }
 
 .detail-field label,
@@ -3433,9 +3479,38 @@
 
 /* 角色管理筛选项与标题左边缘对齐。 */
 .role-management-filter-form .el-form-item__label {
-  flex: 0 0 42px;
-  width: 42px !important;
+  flex: 0 0 86px;
+  width: 86px !important;
   justify-content: flex-start;
+}
+
+.role-management-filter-form .business-fill-filter-actions {
+  grid-column: -2 / -1;
+  grid-row: 1;
+  justify-self: end;
+}
+
+.upgrade-management-filter-form .el-form-item__label {
+  justify-content: flex-end;
+}
+
+.upgrade-management-filter-form {
+  grid-template-columns: minmax(220px, 1fr) minmax(280px, 1.15fr) minmax(220px, 0.9fr) auto;
+  gap: 14px 34px;
+}
+
+.upgrade-management-filter-form .upgrade-management-filter-date {
+  grid-column: 1;
+}
+
+.upgrade-management-filter-form .business-fill-filter-actions {
+  grid-row: 1 / span 2;
+  grid-column: 4;
+  align-content: start;
+}
+
+.upgrade-management-filter-form .el-date-editor {
+  width: 100% !important;
 }
 
 .business-fill-filter-form .el-input,
@@ -3757,6 +3832,11 @@
   padding: 18px 0 16px;
 }
 
+.movie-ticket-code-pool-tools {
+  justify-content: flex-start;
+  gap: 12px;
+}
+
 .movie-ticket-package-table {
   color: #111827;
   font-size: 12px;
@@ -3806,7 +3886,7 @@
 
 .movie-ticket-create-row {
   display: grid;
-  grid-template-columns: 58px minmax(180px, 600px) 36px 180px 86px;
+  grid-template-columns: 58px 544px 36px 180px 86px;
   gap: 12px;
   align-items: center;
   color: #111827;

--
Gitblit v1.7.1