diff --git a/package.json b/package.json index 5724666cd73541b6055c2ec5535e53e6cd36bdec..39faf5d1a0b8dfa4764309e55da5caa63f5e83fe 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "ant-design-vue": "^2.2.0-beta.6", "dayjs": "^1.10.5", "js-cookie": "^2.2.1", + "moment": "^2.29.1", "nprogress": "^0.2.0", "qs": "^6.10.1", "screenfull": "^5.1.0", diff --git a/src/api/order/order.ts b/src/api/order/order.ts new file mode 100644 index 0000000000000000000000000000000000000000..e6c21ea3a9de2433d807a2883b1d1a69ec59a99c --- /dev/null +++ b/src/api/order/order.ts @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +enum Api { + ORDER_TABLE = '/api/order/page', +} + +// 获取订单表格数据 + +export const getOrderTableData = (data: any) => request.get(Api.ORDER_TABLE, data) diff --git a/src/assets/icons/table-nodata.svg b/src/assets/icons/table-nodata.svg new file mode 100644 index 0000000000000000000000000000000000000000..bee87c3b9cc406d6adaf26efc10b83395ee1a39f --- /dev/null +++ b/src/assets/icons/table-nodata.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/router/asyncRoutes.ts b/src/router/asyncRoutes.ts index 2495a079967a8dc6964071e0abda9501362fec82..8990dd33629ec493f6eaa74380dac5961557a24b 100644 --- a/src/router/asyncRoutes.ts +++ b/src/router/asyncRoutes.ts @@ -10,5 +10,5 @@ export default { code8: () => import('@/views/demo/index.vue'), code9: () => import('@/views/dashboard/index.vue'), code10: () => import('@/views/demo/index.vue'), - code24: () => import('@/views/dashboard/index.vue'), + code24: () => import('@/views/order/all-order/index.vue'), } diff --git a/src/styles/common.scss b/src/styles/common.scss index 3cf2b31ca1c0ab76782c1770c14e2fcdd67c83d3..55d7a836ee21782be777af0127ebdad3444fd454 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -19,4 +19,7 @@ a:hover { visibility: hidden; display: block; clear: both; -} \ No newline at end of file +} + ol, ul { + list-style: none; + } \ No newline at end of file diff --git a/src/views/order/all-order/FilterForm.vue b/src/views/order/all-order/FilterForm.vue new file mode 100644 index 0000000000000000000000000000000000000000..bc062149e96d94035dbe22265b2317c8aeaeffd0 --- /dev/null +++ b/src/views/order/all-order/FilterForm.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/order/all-order/OrderTable.vue b/src/views/order/all-order/OrderTable.vue new file mode 100644 index 0000000000000000000000000000000000000000..7e2e432f0f6140e6b795f68312fb0cfa6f5999fd --- /dev/null +++ b/src/views/order/all-order/OrderTable.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/views/order/all-order/Table.vue b/src/views/order/all-order/Table.vue new file mode 100644 index 0000000000000000000000000000000000000000..b08a64d681be2c6486a45de8cb2879f64fb5b962 --- /dev/null +++ b/src/views/order/all-order/Table.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/src/views/order/all-order/allOrder.ts b/src/views/order/all-order/allOrder.ts new file mode 100644 index 0000000000000000000000000000000000000000..d7a936a4d8a9259f5e8756fd3f2eed505701e809 --- /dev/null +++ b/src/views/order/all-order/allOrder.ts @@ -0,0 +1,62 @@ +// 订单请求 筛选条件参数 +export interface ParamsData { + orderNo: string // 订单编号 + externalPayNo: string // 外部支付编号 + receiverName: string // 收货人姓名 + receiverPhone: string // 收货人手机号 + receiverPhoneLastFour?: string // 收货人手机号后四位 + createTimeStart?: string // 下单开始时间 + createTimeEnd?: string // 下单结束时间 + productName?: string // 商品名称 + orderStatus?: number // 订单状态(1:待付款2:待发货3:已发货4:已完成5:已关闭6:售后中7:退款中8:订单关闭) + rightProtectionStatus?: number // 维权状态(1:未维权2:维权中3:维权结束) + type?: number // 订单类型(1:普通订单2:代付订单3:送礼订单4:送礼社群版订单5:心愿订单6:扫码付款7:酒店订单8:维权订单9:周期购订单10:多人拼团订单11:知识付费订单) + source?: number // 订单来源(1:浏览器2:支付宝3:浏览器4:商家自有app5:微信小程序6:其他) + deliveryMethod?: number // 配送方式(1:快递发货2:上门自提3:同城配送) + payMethod?: number // 支付方式(1:支付宝2:微信3:银联4:其他) + payStarredStatus?: number // 加星状态(1:不加星2:加星) + current: number // 当前页码 + size: number // 每页条数 + [propsName: string]: any // 额外类型 +} +// 订单接口返回类型 +export interface orderTableRes { + countId?: string | null + current: number // 当前页码 + total: number // 数据总量 + searchCount?: boolean // + pages: number // + hitCount?: boolean // + size: number // 每页数据量 + order: Array // + records: Array // 订单列表 + [propsName: string]: any // 额外类型适配 +} +interface orderTableItem { + createTime: string // 创建时间 + deliveryMethod: number // 物流方式 + externalPayNo: string // 外部订单号 + favorableAmount: number // 优惠金额 + orderDetailId: number // 订单详情id + orderId: number // 订单ID + orderNo: string // 订单编号 + paidAmount: number // 实付金额 + payMethod: number // 支付方式 + payStarred: number // 订单加星数 + productId: number // 商品ID + productName: string // 商品名称 + productNo: string // 商品编号 + productSku: string // 商品sku信息 + qty: number // 商品数量 + receivableAmount: number // 应收金额 + receiverName: string // 收货人姓名 + receiverPhone: string // 手机号 + receiverPhoneLastFour: string // 手机号后四位 + rightsProtectionStatus: number // 维权状态 + shipmentId: number // 物流记录ID + shipmentNo: string // 物流记录编号 + source: number // 订单来源 + status: number // 订单状态 + trackingNo: string // 物流编号 + type: number // 订单类型 +} diff --git a/src/views/order/all-order/index.vue b/src/views/order/all-order/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..3ff9ecd380b749fff1d991ab5b5d6cbf2834b051 --- /dev/null +++ b/src/views/order/all-order/index.vue @@ -0,0 +1,65 @@ + + + + +