From 8dc19f0bd6c4abdc9cec1f9b99b90c33b9da966f Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 12 十月 2026 17:24:12 +0800
Subject: [PATCH] fix(settlement): 共用收款主体那格改写「共用收款主体（N 家）」，悬停列出名单
---
talent-card-admin/src/style.css | 875 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 750 insertions(+), 125 deletions(-)
diff --git a/talent-card-admin/src/style.css b/talent-card-admin/src/style.css
index b69369a..9d7bac6 100644
--- a/talent-card-admin/src/style.css
+++ b/talent-card-admin/src/style.css
@@ -498,6 +498,21 @@
font-size: 12px;
}
+.merchant-management-table .merchant-action-cell {
+ display: grid;
+ grid-template-columns: 32px 48px 80px;
+ justify-content: center;
+ align-items: center;
+ column-gap: 4px;
+ white-space: nowrap;
+}
+
+.merchant-management-table .merchant-action-cell .el-button {
+ margin-left: 0;
+ width: 100%;
+ justify-content: center;
+}
+
.merchant-create-page {
display: grid;
gap: 14px;
@@ -597,13 +612,35 @@
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;
}
.merchant-form-row.address-row {
- grid-template-columns: 58px minmax(0, 1fr) 72px;
+ 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 {
+ grid-template-columns: 68px minmax(0, 1fr);
}
.merchant-form-row.address-row .el-input {
@@ -611,20 +648,50 @@
min-width: 0;
}
+.merchant-form-row.address-row .el-form-item__content {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 16px;
+ margin-left: 0 !important;
+}
+
.merchant-form-row.address-row .el-button,
.merchant-cover-row .el-button {
- width: 72px;
+ width: 88px;
+ height: 32px;
+ padding: 0 12px;
+ box-sizing: border-box;
+}
+
+.merchant-cover-row .el-button {
+ margin-left: 0;
+}
+
+.merchant-cover-row .el-form-item__content {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 16px;
+ margin-left: 0 !important;
}
.merchant-form-row.address-row .el-button {
- flex: 0 0 72px;
+ flex: 0 0 auto;
white-space: nowrap;
}
.merchant-cover-row {
- grid-template-columns: 58px 268px 92px;
+ grid-template-columns: 68px 268px 92px;
align-items: end;
margin-top: 6px;
+}
+
+.merchant-cover-row .el-form-item__label {
+ width: 68px !important;
+ padding-right: 0;
+ white-space: nowrap;
+ line-height: 28px;
}
.merchant-cover-preview {
@@ -650,6 +717,11 @@
margin: 84px 0 18px;
}
+.merchant-create-right .merchant-form-row,
+.merchant-create-right .merchant-hours-block {
+ column-gap: 18px;
+}
+
.merchant-hours-list {
display: grid;
gap: 12px;
@@ -657,13 +729,13 @@
.merchant-hour-row {
display: grid;
- grid-template-columns: 210px 20px 20px;
+ grid-template-columns: 278px 20px 20px;
gap: 10px;
align-items: center;
}
-.merchant-hour-row .el-date-editor {
- width: 210px;
+.merchant-hour-row .merchant-time-range-picker {
+ width: 278px;
}
.merchant-hour-action {
@@ -687,6 +759,21 @@
margin-bottom: 12px;
}
+.merchant-settings-form .merchant-form-row.recommend-row > label {
+ padding-left: 12px;
+}
+
+.merchant-settings-form .created-time-row > label {
+ box-sizing: border-box;
+ padding-left: 12px;
+}
+
+.merchant-settings-form .merchant-form-row > label,
+.merchant-settings-form .merchant-hours-block > label {
+ box-sizing: border-box;
+ padding-left: 12px;
+}
+
.merchant-form-row.recommend-row .el-switch {
justify-self: start;
}
@@ -699,9 +786,44 @@
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 {
+ display: flex;
+ align-items: center;
+}
+
+.merchant-account-form .merchant-account-field > .el-form-item__label {
+ flex: 0 0 92px;
+ width: 92px !important;
+ padding-right: 12px;
+ white-space: nowrap !important;
+ line-height: 32px;
+}
+
+.merchant-account-form .merchant-account-field > .el-form-item__content {
+ min-width: 0;
+ margin-left: 0 !important;
+}
+
+.merchant-account-form .merchant-account-field.is-required:not(.is-no-asterisk) .el-form-item__label::before {
+ position: absolute;
+ left: 0;
+ margin-right: 0;
+}
+
.merchant-account-form .el-form-item__label {
+ width: 92px !important;
color: #334155;
font-size: 13px;
+ white-space: nowrap;
}
.merchant-create-save {
@@ -716,11 +838,16 @@
.merchant-school-address-panel {
margin-top: 12px;
+}
+
+.merchant-school-address-panel,
+.merchant-parking-address-panel {
padding: 20px 28px 18px;
background: #ffffff;
}
-.merchant-school-address-title {
+.merchant-school-address-title,
+.merchant-parking-address-title {
margin: 0 0 16px;
color: #111827;
font-size: 14px;
@@ -728,7 +855,24 @@
text-align: left;
}
-.merchant-school-address-actions {
+.merchant-fuel-hero-tip {
+ margin: -6px 0 14px;
+ color: #8a94a6;
+ font-size: 12px;
+ line-height: 18px;
+}
+
+.merchant-fuel-hero-preview {
+ width: 108px;
+ height: 84px;
+ border: 1px solid #e5e7eb;
+ border-radius: 6px;
+ object-fit: cover;
+ background-color: #f3f4f6;
+}
+
+.merchant-school-address-actions,
+.merchant-parking-address-actions {
display: flex;
justify-content: flex-end;
margin-top: 16px;
@@ -767,10 +911,15 @@
.movie-merchant-rights-panel .merchant-rights-level-row {
grid-column: 1 / 3;
- grid-template-columns: 82px 38px 32px 160px;
+ /* 第三列放"*标签"，32px 放不下两个字，会折成两行；留出足够宽度。 */
+ grid-template-columns: 82px 38px 54px 160px;
gap: 10px;
min-width: 0;
padding-left: 0;
+}
+
+.merchant-rights-level-row > span {
+ white-space: nowrap;
}
.movie-merchant-rights-panel .merchant-rights-level-row > .el-switch {
@@ -973,6 +1122,12 @@
width: 180px;
}
+.merchant-rights-required {
+ margin-right: 3px;
+ color: #f56c6c;
+ font-style: normal;
+}
+
.merchant-rights-level-row > .el-switch {
justify-self: start;
margin-left: -17px;
@@ -981,7 +1136,7 @@
.merchant-rights-detail-row {
display: grid;
grid-template-columns: 96px minmax(360px, 520px) 270px;
- gap: 14px 24px;
+ gap: 6px 24px;
align-items: start;
padding: 14px 0 0;
}
@@ -992,10 +1147,22 @@
flex-direction: column;
}
+.merchant-rights-parking-radio .el-radio-group {
+ display: flex;
+ align-items: center;
+ gap: 24px;
+}
+
+.merchant-rights-parking-radio .el-radio {
+ margin-right: 0;
+}
+
.merchant-rights-detail-row label {
grid-column: 1 / 3;
+ margin: 0;
color: #334155;
font-size: 13px;
+ line-height: 20px;
}
.merchant-rights-level-row + .merchant-rights-detail-row {
@@ -1050,6 +1217,11 @@
align-items: start;
color: #111827;
font-size: 13px;
+}
+
+/* 商家权益仅保留后台配置表单，不展示小程序示例预览。 */
+.merchant-rights-panel .merchant-rights-example {
+ display: none !important;
}
.merchant-rights-phone-preview {
@@ -1253,13 +1425,38 @@
width: 104px;
}
+.merchant-consume-row .merchant-discount-input {
+ position: relative;
+ width: 104px;
+}
+
+.merchant-consume-row .merchant-discount-input .el-input {
+ width: 104px;
+}
+
+.merchant-consume-row .merchant-discount-input .field-error {
+ position: absolute;
+ top: calc(100% + 4px);
+ left: 0;
+ width: max-content;
+ color: #f56c6c;
+ font-size: 12px;
+ line-height: 16px;
+ white-space: nowrap;
+}
+
.hotel-voucher-row {
- grid-template-columns: 76px 42px 104px 24px 64px 104px 96px 42px;
+ grid-template-columns: 76px 42px 104px 24px 72px 104px 96px 42px;
+}
+
+.hotel-reset-label {
+ white-space: nowrap;
}
.hotel-consume-row {
- display: flex;
- align-items: flex-start;
+ display: grid;
+ grid-template-columns: 76px 42px max-content;
+ align-items: stretch;
padding-left: 186px;
padding-top: 20px;
gap: 12px;
@@ -1268,16 +1465,18 @@
}
.hotel-consume-row > strong {
- width: 76px;
- flex-shrink: 0;
- margin-top: 6px;
+ grid-column: 1;
+ align-self: start;
+ margin-top: 7px;
}
.hotel-consume-row > .el-switch {
- margin-top: 6px;
+ grid-column: 2;
+ align-self: start;
}
.hotel-consume-options {
+ grid-column: 3;
display: flex;
flex-direction: column;
gap: 12px;
@@ -1300,7 +1499,7 @@
.consume-desc-row {
padding-left: 186px;
- padding-top: 14px;
+ padding-top: 10px;
}
.merchant-products-panel,
@@ -1357,8 +1556,14 @@
.merchant-coupons-filter .el-select__wrapper {
min-height: 28px;
border-radius: 0;
- background: #f7f8fb;
- box-shadow: none;
+ background: #ffffff;
+ box-shadow: 0 0 0 1px #d9dee8 inset;
+}
+
+.merchant-products-filter .el-date-editor.el-input__wrapper,
+.merchant-coupons-filter .el-date-editor.el-input__wrapper {
+ background: #ffffff;
+ box-shadow: 0 0 0 1px #d9dee8 inset;
}
.merchant-products-filter .el-date-editor.el-input__wrapper,
@@ -1534,7 +1739,7 @@
}
.merchant-coupons-filter .coupon-created-time-picker {
- width: 320px;
+ width: 320px !important;
}
.merchant-products-filter .product-created-time-picker {
@@ -1562,12 +1767,12 @@
.product-form-grid {
display: flex;
- gap: 26px;
+ gap: 34px;
align-items: start;
}
.product-info-left {
- width: 360px;
+ width: 430px;
flex-shrink: 0;
}
@@ -1591,14 +1796,29 @@
.product-form-row,
.product-static-row {
display: grid;
- grid-template-columns: 54px minmax(0, 1fr);
+ grid-template-columns: 68px minmax(0, 1fr);
align-items: center;
- gap: 10px;
+ gap: 16px;
margin-bottom: 18px;
}
.product-form-row.amount {
- grid-template-columns: 54px 134px 24px;
+ grid-template-columns: 68px minmax(0, 1fr);
+ gap: 16px;
+}
+
+.product-form-row.amount .el-form-item__content {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ gap: 8px;
+ min-width: 0;
+ margin-left: 0 !important;
+}
+
+.product-form-row.amount .el-form-item__content > span {
+ flex: 0 0 auto;
+ white-space: nowrap;
}
.product-form-row.amount.hotel-amount {
@@ -1626,6 +1846,11 @@
white-space: nowrap;
}
+.merchant-product-edit-form .el-form-item__label {
+ width: 68px !important;
+ white-space: nowrap;
+}
+
.product-static-row span {
color: #475569;
font-weight: 600;
@@ -1633,15 +1858,16 @@
.product-image-row {
display: grid;
- grid-template-columns: 54px 256px 78px;
- gap: 10px;
- align-items: end;
+ grid-template-columns: 68px 256px 78px;
+ column-gap: 16px;
+ align-items: center;
margin-bottom: 20px;
}
.product-image-row.compact {
- grid-template-columns: 54px minmax(172px, 1fr) 78px;
- align-items: start;
+ grid-template-columns: 68px minmax(172px, 1fr) 78px;
+ column-gap: 16px;
+ align-items: center;
}
.product-image-list {
@@ -1652,7 +1878,21 @@
}
.product-image-row > label {
- align-self: start;
+ align-self: center;
+}
+
+.product-image-row > .el-button {
+ align-self: center;
+ justify-self: start;
+}
+
+.product-image-row .el-form-item__content {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 12px;
+ min-width: 0;
+ margin-left: 0 !important;
}
.product-cover-preview,
@@ -1725,13 +1965,13 @@
.product-detail-row {
display: grid;
- grid-template-columns: 54px minmax(0, 1fr);
- gap: 10px;
+ grid-template-columns: 68px minmax(0, 1fr);
+ gap: 16px;
margin-top: 4px;
}
.product-detail-row label {
- align-self: start;
+ align-self: center;
}
.product-detail-row .el-textarea {
@@ -1750,6 +1990,16 @@
gap: 8px;
}
+.product-notice-field .el-date-editor,
+.product-notice-field .el-time-editor,
+.product-notice-field .el-input {
+ width: 100%;
+}
+
+.product-notice-field .merchant-time-range-picker {
+ width: 100%;
+}
+
.product-rights-list {
display: grid;
gap: 28px;
@@ -1762,57 +2012,79 @@
}
.product-right-main {
- display: flex;
+ /*
+ * 三种权益状态使用同一套列：避免免费、超过次数、打折三行因为
+ * 内容宽度或 margin 不同而把“是否政府补贴”挤到不同的位置。
+ */
+ display: grid;
+ grid-template-columns: 86px 42px 58px 64px 42px 40px 88px 8px 22px 24px 58px 100px 12px 88px 42px;
align-items: center;
min-height: 30px;
}
.product-right-sub {
- display: flex;
+ display: grid;
+ /* 与主行共用列定义，输入框和补贴开关逐列对齐。 */
+ grid-template-columns: 86px 42px 58px 64px 42px 40px 88px 8px 22px 24px 58px 100px 12px 88px 42px;
align-items: center;
min-height: 28px;
- padding-left: 186px;
}
-.product-right-sub > span:first-child {
- width: 64px;
- margin-right: 18px;
+.product-right-main .right-level { grid-column: 1; }
+.product-right-main .right-enabled { grid-column: 2; margin: 0; }
+.product-right-main .right-free-label { grid-column: 4; }
+.product-right-main .right-free-switch { grid-column: 5; margin: 0; }
+.product-right-main.free .right-limit-field { grid-column: 7; margin: 0; }
+.product-right-main.free .right-unit { grid-column: 9; margin: 0; }
+.product-right-main.free .right-reset-label { grid-column: 11; margin: 0; }
+.product-right-main.free .right-reset-select { grid-column: 12; margin: 0; }
+/* 打折行使用一个独立的紧凑控件组，补贴列仍固定在第 14 列。 */
+.product-right-main:not(.free) .right-discount-control {
+ grid-column: 7 / span 6;
+ display: flex;
+ align-items: center;
+ gap: 8px;
}
-.product-right-sub > span:nth-child(3) {
- width: 22px;
- margin-left: 8px;
+.product-right-main:not(.free) .right-discount-label {
+ flex: 0 0 38px;
}
-.product-right-sub > span:nth-child(4) {
- width: 88px;
- margin-left: 10px;
+.product-right-main:not(.free) .right-discount-input {
+ flex: 0 0 100px;
+ width: 100px;
+ margin: 0;
}
+
+.product-right-main:not(.free) .right-unit {
+ flex: 0 0 22px;
+}
+.product-right-main .right-subsidy-label { grid-column: 14; margin: 0 !important; white-space: nowrap; }
+.product-right-main .right-subsidy-switch { grid-column: 15; margin: 0; }
+
+.product-right-sub .right-exceed-label { grid-column: 4 / span 3; }
+.product-right-sub .right-exceed-discount-field { grid-column: 7; }
+.product-right-sub .right-exceed-unit { grid-column: 9; }
+.product-right-sub .right-exceed-subsidy-label { grid-column: 14; white-space: nowrap; }
+.product-right-sub .right-exceed-subsidy-switch { grid-column: 15; }
.product-right-row .right-level {
- flex: 0 0 86px;
color: #111827;
font-size: 12px;
}
.product-right-row .right-enabled {
- flex: 0 0 42px;
- margin-right: 58px;
}
.product-right-row .right-free-label {
- flex: 0 0 64px;
}
.product-right-row .right-free-switch {
- flex: 0 0 42px;
- margin-right: 40px;
}
.product-right-row .right-limit-field {
position: relative;
- flex: 0 0 88px;
- margin-right: 8px;
+ width: 88px;
}
.product-right-row .right-limit-field .el-input-number {
@@ -1820,38 +2092,25 @@
}
.product-right-row .right-unit {
- flex: 0 0 22px;
}
.product-right-row .right-reset-label {
- flex: 0 0 58px;
- margin-left: 24px;
}
.product-right-row .right-reset-select {
- flex: 0 0 96px;
- margin-right: 12px;
+ width: 100px;
}
.product-right-row .right-discount-label {
- flex: 0 0 38px;
}
.product-right-row .right-discount-input {
- flex: 0 0 100px;
- margin-right: 8px;
}
.product-right-row .right-subsidy-label {
- flex: 0 0 88px;
}
.product-right-row .right-subsidy-switch {
- flex: 0 0 42px;
-}
-
-.product-right-main:not(.free) .right-subsidy-label {
- margin-left: 30px;
}
.merchant-product-form-panel .product-right-row .el-input {
@@ -1863,7 +2122,23 @@
}
.merchant-product-form-panel .product-right-sub .right-exceed-discount-input {
- width: 100px;
+ width: 88px;
+}
+
+.product-right-sub .right-exceed-discount-field {
+ position: relative;
+ width: 88px;
+}
+
+.product-right-sub .field-error {
+ position: absolute;
+ top: calc(100% + 4px);
+ left: 0;
+ width: max-content;
+ color: #f56c6c;
+ font-size: 12px;
+ line-height: 16px;
+ white-space: nowrap;
}
.merchant-product-form-panel .product-right-row .right-discount-input {
@@ -1872,6 +2147,12 @@
.merchant-product-form-panel .product-right-row .el-select {
width: 64px;
+}
+
+/* 团单免费次数的重置周期需完整展示“每天/每周/每月/每年”。 */
+.merchant-product-form-panel .product-right-row .right-reset-select {
+ flex-basis: 100px;
+ width: 100px;
}
.product-right-tip {
@@ -1899,8 +2180,47 @@
.merchant-product-form-panel .el-textarea__inner {
min-height: 28px;
border-radius: 0;
- background: #f7f8fb;
+ background: #ffffff;
box-shadow: 0 0 0 1px #d9dee8 inset;
+}
+
+/* Element Plus 会为禁用/只读控件注入灰底；团单编辑页仍需和其他表单控件保持同一白底与边框。 */
+.merchant-product-form-panel .el-input.is-disabled .el-input__wrapper,
+.merchant-product-form-panel .el-input.is-readonly .el-input__wrapper,
+.merchant-product-form-panel .el-input-number.is-disabled .el-input__wrapper,
+.merchant-product-form-panel .el-select.is-disabled .el-select__wrapper,
+.merchant-product-form-panel .el-date-editor.is-disabled .el-input__wrapper,
+.merchant-product-form-panel .el-textarea.is-disabled .el-textarea__inner {
+ background: #ffffff !important;
+ 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,
@@ -1920,15 +2240,39 @@
.coupon-edit-row {
display: grid;
- grid-template-columns: 72px minmax(0, 1fr);
- gap: 14px;
- align-items: center;
+ grid-template-columns: 82px minmax(0, 1fr);
+ gap: 6px;
+ align-items: start;
margin-bottom: 18px;
}
.coupon-edit-row > label {
- line-height: 18px;
+ height: 30px;
+ box-sizing: border-box;
+ padding: 0 0 0 12px;
+ line-height: 30px;
+ justify-content: flex-end;
white-space: nowrap;
+}
+
+.merchant-coupon-edit-form .coupon-edit-row .el-form-item__label {
+ width: 82px !important;
+ max-width: none;
+ height: 30px;
+ box-sizing: border-box;
+ padding: 0 !important;
+ overflow: visible;
+ flex: 0 0 82px;
+ line-height: 30px;
+ white-space: nowrap !important;
+ word-break: keep-all;
+ overflow-wrap: normal;
+}
+
+.coupon-edit-row .el-form-item__content {
+ min-width: 0;
+ min-height: 30px;
+ margin-left: 0 !important;
}
.merchant-coupon-edit-form .el-input {
@@ -1938,21 +2282,30 @@
.coupon-amount-control {
display: flex;
align-items: center;
- gap: 8px;
+ gap: 12px;
}
-.coupon-amount-control .el-input-number {
+.coupon-amount-control .el-input {
width: 200px;
+}
+
+.merchant-coupon-edit-form .coupon-amount-control .el-input__wrapper {
+ min-height: 28px;
+ padding: 1px 11px;
+ background: #ffffff;
+ box-shadow: 0 0 0 1px #d9dee8 inset;
}
.coupon-amount-control > span {
color: #334155;
- line-height: 28px;
+ line-height: 30px;
white-space: nowrap;
}
.merchant-coupon-edit-form .coupon-valid-time-picker {
- width: 300px;
+ flex: 0 1 280px;
+ width: 280px;
+ max-width: 100%;
}
.merchant-coupon-edit-form .el-input__wrapper,
@@ -1963,10 +2316,6 @@
box-shadow: 0 0 0 1px #d9dee8 inset;
}
-.merchant-coupon-edit-form .el-date-editor.el-input__wrapper {
- width: 280px;
-}
-
.merchant-coupon-edit-form .el-date-editor .el-range-input,
.merchant-coupon-edit-form .el-date-editor .el-range-separator {
font-size: 12px;
@@ -1975,8 +2324,10 @@
.coupon-requirement-row .el-radio-group {
display: flex;
align-items: center;
+ flex-wrap: nowrap;
gap: 0;
height: 28px;
+ white-space: nowrap;
}
.coupon-requirement-row .el-radio {
@@ -1992,18 +2343,28 @@
width: 42px;
}
-.coupon-requirement-row .coupon-full-amount {
- width: 108px;
- margin: 0 6px 0 10px;
+.coupon-requirement-row .coupon-full-amount-control {
+ display: flex;
+ width: 168px;
+ margin: 0 50px 0 10px;
+ align-items: center;
+ gap: 8px;
+ white-space: nowrap;
}
-.coupon-requirement-row .coupon-full-unit {
- display: inline-flex;
- flex: 0 0 44px;
- align-items: center;
- margin: 0 50px 0 0;
+.coupon-requirement-row .coupon-full-amount-control .coupon-full-amount {
+ width: 108px;
+}
+
+.coupon-requirement-row .coupon-full-amount-control > span {
+ color: #334155;
+ font-size: 14px;
line-height: 28px;
white-space: nowrap;
+}
+
+.coupon-requirement-row .coupon-full-amount .el-input__wrapper {
+ border-radius: var(--el-border-radius-base);
}
.coupon-requirement-row .coupon-none-radio {
@@ -2076,12 +2437,25 @@
}
.coupon-switch-row {
- grid-template-columns: 72px 44px;
+ /* 内容列要留足宽度：开关本身靠左对齐，不受影响；而"适用范围"这类纯文案不会被挤成两行。 */
+ grid-template-columns: 130px minmax(0, 1fr);
+ gap: 6px;
margin-bottom: 18px;
}
.coupon-switch-row > label {
- white-space: normal;
+ width: 130px;
+ box-sizing: border-box;
+ padding: 0 0 0 20px;
+ line-height: 30px;
+ justify-content: flex-start;
+ white-space: nowrap;
+ word-break: keep-all;
+}
+
+.coupon-switch-row > span {
+ line-height: 30px;
+ white-space: nowrap;
}
.coupon-switch-row .el-switch {
@@ -2202,6 +2576,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,
@@ -2363,6 +2745,11 @@
height: auto;
}
+.health-check-audit-table {
+ width: calc(100% - 14px);
+ margin-left: 14px;
+}
+
.merchant-product-rich-editor {
flex: 1;
width: 100%;
@@ -2505,6 +2892,10 @@
.order-filter-form .el-form-item {
margin-bottom: 0;
+}
+
+.order-filter-form .family-order-filter .el-form-item__label {
+ white-space: nowrap;
}
.order-filter-form .el-input,
@@ -2676,8 +3067,8 @@
.parking-plate-filter-form {
display: grid;
- grid-template-columns: minmax(250px, 1.05fr) minmax(250px, 1.05fr) minmax(240px, 1fr) auto;
- gap: 14px 36px;
+ grid-template-columns: repeat(3, minmax(180px, 360px)) minmax(74px, 1fr);
+ gap: 14px 24px;
align-items: start;
padding-bottom: 18px;
border-bottom: 1px solid #d9dee8;
@@ -2697,6 +3088,7 @@
grid-row: 1 / span 2;
grid-column: 4;
display: grid;
+ justify-content: end;
gap: 10px;
align-content: start;
min-width: 74px;
@@ -3117,6 +3509,11 @@
padding: 18px 22px 20px;
}
+.business-fill-page.role-management-page > .panel {
+ padding-left: 16px;
+ padding-right: 16px;
+}
+
.business-fill-filter-form {
display: grid;
grid-template-columns: minmax(250px, 1.15fr) minmax(240px, 1fr) minmax(220px, 0.9fr) minmax(260px, 1.1fr) auto;
@@ -3128,6 +3525,42 @@
.business-fill-filter-form .el-form-item {
margin-bottom: 0;
+}
+
+/* 角色管理筛选项与标题左边缘对齐。 */
+.role-management-filter-form .el-form-item__label {
+ flex: 0 0 auto;
+ width: auto;
+ 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,
@@ -3250,10 +3683,47 @@
.equity-upload-row {
display: grid;
- grid-template-columns: 42px 180px repeat(2, 72px);
+ /* 最后一列放推荐尺寸提示，跟随上传按钮显示。 */
+ grid-template-columns: 42px 180px repeat(2, 72px) minmax(0, 1fr);
gap: 12px 24px;
align-items: center;
margin: 24px 0 0 18px;
+}
+
+.equity-upload-tip {
+ color: #8a94a6;
+ font-size: 12px;
+ line-height: 18px;
+ /* 图片只有一张时没有"移除"按钮，提示会落到 72px 的按钮列里被挤成"一字一行"，
+ 所以这里固定让它跨满整行、单独一行显示。 */
+ grid-column: 1 / -1;
+}
+
+/* 上传图片处的推荐尺寸提示：各处复用同一套样式，避免每个页面各写一份。 */
+.admin-image-size-tip {
+ color: #8a94a6;
+ font-size: 12px;
+ line-height: 18px;
+ /* 独占一行，别被同一行的 flex/grid 挤成"一字一行"：
+ grid 里跨满所有列，flex 里占满整行（配合下面的 flex-wrap）。 */
+ grid-column: 1 / -1;
+ flex: 0 0 100%;
+ width: 100%;
+ max-width: 100%;
+}
+
+/* 提示所在的弹性容器要允许换行，否则 100% 宽度的提示会把整行撑出容器。 */
+.admin-image-size-form-item .el-form-item__content {
+ flex-wrap: wrap;
+}
+
+/* 不用逐页加类：凡是把提示直接放在 el-form-item 里的地方都自动允许换行。 */
+.el-form-item__content:has(> .admin-image-size-tip) {
+ flex-wrap: wrap;
+}
+
+.merchant-parking-address-actions {
+ flex-wrap: wrap;
}
.equity-upload-row .el-button {
@@ -3372,7 +3842,8 @@
.movie-ticket-record-tools {
display: flex;
- justify-content: space-between;
+ /* 只剩"下载"一个按钮，靠右对齐（原来左边是"补录发放"，该功能已下线）。 */
+ justify-content: flex-end;
padding: 18px 0 16px;
}
@@ -3449,6 +3920,45 @@
padding: 18px 0 16px;
}
+.movie-ticket-code-pool-tools {
+ justify-content: flex-start;
+ gap: 12px;
+}
+
+.movie-ticket-code-pool-filters {
+ container-type: inline-size;
+ container-name: movie-ticket-code-pool;
+ min-width: 0;
+}
+
+.movie-ticket-code-pool-filter-form .el-form-item,
+.movie-ticket-code-pool-filter-form .el-form-item__content {
+ min-width: 0;
+}
+
+@container movie-ticket-code-pool (max-width: 1311px) {
+ .movie-ticket-code-pool-filter-form {
+ grid-template-columns: repeat(2, minmax(0, 1fr)) 80px;
+ }
+
+ .movie-ticket-code-pool-filter-form .movie-ticket-package-filter-actions {
+ grid-column: 3;
+ }
+}
+
+@container movie-ticket-code-pool (max-width: 620px) {
+ .movie-ticket-code-pool-filter-form {
+ grid-template-columns: minmax(0, 1fr);
+ }
+
+ .movie-ticket-code-pool-filter-form .movie-ticket-package-filter-actions {
+ grid-column: 1;
+ grid-row: auto;
+ display: flex;
+ justify-content: flex-end;
+ }
+}
+
.movie-ticket-package-table {
color: #111827;
font-size: 12px;
@@ -3498,7 +4008,7 @@
.movie-ticket-create-row {
display: grid;
- grid-template-columns: 58px minmax(180px, 1fr) 36px 180px 86px;
+ grid-template-columns: 58px 544px 36px 180px 86px;
gap: 12px;
align-items: center;
color: #111827;
@@ -3516,7 +4026,7 @@
.movie-ticket-benefit-row {
display: grid;
- grid-template-columns: 86px 40px 56px 80px 20px 56px 90px;
+ grid-template-columns: 86px 40px 56px 180px 14px 56px 108px;
gap: 12px;
align-items: center;
color: #111827;
@@ -3527,9 +4037,14 @@
font-weight: 700;
}
-.movie-ticket-benefit-row .el-input,
+.movie-ticket-benefit-row .el-input-number,
.movie-ticket-benefit-row .el-select {
width: 100%;
+ min-width: 0;
+}
+
+.movie-ticket-benefit-row > span {
+ white-space: nowrap;
}
.movie-ticket-panel-header {
@@ -3564,6 +4079,62 @@
.movie-ticket-valid-row {
grid-template-columns: 58px 180px 20px 180px 36px 80px;
+}
+
+.movie-ticket-cover-row {
+ display: grid;
+ grid-template-columns: 58px 160px;
+ align-items: start;
+ gap: 12px;
+ margin-top: 18px;
+ color: #111827;
+ font-size: 13px;
+}
+
+.movie-ticket-cover-upload {
+ display: block;
+ width: 160px;
+ height: 90px;
+}
+
+.movie-ticket-cover-upload .el-upload {
+ display: block;
+ width: 160px;
+ height: 90px;
+}
+
+.movie-ticket-cover-preview,
+.movie-ticket-cover-placeholder {
+ display: flex;
+ width: 160px;
+ height: 90px;
+ overflow: hidden;
+ border: 1px dashed #cbd5e1;
+ border-radius: 4px;
+ background: #f8fafc;
+ box-sizing: border-box;
+}
+
+.movie-ticket-cover-preview {
+ border-style: solid;
+ object-fit: cover;
+}
+
+.movie-ticket-cover-placeholder {
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ color: #94a3b8;
+}
+
+.movie-ticket-cover-placeholder > span {
+ font-size: 26px;
+ line-height: 28px;
+}
+
+.movie-ticket-cover-placeholder small {
+ margin-top: 3px;
+ font-size: 12px;
}
.movie-ticket-merchant-row .el-select,
@@ -3653,6 +4224,7 @@
color: #334155;
font-size: 13px;
line-height: 32px;
+ white-space: nowrap;
}
.news-publish-form .el-input {
@@ -3874,22 +4446,44 @@
padding: 16px 0 10px;
}
-.news-cover-preview {
- width: 120px;
- height: 72px;
- margin-left: 12px;
- vertical-align: middle;
- border: 1px solid #d9dee8;
- border-radius: 4px;
+.article-cover-upload .el-upload {
+ display: block;
}
-.policy-cover-preview {
- width: 120px;
- height: 72px;
- margin-left: 12px;
- vertical-align: middle;
- border: 1px solid #d9dee8;
- border-radius: 4px;
+.article-cover-upload-card,
+.article-cover-preview {
+ width: 76px;
+ height: 76px;
+ box-sizing: border-box;
+ border: 1px dashed #d7dce4;
+}
+
+.article-cover-upload-card {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ color: #a8b0bb;
+ background: #ffffff;
+}
+
+.article-cover-upload-card span {
+ height: 30px;
+ font-size: 31px;
+ font-weight: 200;
+ line-height: 26px;
+}
+
+.article-cover-upload-card small {
+ margin-top: 5px;
+ font-size: 12px;
+ line-height: 16px;
+}
+
+.article-cover-preview {
+ display: block;
+ border-style: solid;
+ object-fit: cover;
}
.news-editor-file-input {
@@ -3940,6 +4534,11 @@
font-size: 13px;
font-weight: 700;
line-height: 32px;
+}
+
+.platform-settings-form .platform-mini-program-link .el-form-item__label {
+ font-size: 12px;
+ white-space: nowrap;
}
.platform-settings-form .el-input {
@@ -4102,6 +4701,13 @@
.talent-register-range.el-date-editor {
width: 100%;
+}
+
+/* 管理后台的日期/时间选择控件统一为 320px，保证范围内容完整且各页面一致。 */
+.page-stack .el-date-editor,
+.prototype-page .el-date-editor,
+.merchant-prototype-page .el-date-editor {
+ width: 320px !important;
}
.prototype-table-tools {
@@ -4294,7 +4900,7 @@
gap: 16px 52px;
min-height: 82px;
padding: 18px;
- background: #f2f3f5;
+ background: transparent;
font-size: 13px;
}
@@ -4309,7 +4915,7 @@
gap: 34px;
min-height: 136px;
padding: 8px 24px 18px;
- background: #f2f3f5;
+ background: transparent;
}
.talent-card-stack {
@@ -4340,7 +4946,7 @@
.service-staff-panel {
min-height: 54px;
padding: 14px 18px;
- background: #f2f3f5;
+ background: transparent;
}
.service-staff-panel .el-select {
@@ -4414,9 +5020,6 @@
.merchant-map-results button:hover { background: #ecf5ff; color: #409eff; }
.merchant-location-coordinates { display: flex; justify-content: space-between; color: #606266; font-size: 13px; }
.merchant-location-coordinates span { color: #909399; }
-.merchant-map-marker { background: transparent; border: 0; }
-.merchant-map-marker span { display: block; width: 18px; height: 18px; border: 4px solid #fff; border-radius: 50% 50% 50% 0; background: #409eff; box-shadow: 0 1px 5px rgba(0, 0, 0, .35); transform: rotate(-45deg); }
-.merchant-map-marker span::after { display: block; width: 6px; height: 6px; margin: 6px; border-radius: 50%; background: #fff; content: ''; }
.product-audit-preview-image { display: block; max-width: 100%; max-height: 70vh; margin: 0 auto; object-fit: contain; }
.talent-create-page .detail-block {
@@ -4443,10 +5046,10 @@
.identity-edit-card {
min-height: 92px;
padding: 16px 14px;
- background: #f2f3f5;
+ background: transparent;
}
-.identity-edit-card .el-form {
+.identity-edit-form {
display: grid;
grid-template-columns: repeat(3, minmax(220px, 1fr));
gap: 12px 50px;
@@ -4459,6 +5062,28 @@
.identity-edit-card .el-input,
.identity-edit-card .el-select {
width: 180px;
+}
+
+/* 新增页与详情页采用同样的整行信息面板，避免被表单标签列压缩。 */
+.talent-create-page .create-card-form-item,
+.talent-create-page .service-staff-form-item {
+ margin: 0;
+}
+
+.talent-create-page .create-card-form-item > .el-form-item__content,
+.talent-create-page .service-staff-form-item > .el-form-item__content {
+ display: block;
+ margin-left: 0 !important;
+}
+
+.talent-create-page .create-card-form-item .card-manage-panel,
+.talent-create-page .service-staff-form-item .service-staff-panel {
+ width: 100%;
+ box-sizing: border-box;
+}
+
+.talent-create-page .service-staff-form-item .service-staff-panel {
+ min-height: 54px;
}
.create-card-preview {
@@ -4957,7 +5582,7 @@
grid-template-columns: repeat(2, minmax(0, 1fr));
}
- .identity-edit-card .el-form {
+ .identity-edit-form {
grid-template-columns: repeat(2, minmax(220px, 1fr));
}
@@ -5123,7 +5748,7 @@
width: min(100%, 220px);
}
- .identity-edit-card .el-form {
+ .identity-edit-form {
grid-template-columns: 1fr;
}
}
--
Gitblit v1.7.1