Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e3f250ff
authored
Jun 17, 2023
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code review:订单列表
parent
867c47de
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
12 deletions
+13
-12
src/api/mall/trade/order/index.ts
+1
-0
src/api/mall/trade/order/type/orderType.ts
+4
-0
src/utils/dict.ts
+8
-12
src/views/mall/trade/order/index.vue
+0
-0
No files found.
src/api/mall/trade/order/index.ts
View file @
e3f250ff
import
request
from
'@/config/axios'
import
request
from
'@/config/axios'
// 获得交易订单分页
// 获得交易订单分页
// TODO @xiaobai:改成 getOrderPage
export
const
getOrderList
=
(
params
:
PageParam
)
=>
{
export
const
getOrderList
=
(
params
:
PageParam
)
=>
{
return
request
.
get
({
url
:
'/trade/order/page'
,
params
})
return
request
.
get
({
url
:
'/trade/order/page'
,
params
})
}
}
...
...
src/api/mall/trade/order/type/orderType.ts
View file @
e3f250ff
// TODO @xiaobai:这个放到 order/index.ts 里哈
// TODO @xiaobai:注释放到变量后面,这样简洁一点
// TODO @xiaobai:这个改成 TradeOrderRespVO
export
interface
TradeOrderPageItemRespVO
{
export
interface
TradeOrderPageItemRespVO
{
// 订单编号
// 订单编号
id
:
number
id
:
number
...
@@ -85,6 +88,7 @@ export interface TradeOrderPageItemRespVO {
...
@@ -85,6 +88,7 @@ export interface TradeOrderPageItemRespVO {
items
:
TradeOrderItemBaseVO
[]
items
:
TradeOrderItemBaseVO
[]
}
}
// TODO @xiaobai:这个改成 TradeOrderItemRespVO
/**
/**
* 交易订单项 Base VO,提供给添加、修改、详细的子 VO 使用
* 交易订单项 Base VO,提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
...
...
src/utils/dict.ts
View file @
e3f250ff
...
@@ -156,6 +156,13 @@ export enum DICT_TYPE {
...
@@ -156,6 +156,13 @@ export enum DICT_TYPE {
// ========== MALL - 交易模块 ==========
// ========== MALL - 交易模块 ==========
EXPRESS_CHARGE_MODE
=
'trade_delivery_express_charge_mode'
,
//快递的计费方式
EXPRESS_CHARGE_MODE
=
'trade_delivery_express_charge_mode'
,
//快递的计费方式
TRADE_AFTER_SALE_STATUS
=
'trade_after_sale_status'
,
// 售后 - 状态
TRADE_AFTER_SALE_WAY
=
'trade_after_sale_way'
,
// 售后 - 方式
TRADE_AFTER_SALE_TYPE
=
'trade_after_sale_type'
,
// 售后 - 类型
TRADE_ORDER_TYPE
=
'trade_order_type'
,
// 订单 - 类型
TRADE_ORDER_STATUS
=
'trade_order_status'
,
// 订单 - 状态
TRADE_ORDER_ITEM_AFTER_SALE_STATUS
=
'trade_order_item_after_sale_status'
,
// 订单项 - 售后状态
TERMINAL
=
'terminal'
,
// 终端
// ========== MALL - 营销模块 ==========
// ========== MALL - 营销模块 ==========
PROMOTION_DISCOUNT_TYPE
=
'promotion_discount_type'
,
// 优惠类型
PROMOTION_DISCOUNT_TYPE
=
'promotion_discount_type'
,
// 优惠类型
...
@@ -164,16 +171,5 @@ export enum DICT_TYPE {
...
@@ -164,16 +171,5 @@ export enum DICT_TYPE {
PROMOTION_COUPON_STATUS
=
'promotion_coupon_status'
,
// 优惠劵的状态
PROMOTION_COUPON_STATUS
=
'promotion_coupon_status'
,
// 优惠劵的状态
PROMOTION_COUPON_TAKE_TYPE
=
'promotion_coupon_take_type'
,
// 优惠劵的领取方式
PROMOTION_COUPON_TAKE_TYPE
=
'promotion_coupon_take_type'
,
// 优惠劵的领取方式
PROMOTION_ACTIVITY_STATUS
=
'promotion_activity_status'
,
// 优惠活动的状态
PROMOTION_ACTIVITY_STATUS
=
'promotion_activity_status'
,
// 优惠活动的状态
PROMOTION_CONDITION_TYPE
=
'promotion_condition_type'
,
// 营销的条件类型枚举
PROMOTION_CONDITION_TYPE
=
'promotion_condition_type'
// 营销的条件类型枚举
//===add by 20230530====
// ========== MALL - ORDER 模块 ==========
TRADE_AFTER_SALE_STATUS
=
'trade_after_sale_status'
,
// 售后 - 状态
TRADE_AFTER_SALE_WAY
=
'trade_after_sale_way'
,
// 售后 - 方式
TRADE_AFTER_SALE_TYPE
=
'trade_after_sale_type'
,
// 售后 - 类型
TRADE_ORDER_TYPE
=
'trade_order_type'
,
// 订单 - 类型
TRADE_ORDER_STATUS
=
'trade_order_status'
,
// 订单 - 状态
TRADE_ORDER_ITEM_AFTER_SALE_STATUS
=
'trade_order_item_after_sale_status'
,
// 订单项 - 售后状态
TERMINAL
=
'terminal'
}
}
src/views/mall/trade/order/index.vue
View file @
e3f250ff
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment