diff --git a/src/pages/work/storage/random-storage-shelf.vue b/src/pages/work/storage/random-storage-shelf.vue index 7ec2745..a907245 100644 --- a/src/pages/work/storage/random-storage-shelf.vue +++ b/src/pages/work/storage/random-storage-shelf.vue @@ -33,21 +33,21 @@ - - {{ selectedStock ? (selectedStock.received_qty || 0) : 0 }} - 已入 + + + {{ selectedStock ? (selectedStock.received_qty || 0) : 0 }} + 已入 + + + {{ selectedStock ? (selectedStock.plan_qty || 0) : 0 }} + 总数 + - - {{ selectedStock ? (selectedStock.plan_qty || 0) : 0 }} - 总数 - - - - + 规格: {{ (selectedStock && selectedStock.spec) || '--' }} - - 条码: - {{ selectedStock ? selectedStock.barcode : '--' }} + + + 条码: + {{ barcodeExpanded ? '收起' : '展开' }} + + + {{ displayBarcodes }} + 已入/总数: @@ -125,7 +134,7 @@ - + - + + + + + {{ confirmDialog.title }} + + {{ confirmDialog.content }} + + + {{ confirmDialog.cancelText }} + + {{ confirmDialog.loading ? '提交中...' : confirmDialog.confirmText }} + + + + + 明细信息 {{ selectedDetail ? selectedDetail.product_name : '--' }} + + + @@ -172,12 +215,12 @@ class="detail-row__input" v-model="detailSpaceKeyword" placeholder="扫码/输入 库位条码" - placeholder-style="color: #c0c4cc; font-size: 28rpx;" + placeholder-style="color: #c0c4cc; font-size: 36rpx;" @confirm="handleDetailSpaceSearch" @click="setActiveScanField('space')" /> - + @@ -197,25 +240,25 @@ 识别结果 - {{ detailSpaceItem.space_code || detailSpaceItem.custom_barcode || detailSpaceItem.id }} - {{ detailSpaceItem.custom_name }} + {{ detailSpaceItem.custom_name }} + {{ detailSpaceItem.space_code || detailSpaceItem.custom_barcode || detailSpaceItem.id }} 条码:{{ detailSpaceItem.custom_barcode }} - - 保存 - 关闭 + + 保存 + - + 容器列表 @@ -258,7 +301,7 @@ - + 入库进度 @@ -295,7 +338,7 @@ - + 设置 @@ -314,22 +357,22 @@ - + 更多操作 - - 取消入库 - - + 入库完成 - + + 取消入库 + + 设置 - + 关闭 @@ -439,6 +482,18 @@ export default { datePickerValue: Number(new Date()), minDate: new Date(2000, 0, 1).getTime(), maxDate: new Date(2099, 11, 31).getTime(), + barcodeExpanded: false, + confirmDialog: { + show: false, + title: '', + content: '', + confirmText: '确定', + cancelText: '取消', + showCancel: true, + danger: false, + loading: false, + confirmHandler: null + }, shelfFormData: { availableQty: 0, spaceCode: '', @@ -459,6 +514,23 @@ export default { const item = this.inboundItems[this.currentItemIndex]; return item?.bindings || []; }, + barcodeList() { + const list = this.selectedStock?.barcodes; + return Array.isArray(list) ? list.filter(Boolean) : []; + }, + showBarcodeToggle() { + return this.barcodeList.length > 2; + }, + displayBarcodes() { + const list = this.barcodeList; + if (list.length === 0) { + return this.selectedStock?.barcode || '--'; + } + if (!this.barcodeExpanded && list.length > 2) { + return list.slice(0, 2).join('、'); + } + return list.join('、'); + }, summaryReceived() { if (this.summaryData) { return this.summaryData.total_direct_inbound ?? this.summaryData.total_pda ?? 0; @@ -553,11 +625,14 @@ export default { }); }, confirmExitTask(onConfirm) { - uni.showModal({ + this.openConfirmDialog({ title: '提示', content: '上架尚未完成,是否退出?', - success: (res) => { - if (!res.confirm) return; + confirmText: '退出', + cancelText: '取消', + danger: true, + onConfirm: () => { + this.closeConfirmDialog(); if (typeof onConfirm === 'function') { onConfirm(); } @@ -1064,10 +1139,13 @@ export default { skuName: String(item.warehouse_item_name || stock.item_name || item.item_name || item.skuName || '--'), barcode: String( (Array.isArray(stock.barcodes) && stock.barcodes.length - ? stock.barcodes.map(b => b.barcode).filter(Boolean).join(' | ') + ? stock.barcodes.map(b => b.barcode).filter(Boolean).join('、') : '') || item.item_code || stock.item_code || '' ), + barcodes: Array.isArray(stock.barcodes) && stock.barcodes.length + ? stock.barcodes.map(b => b?.barcode).filter(Boolean) + : [item.item_code || stock.item_code || ''].filter(Boolean), spec: String(item.warehouse_item_spec || stock.sku_property || item.spec || item.specification || ''), color: String(item.color || stock.color || ''), weight: String(item.weight || stock.weight || ''), @@ -1130,58 +1208,107 @@ export default { this.activeScanField = 'detailScan'; }, handleCancelInbound() { - uni.showModal({ + this.openConfirmDialog({ title: '提示', content: '确定取消当前入库单吗?已入库的数据将保留。', - success: (res) => { - if (res.confirm) { - this.handleClearOrder(); - } + confirmText: '取消入库', + cancelText: '再想想', + danger: true, + onConfirm: () => { + this.closeConfirmDialog(); + this.handleClearOrder(); } }); }, handleInboundDone() { - uni.showModal({ - title: '提示', + this.openConfirmDialog({ + title: '入库完成', content: '入库完成后不可撤销,请确定上架完成?', - success: async (res) => { - if (!res.confirm) return; - uni.showLoading({ title: '提交中...' }); - try { - const result = await this.$http('storage.entry.commit', { entry_order_id: this.entryOrderId }); - uni.hideLoading(); - const isFail = result?.flag === 'failure' || String(result?.code || '') === '500'; - if (isFail) { - uni.showModal({ - title: '提交失败', - content: result?.message || '入库完成提交失败,请稍后重试', - showCancel: false - }); - return; - } - uni.showToast({ title: '入库完成', icon: 'success' }); - this.speakVoice('入库完成'); - uni.setStorageSync('random_storage_need_refresh', Date.now()); - this.handleClearOrder(); - setTimeout(() => uni.navigateBack({ delta: 1 }), 300); - } catch (error) { - uni.hideLoading(); - const msg = String(error?.message || error?.msg || '提交失败'); - uni.showToast({ title: msg, icon: 'none' }); - } + confirmText: '完成', + cancelText: '再想想', + onConfirm: () => { + this.submitInboundDone(); } }); }, + openConfirmDialog(options) { + this.confirmDialog = { + show: true, + title: options?.title || '提示', + content: options?.content || '', + confirmText: options?.confirmText || '确定', + cancelText: options?.cancelText || '取消', + showCancel: options?.showCancel !== false, + danger: !!options?.danger, + loading: false, + confirmHandler: typeof options?.onConfirm === 'function' ? options.onConfirm : null + }; + }, + closeConfirmDialog() { + this.confirmDialog.show = false; + }, + handleConfirmDialog() { + if (this.confirmDialog.loading) return; + const handler = this.confirmDialog.confirmHandler; + if (typeof handler === 'function') { + handler(); + } else { + this.closeConfirmDialog(); + } + }, + async submitInboundDone() { + if (this.confirmDialog.loading) return; + this.confirmDialog.loading = true; + uni.showLoading({ title: '提交中...' }); + try { + const result = await this.$http('storage.entry.commit', { entry_order_id: this.entryOrderId }); + uni.hideLoading(); + this.confirmDialog.loading = false; + const isFail = result?.flag === 'failure' || String(result?.code || '') === '500'; + if (isFail) { + this.closeConfirmDialog(); + this.openConfirmDialog({ + title: '提交失败', + content: result?.message || '入库完成提交失败,请稍后重试', + confirmText: '确定', + showCancel: false + }); + return; + } + this.closeConfirmDialog(); + uni.showToast({ title: '入库完成', icon: 'success' }); + this.speakVoice('入库完成'); + uni.setStorageSync('random_storage_need_refresh', Date.now()); + this.handleClearOrder(); + setTimeout(() => uni.navigateBack({ delta: 1 }), 300); + } catch (error) { + uni.hideLoading(); + this.confirmDialog.loading = false; + this.closeConfirmDialog(); + const msg = String(error?.message || error?.msg || '提交失败'); + this.openConfirmDialog({ + title: '提交失败', + content: msg, + confirmText: '确定', + showCancel: false + }); + } + }, + toggleBarcodeExpand() { + this.barcodeExpanded = !this.barcodeExpanded; + }, selectInboundItem(index) { this.currentItemIndex = index; const items = this.inboundItems || []; const item = items[index]; if (!item) return; + this.barcodeExpanded = false; this.selectedStock = { stock_id: Number(item.stockId || 0), item_name: item.skuName || '--', item_code: item.skuCode || '', barcode: item.barcode || '', + barcodes: Array.isArray(item.barcodes) ? item.barcodes : [], spec: item.spec || '', color: item.color || '', weight: item.weight || '', @@ -1324,11 +1451,10 @@ export default { .content-split { flex: 1; - padding: 24rpx; + padding: 0 24rpx 24rpx; box-sizing: border-box; display: flex; flex-direction: column; - gap: 16rpx; min-height: 0; } @@ -1336,6 +1462,8 @@ export default { flex: 1; min-height: 0; box-sizing: border-box; + margin-top: 16rpx; + margin-bottom: 16rpx; } .content-bottom { @@ -1372,23 +1500,29 @@ export default { .action-drawer { padding: 20rpx 24rpx calc(24rpx + env(safe-area-inset-bottom)); background: #f8f9fa; + border-top-left-radius: 20px; + border-top-right-radius: 20px; + overflow: hidden; } .action-drawer__header { - padding: 8rpx 0 18rpx; + padding: 8rpx 0 32rpx; text-align: center; } .action-drawer__title { - font-size: 30rpx; - font-weight: 600; + font-size: 40rpx; + font-weight: bold; color: #303133; } .action-drawer__body { display: flex; flex-direction: column; - gap: 12rpx; +} + +.action-drawer__item + .action-drawer__item { + margin-top: 20rpx; } .action-drawer__item { @@ -1408,14 +1542,47 @@ export default { opacity: 0.45; } +.action-drawer__item--neutral { + background: #f5f7fa; + border: 1rpx solid #dcdfe6; +} + +.action-drawer__item--neutral .action-drawer__item-text { + color: #606266; +} + +.action-drawer__item--close { + background: #e4e7ed; + border: 1rpx solid #dcdfe6; +} + +.action-drawer__item--close .action-drawer__item-text { + color: #606266; +} + +.action-drawer__item--primary-outline { + background: #eaf2ff; + border: 1rpx solid #b8d4ff; +} + +.action-drawer__item--danger-outline { + background: #fef0f0; + border: 1rpx solid #fbc4c4; +} + .action-drawer__item-text { - font-size: 30rpx; + font-size: 38rpx; color: #303133; } .action-drawer__item-text--primary { color: #2979ff; - font-weight: 600; + font-weight: bold; +} + +.action-drawer__item-text--danger { + color: #f56c6c; + font-weight: bold; } .nav-cancel-btn { @@ -1504,26 +1671,50 @@ export default { } .summary-bar { - padding: 14rpx 24rpx; + margin-left: -24rpx; + margin-right: -24rpx; + padding: 8rpx 24rpx 16rpx; background: #ffffff; - border-radius: 12rpx; - border: 1rpx solid #ebeef5; + border-radius: 0 0 12rpx 12rpx; + border-bottom: 1rpx solid #ebeef5; + display: flex; + flex-direction: column; +} + +.summary-bar__search { + margin-top: 24rpx; +} + +.summary-bar__items { + display: flex; + align-items: stretch; +} + +.summary-bar__search { display: flex; align-items: center; - justify-content: space-around; } .summary-bar__item { + flex: 1; display: flex; flex-direction: column; align-items: center; - gap: 4rpx; + justify-content: center; + background: #f5f7fa; + border-radius: 12rpx; + padding: 12rpx 8rpx; +} + +.summary-bar__item + .summary-bar__item { + margin-left: 8rpx; } .summary-bar__item-num { font-size: 36rpx; - font-weight: 600; + font-weight: bold; line-height: 1.2; + margin-bottom: 6rpx; } .summary-bar__item-num--received { @@ -1539,23 +1730,12 @@ export default { color: #909399; } -.detail-scan-panel { - background: #ffffff; - padding: 12rpx 24rpx 16rpx; - border-bottom: 1rpx solid #f2f3f5; -} - -.detail-scan-panel__row { - display: flex; - align-items: center; - gap: 10rpx; -} /* ===== 详情抽屉 ===== */ .detail-drawer { width: 100%; background: #ffffff; - border-radius: 24rpx 24rpx 0 0; + border-radius: 20px 20px 0 0; display: flex; flex-direction: column; overflow: hidden; @@ -1567,25 +1747,35 @@ export default { align-items: center; padding: 30rpx 32rpx 20rpx; border-bottom: 1rpx solid #f2f3f5; - gap: 12rpx; } .detail-drawer__title { - font-size: 36rpx; - font-weight: 600; + font-size: 38rpx; + font-weight: bold; color: #303133; flex-shrink: 0; } .detail-drawer__product-name { - font-size: 34rpx; + font-size: 36rpx; color: #303133; flex: 1; + margin-left: 12rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.detail-drawer__close { + flex-shrink: 0; + margin-left: 12rpx; + width: 56rpx; + height: 56rpx; + display: flex; + align-items: center; + justify-content: center; +} + .detail-drawer__body { padding: 24rpx 32rpx; display: flex; @@ -1602,26 +1792,27 @@ export default { } .detail-row__label { - font-size: 30rpx; + font-size: 36rpx; color: #909399; - width: 140rpx; + width: 160rpx; flex-shrink: 0; + white-space: nowrap; } .detail-row__value { - font-size: 30rpx; + font-size: 36rpx; color: #303133; flex: 1; } .detail-row__value--highlight { color: #f56c6c; - font-weight: 600; + font-weight: bold; } .detail-row__value--primary { color: #2979ff; - font-weight: 600; + font-weight: bold; } .detail-row--space { @@ -1634,15 +1825,15 @@ export default { background: #f5f7fa; border-radius: 8rpx; padding: 0 20rpx; - font-size: 28rpx; + font-size: 36rpx; color: #303133; box-sizing: border-box; } .detail-row__scan-btn { flex-shrink: 0; - width: 56rpx; - height: 56rpx; + width: 72rpx; + height: 72rpx; display: flex; align-items: center; justify-content: center; @@ -1683,7 +1874,7 @@ export default { .detail-space-item__code { font-size: 28rpx; color: #303133; - font-weight: 600; + font-weight: bold; flex-shrink: 0; } @@ -1710,7 +1901,7 @@ export default { } .detail-space-result__label { - font-size: 24rpx; + font-size: 30rpx; color: #909399; margin-bottom: 8rpx; display: block; @@ -1727,18 +1918,18 @@ export default { } .detail-space-result__code { - font-size: 30rpx; - font-weight: 600; + font-size: 36rpx; + font-weight: bold; color: #2979ff; } .detail-space-result__name { - font-size: 26rpx; + font-size: 36rpx; color: #303133; } .detail-space-result__barcode { - font-size: 24rpx; + font-size: 36rpx; color: #909399; } @@ -1752,6 +1943,10 @@ export default { border-radius: 12rpx; } +.detail-btn-cancel + .detail-btn-save { + margin-left: 20rpx; +} + .detail-btn-save { background: #2979ff; } @@ -1761,9 +1956,9 @@ export default { } .detail-btn-save__text { - font-size: 34rpx; + font-size: 36rpx; color: #ffffff; - font-weight: 600; + font-weight: bold; } .detail-btn-cancel { @@ -1776,29 +1971,32 @@ export default { } .detail-btn-cancel__text { - font-size: 34rpx; + font-size: 36rpx; color: #606266; } /* ===== 容器列表抽屉 ===== */ .container-drawer { - padding: 30rpx 24rpx calc(20rpx + env(safe-area-inset-bottom)); + padding: 20rpx 24rpx calc(24rpx + env(safe-area-inset-bottom)); background: #f8f9fa; + border-top-left-radius: 20px; + border-top-right-radius: 20px; + overflow: hidden; } .container-drawer__header { text-align: center; - margin-bottom: 20rpx; + padding: 8rpx 0 40rpx; } .container-drawer__title { - font-size: 32rpx; - font-weight: 600; + font-size: 40rpx; + font-weight: bold; color: #303133; } .container-drawer__sub { - font-size: 24rpx; + font-size: 34rpx; color: #909399; margin-top: 4rpx; display: block; @@ -1812,12 +2010,12 @@ export default { .container-drawer__empty { text-align: center; padding: 60rpx 0; - font-size: 28rpx; + font-size: 34rpx; color: #909399; } .container-drawer__footer { - margin-top: 10rpx; + margin-top: 20rpx; } .container-drawer__close-btn { @@ -1826,7 +2024,7 @@ export default { align-items: center; justify-content: center; border-radius: 12rpx; - background: #dcdfe6; + background: #e4e7ed; } .container-drawer__close-btn:active { @@ -1834,7 +2032,7 @@ export default { } .container-drawer__close-text { - font-size: 34rpx; + font-size: 38rpx; color: #606266; } @@ -1855,7 +2053,7 @@ export default { display: flex; align-items: center; gap: 8rpx; - font-size: 26rpx; + font-size: 36rpx; line-height: 1.6; } @@ -1871,23 +2069,26 @@ export default { /* ===== 设置抽屉 ===== */ .settings-drawer { - padding: 30rpx 24rpx calc(20rpx + env(safe-area-inset-bottom)); + padding: 20rpx 24rpx calc(24rpx + env(safe-area-inset-bottom)); background: #f8f9fa; + border-top-left-radius: 20px; + border-top-right-radius: 20px; + overflow: hidden; } .settings-drawer__header { text-align: center; - margin-bottom: 24rpx; + padding: 8rpx 0 40rpx; } .settings-drawer__title { - font-size: 32rpx; - font-weight: 600; + font-size: 40rpx; + font-weight: bold; color: #303133; } .settings-drawer__body { - margin-bottom: 20rpx; + margin-bottom: 32rpx; } .settings-drawer__row { @@ -1900,7 +2101,7 @@ export default { } .settings-drawer__label { - font-size: 30rpx; + font-size: 38rpx; color: #303133; } @@ -1914,7 +2115,7 @@ export default { align-items: center; justify-content: center; border-radius: 12rpx; - background: #dcdfe6; + background: #e4e7ed; } .settings-drawer__close-btn:active { @@ -1922,7 +2123,7 @@ export default { } .settings-drawer__close-text { - font-size: 34rpx; + font-size: 38rpx; color: #606266; } @@ -1986,17 +2187,21 @@ export default { .product-info { flex: 1; + min-height: 0; display: flex; flex-direction: column; justify-content: flex-start; gap: 14rpx; + overflow-y: auto; + -webkit-overflow-scrolling: touch; } .product-name { font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; margin-bottom: 4rpx; + word-break: break-all; } .product-info-row { @@ -2005,7 +2210,6 @@ export default { gap: 6rpx; } -.product-info-label, .order-info-label, .shelf-form-label { font-size: 30rpx; @@ -2013,11 +2217,26 @@ export default { flex-shrink: 0; } -.product-info-value, +.product-info-label { + font-size: 36rpx; + color: #303133; + flex-shrink: 0; +} + .order-info-value { - font-size: 30rpx; + font-size: 34rpx; color: #303133; flex: 1; + min-width: 0; + word-break: break-all; +} + +.product-info-value { + font-size: 36rpx; + color: #303133; + flex: 1; + min-width: 0; + word-break: break-all; } .product-info-row-qty { @@ -2026,8 +2245,45 @@ export default { .product-info-value-qty { color: #f56c6c; - font-weight: 600; - font-size: 32rpx; + font-weight: bold; + font-size: 38rpx; +} + +.product-barcode-wrap { + flex: 1; + min-width: 0; + display: flex; + align-items: flex-start; + gap: 8rpx; +} + +.product-barcode-text { + flex: 1; + min-width: 0; +} + +.product-barcode-toggle { + flex-shrink: 0; + font-size: 36rpx; + color: #2979ff; +} + +.product-barcode-label-row { + display: flex; + align-items: center; + gap: 8rpx; + flex-shrink: 0; +} + +.product-info-row--stack { + flex-direction: column; + align-items: flex-start; + gap: 8rpx; +} + +.product-info-row--stack .product-barcode-wrap { + flex: none; + width: 100%; } .order-info-area { @@ -2046,7 +2302,6 @@ export default { .order-info-col { display: flex; flex-direction: column; - overflow: hidden; } .order-info-col--left, @@ -2089,7 +2344,7 @@ export default { } .shelf-btn__text { - font-size: 30rpx; + font-size: 34rpx; color: #2979ff; line-height: 1.4; } @@ -2102,17 +2357,15 @@ export default { .index-grid { display: flex; flex-wrap: wrap; - gap: 8rpx; - height: 100%; - overflow-y: auto; - overflow-x: hidden; - align-content: flex-start; } .index-cell { flex: 0 0 calc((100% - 32rpx) / 5); width: calc((100% - 32rpx) / 5); + height: 130rpx; aspect-ratio: 1/1; + margin-right: 8rpx; + margin-bottom: 8rpx; box-sizing: border-box; border-radius: 12rpx; background: #f5f7fa; @@ -2123,6 +2376,10 @@ export default { justify-content: center; } +.index-cell:nth-child(5n) { + margin-right: 0; +} + .index-cell:active { opacity: 0.7; } @@ -2139,13 +2396,13 @@ export default { .index-text { font-size: 34rpx; - font-weight: 600; + font-weight: bold; color: #2979ff; line-height: 1.3; } .index-sub { - font-size: 22rpx; + font-size: 28rpx; color: #909399; line-height: 1.3; margin-top: 2rpx; @@ -2300,4 +2557,74 @@ export default { color: #ffffff; font-weight: 600; } + +/* ===== 通用确认弹窗(参考完成盘点弹窗) ===== */ +.confirm-dialog { + width: 640rpx; + padding: 40rpx 32rpx 32rpx; + background: #ffffff; + border-radius: 20rpx; + box-sizing: border-box; +} + +.confirm-dialog__title { + font-size: 42rpx; + font-weight: bold; + color: #303133; + text-align: center; + margin-bottom: 32rpx; +} + +.confirm-dialog__body { + margin-bottom: 36rpx; + padding: 24rpx; + background: #f5f7fa; + border-radius: 12rpx; +} + +.confirm-dialog__text { + font-size: 36rpx; + color: #303133; + line-height: 1.6; +} + +.confirm-dialog__actions { + display: flex; + align-items: center; +} + +.confirm-dialog__btn { + flex: 1; + height: 88rpx; + border-radius: 12rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 36rpx; + font-weight: 500; +} + +.confirm-dialog__btn + .confirm-dialog__btn { + margin-left: 20rpx; +} + +.confirm-dialog__btn--cancel { + background: #f5f7fa; + color: #606266; + border: 1rpx solid #dcdfe6; +} + +.confirm-dialog__btn--confirm { + background: #2979ff; + color: #ffffff; +} + +.confirm-dialog__btn--danger { + background: #f56c6c; +} + +.confirm-dialog__btn--disabled { + opacity: 0.6; + pointer-events: none; +} diff --git a/src/pages/work/storage/random-storage.vue b/src/pages/work/storage/random-storage.vue index dc44b5d..b273ee1 100644 --- a/src/pages/work/storage/random-storage.vue +++ b/src/pages/work/storage/random-storage.vue @@ -8,7 +8,7 @@ - - 默认仅显示待审核入库单(PENDING) - - - - - 共 {{ totalItems }} 单 - 第 {{ currentPage }} / {{ totalPages || 1 }} 页 - 当前关键词:{{ searchKeyword }} @@ -407,39 +398,11 @@ export default { gap: 10rpx; } -.search-hint { - margin-top: 12rpx; -} - -.search-hint__text { - font-size: 24rpx; - color: #909399; -} - -.summary-bar { - padding: 16rpx 24rpx 12rpx; - display: flex; - align-items: center; - gap: 16rpx; - font-size: 24rpx; - color: #606266; -} - -.summary-bar__page { - color: #2979ff; -} - -.summary-bar__keyword { - color: #2979ff; - flex: 1; - min-width: 0; -} - .list-content { flex: 1; height: 0; min-height: 0; - padding: 0 24rpx; + padding: 20rpx 24rpx 0; box-sizing: border-box; } @@ -468,10 +431,13 @@ export default { .entry-items { display: flex; flex-direction: column; - gap: 20rpx; padding-bottom: 24rpx; } +.entry-items .entry-card + .entry-card { + margin-top: 20rpx; +} + .entry-card { background: #ffffff; border-radius: 18rpx; @@ -487,51 +453,60 @@ export default { display: flex; align-items: center; justify-content: space-between; - gap: 12rpx; + + ::v-deep .u-tag__text { + font-size: 36rpx; + line-height: 36rpx; + } } .entry-card__code { - font-size: 32rpx; - font-weight: 600; + font-size: 38rpx; + font-weight: bold; color: #303133; flex: 1; min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + word-break: break-all; } .entry-card__body { margin-top: 18rpx; display: flex; flex-direction: column; - gap: 12rpx; +} + +.entry-card__body .entry-card__row + .entry-card__row { + margin-top: 12rpx; } .entry-card__meta { margin-top: 10rpx; display: flex; align-items: center; - gap: 20rpx; } .entry-card__meta-text { - font-size: 24rpx; + font-size: 34rpx; color: #909399; } +.entry-card__meta-text + .entry-card__meta-text { + margin-left: 20rpx; +} + .entry-card__row { display: flex; align-items: flex-start; - gap: 12rpx; - font-size: 26rpx; + font-size: 36rpx; line-height: 1.5; } .entry-card__label { - width: 120rpx; + width: 160rpx; flex-shrink: 0; + white-space: nowrap; color: #909399; + margin-right: 12rpx; } .entry-card__value { @@ -545,17 +520,27 @@ export default { margin-top: 18rpx; display: flex; flex-direction: column; - gap: 12rpx; } .entry-card__badges { display: flex; flex-wrap: wrap; - gap: 10rpx; + margin-bottom: -10rpx; + + ::v-deep .u-tag__text { + font-size: 34rpx; + line-height: 34rpx; + } + + ::v-deep .u-transition { + margin-right: 10rpx; + margin-bottom: 10rpx; + } } .entry-card__time { - font-size: 24rpx; + margin-top: 12rpx; + font-size: 34rpx; color: #909399; }