diff --git a/.env.development b/.env.development index 4058992..e385033 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 接口地址 # VUE_APP_BASE_API = 'http://192.168.2.128:8000' # VUE_APP_BASE_API = 'http://192.168.2.133:8000' -VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' -# VUE_APP_BASE_API = 'http://192.168.2.98:8000' +# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' +VUE_APP_BASE_API = 'http://192.168.2.96:8000' VUE_APP_WS_API = 'ws://192.168.2.128:8000' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/src/api/order.js b/src/api/order.js index c73bdfa..7a381dd 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -1,63 +1,92 @@ -import request from '@/utils/request' +import request from "@/utils/request"; /** * 查询订单 - * @param {*} data - * @returns + * @param {*} data + * @returns */ export function tbOrderInfoData(data) { - return request({ - url: '/api/tbOrderInfo/date', - method: 'post', - data: { - shopId: localStorage.getItem('shopId'), - ...data - } - }) + return request({ + url: "/api/tbOrderInfo/date", + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + ...data + } + }); } /** * 导出数据 * @param {*} data - * @returns + * @returns */ export function tbOrderInfoDownload(data) { - return request({ - url: '/api/tbOrderInfo/download', - method: 'post', - data: { - shopId: localStorage.getItem('shopId'), - ...data - }, - responseType: 'blob' - }) + return request({ + url: "/api/tbOrderInfo/download", + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + ...data + }, + responseType: "blob" + }); } /** * 通过Id查询订单 - * @param {*} id - * @returns + * @param {*} id + * @returns */ export function tbOrderInfoDetail(id) { - return request({ - url: `/api/tbOrderInfo/${id}`, - method: 'get' - }) + return request({ + url: `/api/tbOrderInfo/${id}`, + method: "get" + }); } /** * 通过Id查询订单 - * @param {*} createdAt - * @returns + * @param {*} createdAt + * @returns */ export function payCount(createdAt) { - console.log(createdAt); - return request({ - url: `/api/tbOrderInfo/payCount`, - method: 'post', - data: { - shopId: localStorage.getItem('shopId'), - createdAt: createdAt - } - }) -} \ No newline at end of file + console.log(createdAt); + return request({ + url: `/api/tbOrderInfo/payCount`, + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + createdAt: createdAt + } + }); +} + +/** + * 订单列表 + * @param {*} createdAt + * @returns + */ +export function tbGroupOrderInfo(params) { + return request({ + url: `/api/tbGroupOrderInfo`, + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + ...params + } + }); +} + +/** + * 退单 + * @param {*} data + * @returns + */ +export function returnGpOrder(data) { + return request({ + url: `/api/tbGroupOrderInfo/returnGpOrder`, + method: "post", + data + }); +} diff --git a/src/views/order_manage/group_purchase.vue b/src/views/order_manage/group_purchase.vue new file mode 100644 index 0000000..4eb292d --- /dev/null +++ b/src/views/order_manage/group_purchase.vue @@ -0,0 +1,296 @@ + + +