diff --git a/application/admin/view/shopro/split/order/index.html b/application/admin/view/shopro/split/order/index.html index 5b9fdd4..59b7006 100644 --- a/application/admin/view/shopro/split/order/index.html +++ b/application/admin/view/shopro/split/order/index.html @@ -26,24 +26,70 @@ gap: 10px; align-items: center; } - .cell-main { + .cell-plain { font-size: 13px; color: #303133; line-height: 1.5; - word-break: keep-all; white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; } - .cell-sub { + .cell-sub-plain { font-size: 12px; color: #909399; line-height: 1.5; margin-top: 4px; - word-break: keep-all; white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + } + /* 默认截断;悬浮后横向滚动查看完整内容 */ + .scroll-cell { + max-width: 100%; + overflow-x: hidden; + overflow-y: hidden; + cursor: default; + -webkit-overflow-scrolling: touch; + scrollbar-width: thin; + } + .scroll-cell:hover { + overflow-x: auto; + cursor: ew-resize; + } + .scroll-cell::-webkit-scrollbar { + height: 4px; + } + .scroll-cell::-webkit-scrollbar-thumb { + background: rgba(116, 56, 213, 0.35); + border-radius: 2px; + } + .scroll-cell-inner { + display: inline-block; + white-space: nowrap; + min-width: min-content; + } + .scroll-hint { + display: none; + font-size: 10px; + color: #c0c4cc; + margin-top: 2px; + white-space: nowrap; + } + .scroll-cell:hover + .scroll-hint, + .scroll-cell-wrap:hover .scroll-hint { + display: block; + } + .scroll-cell-wrap { + max-width: 100%; + } + .amount-cell { + text-align: right; + white-space: nowrap; + } + .amount-cell .money-line { + font-size: 13px; + color: #303133; + line-height: 1.6; + } + .amount-cell .money-line.split-line { + font-size: 12px; + color: #909399; } .mono-text { font-family: Consolas, Monaco, "Courier New", monospace; @@ -82,11 +128,16 @@ .recv-row { display: flex; align-items: center; - flex-wrap: wrap; + flex-wrap: nowrap; gap: 6px; font-size: 12px; line-height: 1.5; } + .recv-scroll { + flex: 1; + min-width: 0; + max-width: calc(100% - 120px); + } .recv-role { display: inline-block; padding: 0 6px; @@ -111,11 +162,7 @@ font-size: 12px; color: #f56c6c; line-height: 1.5; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; - word-break: break-all; + white-space: nowrap; } .op-hint { font-size: 12px; @@ -158,24 +205,37 @@ - + - - - - + + + + @@ -183,13 +243,17 @@
{{ r.role_label }} - {{ r.display_name }} - +
+
+ {{ r.display_name }} + +
+
¥{{ formatMoney(r.amount) }}
按当前规则预估(历史失败单未落库明细)
- — + —
@@ -197,10 +261,14 @@ {{ s.row.status_text }} - + @@ -224,7 +292,7 @@

- 「重试分账」仅对失败记录有效,会向通道重新发起分账;「同步状态」只拉取最新结果并更新本页,不会重复扣款。 + 订单号、分账单号等长字段鼠标悬浮后可左右滑动查看完整内容;「重试分账」仅对失败记录有效;「同步状态」只拉取通道结果,不会重复扣款。

diff --git a/public/assets/js/backend/shopro/split/order.js b/public/assets/js/backend/shopro/split/order.js index d3c853e..2a7355b 100644 --- a/public/assets/js/backend/shopro/split/order.js +++ b/public/assets/js/backend/shopro/split/order.js @@ -70,6 +70,16 @@ define(['jquery', 'bootstrap', 'backend', 'form'], function ($, undefined, Backe var n = parseFloat(v); return isNaN(n) ? '0.00' : n.toFixed(2); }, + scrollCellWheel(e) { + var el = e.currentTarget; + if (!el || el.scrollWidth <= el.clientWidth) { + return; + } + if (Math.abs(e.deltaY) >= Math.abs(e.deltaX)) { + e.preventDefault(); + el.scrollLeft += e.deltaY; + } + }, openOrder(orderId) { if (!orderId) return; Fast.api.open('shopro/order/order/detail?id=' + orderId, '订单详情');