diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index b7dd6ec..f34fd19 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -17,10 +17,10 @@ {{ order.storeName }} - - + @@ -33,8 +33,8 @@ - + @@ -94,8 +94,8 @@ - {{ item.reason }} + @@ -208,7 +208,7 @@ cancelShow: false, //是否显示取消 orderSn: "", //ordersn reason: "", //取消原因 - cancelList: "", //取消列表 + cancelList: [], //取消列表 rogShow: false, //显示是否收货 }; }, @@ -285,7 +285,7 @@ renderOrderTag(orderPromotionType) { switch (orderPromotionType) { case "NORMAL": - return "普通订单"; + return ""; case "PINTUAN": return "拼团订单"; break; @@ -320,6 +320,14 @@ return ""; } }, + getOrderItemImage(goods, order, index) { + let image = goods.image; + if (!image && order.groupImages) { + const images = String(order.groupImages).split(","); + image = images[index] || images[0]; + } + return this.parseGoodsImageUrl(image); + }, /** * 取消订单 */ @@ -587,6 +595,7 @@ .list-scroll-content { height: 100%; + padding: 16rpx 20rpx 0; } .navbar { @@ -632,18 +641,18 @@ .seller-view { border-radius: 20rpx; background-color: #fff; - margin: 20rpx 0rpx; + margin: 16rpx 0; .seller-info { - height: 70rpx; - padding: 0 20rpx; + padding: 24rpx 20rpx 16rpx; + align-items: center; .seller-name { flex: 10; font-size: 28rpx; font-weight: 600; display: flex; - flex-direction: row; + flex-direction: row; text-align: center; .name { margin-left: 15rpx; diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index 77401cd..edbb013 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -148,9 +148,9 @@ 订单编号: - - {{ order.sn }} - + + {{ order.sn }} + @@ -229,8 +229,8 @@ - {{ item.reason }} + @@ -701,11 +701,20 @@ page, flex:10; } + .order-sn-value { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + } + + .order-sn-text { + word-break: break-all; + } + .copy { - font-size: 20rpx; - color: #333; - border: 1px solid #dddddd; - margin-left: 30rpx; + margin-left: 16rpx; + flex-shrink: 0; } }