diff --git a/App.vue b/App.vue index 54a4650..c2d0f1c 100644 --- a/App.vue +++ b/App.vue @@ -58,6 +58,10 @@ .pr{ position: relative; } + + .pa{ + position: absolute; + } .fc { text-align: center; diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 2dd4162..6e8b942 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -20,12 +20,18 @@ - + + 立即支付 + + {{ foodSn }} - + 申请售后 + + 退款详情 + diff --git a/pages/index/index.vue b/pages/index/index.vue index 2c508b5..dc166f4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -47,8 +47,7 @@ diff --git a/pages/main/order.vue b/pages/main/order.vue index d0889ff..68e87f2 100644 --- a/pages/main/order.vue +++ b/pages/main/order.vue @@ -71,12 +71,13 @@ orderList_unpaid() { return this.$store.state.orderList.filter(item => item.main_status === '未付款') }, - //已付款 并且没有申请退款的订单 + //已付款 已完成 并且没有申请退款的订单 orderList_paid() { - return this.$store.state.orderList.filter(item => item.main_status === '已付款' && item.refund_status === - '未申请') + return this.$store.state.orderList.filter(item => { + (item.main_status === '已付款' || item.main_status === '已完成') && item.refund_status === '未申请' + }) }, - //申请中 已同意 主动退 等退款的订单 + //申请中 已同意 主动退 拒绝退 等退款相关的订单 orderList_refund() { return this.$store.state.orderList.filter(item => item.refund_status !== '未申请') },