diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index e38fdae..a86dc4f 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -42,9 +42,16 @@ 待核销 - {{ order.isGiftCardSend ? '礼包' :getStatus(order) }} + {{ order.isGiftCardSend || order.isGiftCardReceive ? '礼包' :getStatus(order) }} + + + + + diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 174bdbb..62e6294 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -112,7 +112,7 @@ - + @@ -136,6 +136,19 @@ + + + + + + + 盲盒礼物 + + + 待收货后展示商品信息 + + + diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue index 4d21961..d0d329e 100644 --- a/pkg_user/views/gift/components/GiftCard.vue +++ b/pkg_user/views/gift/components/GiftCard.vue @@ -1,8 +1,11 @@