From 97d0f82256630e15a987996dc7b1e334b5f97b71 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sun, 20 Sep 2026 21:16:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/FirstLegOrderCreateHubView.vue | 3 ++- .../first-leg/views/FirstLegOrdersView.test.mjs | 9 +++++++-- .../first-leg/views/FirstLegOrdersView.vue | 15 ++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue b/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue index 90ed0b8..8fc576c 100644 --- a/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue +++ b/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue @@ -23,6 +23,7 @@ function selectMode(mode: 'standard' | 'quick') { diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index 222f461..e076417 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -375,7 +375,7 @@ test('collects the backend-required first-leg fields', () => { assert.match(source, /form\.customsInspection = form\.items\.some\(\(item\) => item\.woodenProduct\) \? true : null/) assert.match(source, /木制品勾选后自动商检<\/small>/) assert.doesNotMatch(source, /label="是否商检"/) - assert.match(source, /第 \{\{ index \+ 1 \}\} 条须商检/) + assert.match(source, /自动商检<\/small>/) }) test('distills order creation into the confirmed prototype sections with server pricing', () => { @@ -441,7 +441,12 @@ test('matches the prototype two-column create layout and reset action', () => { assert.match(editorShellSource, /submit-gradient 5s ease-in-out infinite/) assert.match(editorShellSource, /submit-shine 3\.2s ease-in-out infinite/) assert.match(editorShellSource, /@media \(prefers-reduced-motion: reduce\)/) - assert.doesNotMatch(createHubSource, /

头程下单<\/h1>|填写货物信息，创建新的头程运输订单/) + assert.match(createHubSource, /

头程下单<\/h1>/) + assert.doesNotMatch(createHubSource, /填写货物信息，创建新的头程运输订单/) + assert.match(source, /\.is-create-route \.prototype-order-form \{[^}]*align-items: start/) + assert.doesNotMatch(source, /\.is-create-route \.order-basic-section, \.is-create-route \.destination-section \{ height: 100%; \}/) + assert.match(source, /\.is-create-route \.order-basic-section > \.order-section-heading, \.is-create-route \.destination-section > \.order-section-heading \{[^}]*height: 74px[^}]*min-height: 74px/) + assert.match(source, /\.is-create-route \.order-basic-section > \.order-section-heading h3, \.is-create-route \.destination-section > \.order-section-heading h3 \{[^}]*font-size: 17px[^}]*line-height: 24px/) }) test('shows an optional LX inbound order number for one-click dropship orders', () => { diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index 90868a8..e6b078c 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -2550,14 +2550,14 @@ async function searchOrders(model: QueryModel) { .is-create-route { gap: 0; } .is-create-route .first-leg-editor-page { width: 100%; } .is-create-route .supporting-data-error, .is-create-route > .el-alert { margin-bottom: 14px; } -.is-create-route .prototype-order-form { display: grid; width: 100%; grid-template-columns: repeat(2, minmax(0, 1fr)); align-items: stretch; gap: 16px; margin: 0; padding: 0 0 16px; } -.is-create-route .prototype-section { min-width: 0; margin: 0; padding: 0 24px 24px; border: 1px solid #dfe6ee; border-radius: 8px; background: #fff; } +.is-create-route .prototype-order-form { display: grid; width: 100%; grid-template-columns: repeat(2, minmax(0, 1fr)); align-items: start; gap: 14px; margin: 0; padding: 0 0 14px; } +.is-create-route .prototype-section { min-width: 0; margin: 0; padding: 0 20px 18px; border: 1px solid #dfe6ee; border-radius: 8px; background: #fff; } .is-create-route .prototype-section + .prototype-section { margin-top: 0; } -.is-create-route .order-basic-section, .is-create-route .destination-section { height: 100%; } .is-create-route .cargo-section, .is-create-route .cost-estimate-section { grid-column: 1 / -1; } -.is-create-route .order-section-heading { min-height: 66px; align-items: center; margin: 0 -24px 22px; padding: 15px 24px; border-bottom: 1px solid #e7ecf2; } -.is-create-route .order-section-heading h3, .is-create-route .prototype-section:first-child > .order-section-heading h3 { margin: 0; color: var(--navy); font-size: 17px; font-weight: 700; } -.is-create-route .order-section-heading p { margin-top: 4px; color: #8a98a8; } +.is-create-route .order-basic-section > .order-section-heading, .is-create-route .destination-section > .order-section-heading { box-sizing: border-box; height: 74px; min-height: 74px; align-items: flex-start; margin: 0 -20px 16px; padding: 12px 20px; border-bottom: 1px solid #e7ecf2; } +.is-create-route .order-basic-section > .order-section-heading h3, .is-create-route .destination-section > .order-section-heading h3 { margin: 0; color: var(--navy); font-size: 17px; font-weight: 700; line-height: 24px; } +.is-create-route .cargo-section > .order-section-heading, .is-create-route .cost-estimate-section > .order-section-heading { min-height: 58px; align-items: flex-start; margin: 0 -20px 16px; padding: 12px 20px; border-bottom: 1px solid #e7ecf2; } +.is-create-route .order-section-heading p { margin-top: 2px; color: #8a98a8; } .is-create-route .prototype-form-flow, .is-create-route .destination-form-flow { width: 100%; max-width: none; } .is-create-route .prototype-form-row, .is-create-route .prototype-form-row--wide, .is-create-route .prototype-form-row--compact, .is-create-route .prototype-form-row--short, .is-create-route .prototype-form-row--tabs { grid-template-columns: 120px minmax(0, 1fr); } .is-create-route .prototype-form-row :deep(.el-form-item__label) { display: flex; height: 40px; min-height: 40px; align-items: center; justify-content: flex-end; padding: 0 18px 0 0; font-size: 13px; line-height: 1.35; text-align: right; } @@ -2566,12 +2566,13 @@ async function searchOrders(model: QueryModel) { .is-create-route .compact-transport-grid > :deep(.el-form-item), .is-create-route .compact-transport-grid > :deep(.el-form-item:nth-child(1)), .is-create-route .compact-transport-grid > :deep(.el-form-item:nth-child(6)), .is-create-route .compact-transport-grid > :deep(.el-form-item:nth-child(7)) { grid-template-columns: 120px minmax(0, 1fr); } .is-create-route .compact-transport-grid > :deep(.el-form-item__label) { display: flex; height: 40px; min-height: 40px; align-items: center; justify-content: flex-end; padding: 0 18px 0 0; line-height: 1.35; text-align: right; } .is-create-route .selected-destination { width: auto; margin-left: 138px; } +.is-create-route .shipping-form-flow .prototype-form-row, .is-create-route .destination-form-flow .prototype-form-row, .is-create-route .compact-transport-grid > :deep(.el-form-item) { margin-bottom: 8px; } .is-create-route .cargo-table-heading, .is-create-route .cost-estimate-section .order-section-heading { margin-bottom: 16px; } .order-form { width: min(100%, 1000px); margin: 0; padding: 0 0 12px; } .order-form.is-dialog-order-form { width: 100%; max-width: none; } .is-dialog-order-form > .cargo-section, .is-dialog-order-form > .cost-estimate-section { width: 100%; max-width: none; } .order-form :deep(.el-form-item__error) { position: static; padding-top: 6px; overflow-wrap: anywhere; line-height: 1.45; } -.order-form-section + .order-form-section { margin-top: 30px; padding-top: 28px; border-top: 1px solid #edf0f5; } +.order-form-section + .order-form-section { border-top: 1px solid #edf0f5; } .order-form-section h3 { margin: 0 0 16px; color: var(--navy); font-size: 16px; } .order-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); column-gap: 18px; } .order-form-grid > *, .cargo-form-grid > * { min-width: 0; }