From 53d5d460dc5a8cb67fcdb22e5f3ed889fc675ae6 Mon Sep 17 00:00:00 2001 From: Wzp-2008 Date: Sat, 22 Apr 2023 23:39:39 +0800 Subject: [PATCH] feat: adding flag function --- src/api/order/index.ts | 50 +++++- src/api/order/types/order.ts | 18 +- src/views/order/create/index.vue | 76 ++++++--- src/views/order/manager/index.vue | 266 +++++++++++++++++++++++++++--- 4 files changed, 358 insertions(+), 52 deletions(-) diff --git a/src/api/order/index.ts b/src/api/order/index.ts index f2d6bac..f21d31a 100644 --- a/src/api/order/index.ts +++ b/src/api/order/index.ts @@ -1,4 +1,11 @@ -import { IAddOrderResponse, IOrder } from "@/api/order/types/order" +import { + IAddFlagResponse, + IAddOrderResponse, + IChangeOrderResponse, + IGetOrderUserInfoResponseData, + IOrder, + IRemoveOrderResponse +} from "@/api/order/types/order" import { request } from "@/utils/service" import * as AxiosType from "axios" import { IPageResponseData, IResponseData } from "@/api/types/requests" @@ -22,3 +29,44 @@ export function getAllOrderApi(pageNum: number) { withCredentials: true }) } + +export function getOrderUserInfoApi(content: string) { + return request>>({ + url: "/order/getOrderUserInfo", + method: "GET", + params: { + content: content + }, + withCredentials: true + }) +} +export function addFlagApi(order: IOrder) { + return request>>({ + url: "/order/addOrderFlag", + method: "GET", + params: { + orderId: order.id, + flagId: order.flag, + flagRemark: order.flagRemark + }, + withCredentials: true + }) +} +export function changeOrderApi(order: IOrder) { + return request>>({ + url: "/order/changeOrder", + method: "POST", + data: order, + withCredentials: true + }) +} +export function removeOrderApi(orderId: number) { + return request>>({ + url: "/order/delOrder", + method: "GET", + params: { + orderId: orderId + }, + withCredentials: true + }) +} diff --git a/src/api/order/types/order.ts b/src/api/order/types/order.ts index 419d0b0..0dfa8b2 100644 --- a/src/api/order/types/order.ts +++ b/src/api/order/types/order.ts @@ -1,6 +1,14 @@ +export type OrderStatus = + | "商家驳回" + | "已完成" + | "已确认等待财务审核" + | "提交" + | "新建待提交数据" + | "财务审核已通过" + | "财务驳回" export interface IOrder { id?: number - orderNo: string + orderNo: OrderStatus orderTime?: string orderStatus?: string wangNo: string @@ -11,15 +19,19 @@ export interface IOrder { commission?: number alipayName?: string rpName?: string - rpWeChatName?: string + rpWechatName?: string remark?: string phoneNumber?: string cardNo?: string flag?: number - flagMark?: string + flagRemark?: string payTime?: string address: string shopId?: number sku?: string } export type IAddOrderResponse = string +export type IGetOrderUserInfoResponseData = boolean +export type IAddFlagResponse = string +export type IRemoveOrderResponse = string +export type IChangeOrderResponse = string diff --git a/src/views/order/create/index.vue b/src/views/order/create/index.vue index ead3a19..4ad8d12 100644 --- a/src/views/order/create/index.vue +++ b/src/views/order/create/index.vue @@ -26,8 +26,8 @@ - - + + @@ -50,10 +50,12 @@