diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index 142cdcc..7d56f1d 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -664,7 +664,7 @@ export default { this.$store.state.canUseCoupons = res.data.result.canUseCoupons; this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons; - if (!res.data.result.memberAddress.id) { + if (!res.data.result.memberAddress) { // 获取会员默认地址 this.getUserAddress(); } else { diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 452797b..a22bb10 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -297,6 +297,9 @@ export default { { orderStatus: "CANCELLED", //已取消 }, + { + orderStatus: "STAY_PICKED_UP", //待自提 + }, ], cancelShow: false, //是否显示取消 orderSn: "", //ordersn diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index 055bd0c..d0b6143 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -21,7 +21,7 @@ - 券码: {{ order.verificationCode }} + 券码: {{ order.orderStatus == 'CANCELLED' ? '已失效' : order.verificationCode }} {{ '暂无物流信息' }} diff --git a/utils/filters.js b/utils/filters.js index bb75189..2650ed1 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -499,6 +499,7 @@ export function orderStatusList (val) { COMPLETED: "已完成", COMPLETE: "已完成", TAKE: "待核验", + STAY_PICKED_UP: "待自提", }; return orderStatusList[val]; }