diff --git a/components/orderItem/ShipmentPopup.vue b/components/orderItem/ShipmentPopup.vue new file mode 100644 index 0000000..a6fbef4 --- /dev/null +++ b/components/orderItem/ShipmentPopup.vue @@ -0,0 +1,518 @@ + + + + + diff --git a/components/orderItem/card_order.vue b/components/orderItem/card_order.vue index 61e8361..47b77b0 100644 --- a/components/orderItem/card_order.vue +++ b/components/orderItem/card_order.vue @@ -19,13 +19,16 @@ {{ v.spuName }} + + 已延迟 {{ getSpuDelayInfo(v).text }} + ¥{{ fen2yuan(v.price) }} - - + + {{ formatSkuProperties(item?.properties) }} @@ -35,13 +38,28 @@ - + + + + {{ getDelayRecordSkuText(record) }} + + + {{ getDelayStatusText(record) }} + x{{ getDelayRecordCount(record) }} + + + ¥{{ fen2yuan(item.payPrice) }} - + {{ formatSkuProperties(item?.properties) }} @@ -51,14 +69,47 @@ ¥{{ fen2yuan(item.payPrice || item.price) }} + + + + {{ getDelayRecordSkuText(record) }} + + + {{ getDelayStatusText(record) }} + x{{ getDelayRecordCount(record) }} + + - {{ formatSkuProperties(v.properties) }} + + {{ formatSkuProperties(v.properties) }} + {{ `x${v.count}` }} + + + + {{ getDelayRecordSkuText(record) }} + + + {{ getDelayStatusText(record) }} + x{{ getDelayRecordCount(record) }} + +