diff --git a/src/common/apis/shop/index.ts b/src/common/apis/shop/index.ts index 2adc436..5a31e4f 100644 --- a/src/common/apis/shop/index.ts +++ b/src/common/apis/shop/index.ts @@ -57,19 +57,20 @@ export function fakeQyLoginApi(params: {corpid: string, userid: string}) { } /** 根据openid获取用户订单信息 */ -export function getOrdersByOpenIdApi(corpid: string, openid: string) { +export function getOrdersByOpenIdApi(corpid: string, openid: string, hasReturn: number) { return request>({ url: `order/user/${openid}`, method: "get", - params: { corpid } + params: { corpid, hasReturn } }) } /** 根据openid获取用户订单信息 */ -export function getOrdersByQyUserIdApi(qyUserId: number) { +export function getOrdersByQyUserIdApi(qyUserId: number, hasReturn: number) { return request>({ url: `order/user/qy/${qyUserId}`, - method: "get" + method: "get", + params: { hasReturn } }) } diff --git a/src/pages/order/components/OrderList.vue b/src/pages/order/components/OrderList.vue index 16c4b8e..684cc6e 100644 --- a/src/pages/order/components/OrderList.vue +++ b/src/pages/order/components/OrderList.vue @@ -1,18 +1,28 @@