diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue index b526abb..d3f11e8 100644 --- a/src/views/business/components/master-order-detail.vue +++ b/src/views/business/components/master-order-detail.vue @@ -117,7 +117,7 @@ export default { .route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } } .route-map__progress { color: #409eff !important; } .route-badge { display: inline-flex; width: 32px; height: 32px; align-items: center; justify-content: center; border-radius: 4px; background: #67c23a; color: #fff; font-weight: 600; &.start { background: #409eff; } &.end { background: #e6a23c; } } -.route-map__line { flex: 1 0 64px; min-width: 64px; height: 32px; border-bottom: 2px solid #606266; } +.route-map__line { flex: 1 0 64px; min-width: 64px; height: 32px; border-bottom: 6px solid #e4e7ed; } .execution-detail-heading { padding: 20px 24px 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } } .segment-detail { padding: 16px 24px; border-top: 1px solid #eff1f7; header { display: flex; align-items: center; justify-content: space-between; margin: -16px -24px 8px; padding: 12px 24px; cursor: pointer; background: #fafbfc; h3 { display: flex; min-width: 0; align-items: center; flex-wrap: wrap; gap: 12px; margin: 0; font-size: 16px; } em { color: #409eff; font-style: normal; } } } .segment-detail__progress { color: #606266; font-size: 14px; font-weight: 400; } diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue index 32aec10..f9378ad 100644 --- a/src/views/business/components/master-order-dispatch.vue +++ b/src/views/business/components/master-order-dispatch.vue @@ -627,7 +627,7 @@ export default { .route-overview { display: flex; align-items: flex-start; justify-content: flex-end; padding-top: 8px; overflow-x: auto; } .route-overview__node { display: grid; flex: 0 0 130px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } } .route-badge { display: inline-flex; width: 32px; height: 32px; align-items: center; justify-content: center; border-radius: 4px; background: #67c23a; color: #fff; font-weight: 600; &.start { background: #409eff; } &.end { background: #e6a23c; } } -.route-overview__line { flex: 1 0 56px; min-width: 56px; height: 32px; margin-top: 0; border-bottom: 2px solid #606266; } +.route-overview__line { flex: 1 0 56px; min-width: 56px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; } .segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } } .segment-content { padding: 16px 24px; } .dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } } diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue index 6fa95ca..ae95707 100644 --- a/src/views/business/loading-manage.vue +++ b/src/views/business/loading-manage.vue @@ -2360,7 +2360,7 @@ export default { .loading-detail__value { display: flex; flex-wrap: wrap; gap: 8px; text-align: left; } .loading-detail__steps { display: flex; align-items: flex-start; overflow-x: auto; padding: 8px 4px 16px; } .loading-detail__step { position: relative; min-width: 190px; flex: 1; text-align: center; } - .loading-detail__step:not(:last-child)::after { position: absolute; z-index: 0; top: 16px; left: calc(50% + 25px); width: calc(100% - 50px); height: 2px; content: ''; background: #606266; } + .loading-detail__step:not(:last-child)::after { position: absolute; z-index: 0; top: 16px; left: calc(50% + 25px); width: calc(100% - 50px); height: 6px; content: ''; background: #e4e7ed; } .loading-detail__step-line { display: flex; align-items: center; justify-content: center; } .loading-detail__step-dot { position: relative; z-index: 1; display: inline-flex; width: 34px; height: 34px; align-items: center; justify-content: center; color: #fff; border-radius: 4px; font-weight: 600; } .loading-detail__step-dot.start { background: #409eff; }.loading-detail__step-dot.middle { background: #67c23a; }.loading-detail__step-dot.end { background: #e6a23c; } diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue index f6bd45d..bd2db8f 100644 --- a/src/views/business/master-order.vue +++ b/src/views/business/master-order.vue @@ -76,7 +76,7 @@
{{ node.text }}
- {{ node.name }} + {{ node.name }} {{ line }}
@@ -511,8 +511,8 @@ export default { } } .route-connector { - width: clamp(180px, 20vw, 344px); - flex: 0 0 clamp(180px, 20vw, 344px); + width: clamp(180px, 20vw, 266px); + flex: 0 0 clamp(180px, 20vw, 266px); padding-top: 2px; margin: 0 -6px; small { @@ -525,8 +525,8 @@ export default { line-height: 1.2; } :deep(.el-progress-bar__outer) { - height: 8px !important; - background-color: #f1f2f5; + height: 6px !important; + background-color: #e4e7ed; } :deep(.el-progress-bar__inner) { background-color: #409eff; @@ -538,6 +538,8 @@ export default { header { margin-bottom: 10px; font-weight: 600; + font-size: 14px; + text-align: center; } .el-link { display: flex; diff --git a/src/views/business/voucher-manage.vue b/src/views/business/voucher-manage.vue index abe9894..d37323c 100644 --- a/src/views/business/voucher-manage.vue +++ b/src/views/business/voucher-manage.vue @@ -153,15 +153,16 @@ destroy-on-close :before-close="beforeUploadDialogClose" > - - + + - + 上传上传 - + 选择 - + > + + +