diff --git a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue index f48b61144..829d4a488 100644 --- a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue +++ b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue @@ -203,8 +203,8 @@
买家留言
@@ -227,8 +227,8 @@
订单备注
@@ -351,6 +351,20 @@ function isImageItem(item) { &:nth-child(3n + 3) { padding-left: 20px; } + + // 买家留言 / 订单备注:占满整行,避免按三列宽度提前换行 + &.item-full { + flex: 0 0 100%; + padding-left: 0; + padding-right: 0; + word-break: break-word; + white-space: pre-wrap; + } + } + + .full-text { + width: 100%; + line-height: 1.6; } .value { diff --git a/frontend/uni-app/src/dynamic-pages/api/action-map.js b/frontend/uni-app/src/dynamic-pages/api/action-map.js index 0475899b1..d194c40c4 100644 --- a/frontend/uni-app/src/dynamic-pages/api/action-map.js +++ b/frontend/uni-app/src/dynamic-pages/api/action-map.js @@ -46,14 +46,18 @@ export default { } uni.navigateTo({ url: routes.cashier + '?order_no=' + orderId + '&from_type=order' }); }, - /** 取消订单 */ - cancelOrder(order, params) { + /** 取消订单(详情页通过 context.onCancel 自行调接口并刷新;列表页走事件总线) */ + cancelOrder(order, params, context) { const orderNo = params.order_no || order.order_no || ''; uni.showModal({ title: i18n.t(`提示`), content: i18n.t(`确定取消该订单吗?`), success: (res) => { if (res.confirm) { + if (context && typeof context.onCancel === 'function') { + context.onCancel({ order_no: orderNo }); + return; + } uni.$emit('order:cancel', { order_no: orderNo }); } }, diff --git a/frontend/uni-app/src/dynamic-pages/components/order/create/OrderCustomForm.vue b/frontend/uni-app/src/dynamic-pages/components/order/create/OrderCustomForm.vue index ce5ed3a23..45680df28 100644 --- a/frontend/uni-app/src/dynamic-pages/components/order/create/OrderCustomForm.vue +++ b/frontend/uni-app/src/dynamic-pages/components/order/create/OrderCustomForm.vue @@ -1,6 +1,6 @@