From cf73be82709118237ea6552e44fe2eb61ec62c3b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 13 Aug 2023 20:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E3=80=91=201=E3=80=81=E6=8E=A5=E5=85=A5=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/trade/order.js            | 4 ++--
 pages/order_details/index.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/trade/order.js b/api/trade/order.js
index faca6294..dc48a271 100644
--- a/api/trade/order.js
+++ b/api/trade/order.js
@@ -32,8 +32,8 @@ export function getOrderPage(data) {
   return request.get("app-api/trade/order/page", data);
 }
 
-export function takeOrder(id) {
-  return request.put("app-api/trade/order/take?id=" + id, {});
+export function receiveOrder(id) {
+  return request.put("app-api/trade/order/receive?id=" + id, {});
 }
 
 export function cancelOrder(id) {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index ad22a762..f9bbcc42 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -305,6 +305,7 @@
   import { mapGetters } from "vuex";
   import dayjs from '@/plugin/dayjs/dayjs.min.js';
   import * as Util from '@/utils/util.js';
+  import {receiveOrder} from "../../api/trade/order";
   export default {
     components: {
       payment,
@@ -434,7 +435,7 @@
             if (!res.confirm) {
               return
             }
-            OrderApi.takeOrder(this.orderInfo.id).then(res => {
+            OrderApi.receiveOrder(this.orderInfo.id).then(res => {
               return this.$util.Tips({
                 title: '收货成功',
                 icon: 'success'