diff --git a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue index 861e79c..c60d54c 100644 --- a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue +++ b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue @@ -15,7 +15,7 @@ $u.timeFormat(orderItem.arrival_time, "mm-dd hh:MM") }}前送达 - - - 取消订单 + + 自行发货 + + 订单完成 + + + 取消订单 + 部分退款 @@ -471,6 +477,8 @@ import { GetExpediteSFOrder, GetInitiativeOrderRefund, GetOrderPicking, + SelDelivery, + SelFinishDelivery } from "@/api/order"; import { makePhoneCall } from "@/utils/callPhone"; @@ -666,6 +674,26 @@ export default { this.orderItemIndex ); }, + async handerSynOrder(){ + let params = { + order_id: this.orderItem.order_id, + }; + let res=await SelDelivery(params); + if(res&&res.status==200){ + uni.$u.toast("处理完成"); + this.$emit('refreshOrderList'); + } + }, + async handerFinishOrder(){ + let params = { + order_id: this.orderItem.order_id, + }; + let res=await SelFinishDelivery(params); + if(res&&res.status==200){ + uni.$u.toast("处理完成"); + this.$emit('refreshOrderList'); + } + }, makePhone(phone) { console.log(makePhoneCall); diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue index 4a4cba6..43b9a39 100644 --- a/java-mall-app-shop-admin/pages/order/order.vue +++ b/java-mall-app-shop-admin/pages/order/order.vue @@ -188,6 +188,7 @@ :isErrorOrder="true" @cancelOrder="handerCancelOrder" @showRefundOrderInfo="handerShowRefundOrderInfo" + @refreshOrderList="handleRefresh" >