diff --git a/admin_website/src/views/Orders.vue b/admin_website/src/views/Orders.vue index 831d61f..337e065 100644 --- a/admin_website/src/views/Orders.vue +++ b/admin_website/src/views/Orders.vue @@ -37,33 +37,33 @@ - + - + - + @@ -73,7 +73,7 @@ size="small" type="primary" @click="handleUpdateStatus(scope.row)" - :disabled="scope.row.paymentStatus === 'cancelled'" + :disabled="scope.row.payment_status === 'cancelled'" > 状态 @@ -96,37 +96,37 @@ - {{ currentOrder.orderNo }} + {{ currentOrder.order_number }} {{ currentOrder.username }} {{ currentOrder.phone }} - ¥{{ currentOrder.amount }} + ¥{{ currentOrder.total_amount }} - 待支付 - 已支付 - 已取消 - {{ currentOrder.paymentStatus }} + 待支付 + 已支付 + 已取消 + {{ currentOrder.payment_status }} - 待发货 - 已发货 - 已完成 - {{ currentOrder.shippingStatus }} + 待发货 + 已发货 + 已完成 + {{ currentOrder.shipping_status }} - {{ currentOrder.shippingAddress }} - {{ formatDate(currentOrder.createTime) }} + {{ currentOrder.shipping_address }} + {{ formatDate(currentOrder.created_at) }} - + - + @@ -142,14 +142,14 @@ - + - + @@ -169,7 +169,8 @@