diff --git a/mall4uni/pages/order-detail/order-detail.css b/mall4uni/pages/order-detail/order-detail.css index df1e919a..b9908486 100644 --- a/mall4uni/pages/order-detail/order-detail.css +++ b/mall4uni/pages/order-detail/order-detail.css @@ -173,6 +173,7 @@ page { display: flex; padding: 10rpx 0; align-items: center; + box-sizing: border-box; } .order-msg .msg-item .item.payment { @@ -190,6 +191,12 @@ page { flex: 1; line-height: 48rpx; } +.order-msg .msg-item .item .item-txt.remarks { + max-width: 600rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .order-msg .msg-item .item .copy-btn { display: block; diff --git a/mall4uni/pages/order-detail/order-detail.vue b/mall4uni/pages/order-detail/order-detail.vue index a5497ddc..16c9d0ad 100644 --- a/mall4uni/pages/order-detail/order-detail.vue +++ b/mall4uni/pages/order-detail/order-detail.vue @@ -65,7 +65,7 @@ --> - + @@ -100,7 +100,7 @@ 订单备注: - {{remarks}} + {{remarks}} @@ -147,7 +147,7 @@ 删除订单 联系客服 - 再次购买 + diff --git a/mall4uni/pages/orderList/orderList.css b/mall4uni/pages/orderList/orderList.css index 2be1596e..7349c57a 100644 --- a/mall4uni/pages/orderList/orderList.css +++ b/mall4uni/pages/orderList/orderList.css @@ -190,7 +190,7 @@ page { } .prod-item .prod-foot { - padding: 20rpx 30rpx; + /* padding: 20rpx 30rpx; */ border-top: 2rpx solid #e6e6e6; } @@ -222,6 +222,8 @@ page { } .button { + margin-top: 20rpx; + margin-bottom: 20rpx; margin-left: 10px; font-size: 26rpx; background: #fff; @@ -229,6 +231,9 @@ page { border-radius: 80rpx; border: 2rpx solid #e1e1e1; } +.button:last-child { + margin-right: 10rpx; +} .button.warn { color: #eb2444; diff --git a/mall4uni/pages/orderList/orderList.vue b/mall4uni/pages/orderList/orderList.vue index 5dbdfd57..47d0305c 100644 --- a/mall4uni/pages/orderList/orderList.vue +++ b/mall4uni/pages/orderList/orderList.vue @@ -79,7 +79,7 @@ 取消订单 - 再次购买 + 付款 查看物流 确认收货