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
2e830d14
authored
Sep 11, 2023
by
owen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trade: 分销业务review代码修改
parent
0582d419
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
15 deletions
+9
-15
src/utils/dict.ts
+6
-7
src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
+2
-2
src/views/mall/trade/brokerage/user/index.vue
+1
-6
No files found.
src/utils/dict.ts
View file @
2e830d14
...
@@ -151,13 +151,6 @@ export enum DICT_TYPE {
...
@@ -151,13 +151,6 @@ export enum DICT_TYPE {
// ========== MALL - 会员模块 ==========
// ========== MALL - 会员模块 ==========
MEMBER_POINT_BIZ_TYPE
=
'member_point_biz_type'
,
// 积分的业务类型
MEMBER_POINT_BIZ_TYPE
=
'member_point_biz_type'
,
// 积分的业务类型
MEMBER_EXPERIENCE_BIZ_TYPE
=
'member_experience_biz_type'
,
// 会员经验业务类型
MEMBER_EXPERIENCE_BIZ_TYPE
=
'member_experience_biz_type'
,
// 会员经验业务类型
// TODO @疯狂:这块的枚举,是不是要挪到 TRADE 那啦
BROKERAGE_ENABLED_CONDITION
=
'brokerage_enabled_condition'
,
// 分佣模式
BROKERAGE_BIND_MODE
=
'brokerage_bind_mode'
,
// 分销关系绑定模式
BROKERAGE_BANK_NAME
=
'brokerage_bank_name'
,
// 佣金提现银行
BROKERAGE_WITHDRAW_TYPE
=
'brokerage_withdraw_type'
,
// 佣金冻结时间
BROKERAGE_RECORD_BIZ_TYPE
=
'brokerage_record_biz_type'
,
// 佣金业务类型
BROKERAGE_RECORD_STATUS
=
'brokerage_record_status'
,
// 佣金状态
// ========== MALL - 商品模块 ==========
// ========== MALL - 商品模块 ==========
PRODUCT_UNIT
=
'product_unit'
,
// 商品单位
PRODUCT_UNIT
=
'product_unit'
,
// 商品单位
...
@@ -172,6 +165,12 @@ export enum DICT_TYPE {
...
@@ -172,6 +165,12 @@ export enum DICT_TYPE {
TRADE_ORDER_STATUS
=
'trade_order_status'
,
// 订单 - 状态
TRADE_ORDER_STATUS
=
'trade_order_status'
,
// 订单 - 状态
TRADE_ORDER_ITEM_AFTER_SALE_STATUS
=
'trade_order_item_after_sale_status'
,
// 订单项 - 售后状态
TRADE_ORDER_ITEM_AFTER_SALE_STATUS
=
'trade_order_item_after_sale_status'
,
// 订单项 - 售后状态
TRADE_DELIVERY_TYPE
=
'trade_delivery_type'
,
// 配送方式
TRADE_DELIVERY_TYPE
=
'trade_delivery_type'
,
// 配送方式
BROKERAGE_ENABLED_CONDITION
=
'brokerage_enabled_condition'
,
// 分佣模式
BROKERAGE_BIND_MODE
=
'brokerage_bind_mode'
,
// 分销关系绑定模式
BROKERAGE_BANK_NAME
=
'brokerage_bank_name'
,
// 佣金提现银行
BROKERAGE_WITHDRAW_TYPE
=
'brokerage_withdraw_type'
,
// 佣金冻结时间
BROKERAGE_RECORD_BIZ_TYPE
=
'brokerage_record_biz_type'
,
// 佣金业务类型
BROKERAGE_RECORD_STATUS
=
'brokerage_record_status'
,
// 佣金状态
// ========== MALL - 营销模块 ==========
// ========== MALL - 营销模块 ==========
PROMOTION_DISCOUNT_TYPE
=
'promotion_discount_type'
,
// 优惠类型
PROMOTION_DISCOUNT_TYPE
=
'promotion_discount_type'
,
// 优惠类型
...
...
src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
View file @
2e830d14
...
@@ -49,10 +49,10 @@
...
@@ -49,10 +49,10 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"昵称"
align=
"center"
prop=
"nickname"
min-width=
"80px"
/>
<el-table-column
label=
"昵称"
align=
"center"
prop=
"nickname"
min-width=
"80px"
/>
<el-table-column
<el-table-column
label=
"推广人数
(一级)
"
label=
"推广人数"
align=
"center"
align=
"center"
prop=
"brokerageUserCount"
prop=
"brokerageUserCount"
min-width=
"
11
0px"
min-width=
"
8
0px"
/>
/>
<el-table-column
<el-table-column
label=
"推广订单数量"
label=
"推广订单数量"
...
...
src/views/mall/trade/brokerage/user/index.vue
View file @
2e830d14
...
@@ -56,12 +56,7 @@
...
@@ -56,12 +56,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"昵称"
align=
"center"
prop=
"nickname"
min-width=
"80px"
/>
<el-table-column
label=
"昵称"
align=
"center"
prop=
"nickname"
min-width=
"80px"
/>
<el-table-column
<el-table-column
label=
"推广人数"
align=
"center"
prop=
"brokerageUserCount"
width=
"80px"
/>
label=
"推广人数(一级)"
align=
"center"
prop=
"brokerageUserCount"
min-width=
"140px"
/>
<el-table-column
<el-table-column
label=
"推广订单数量"
label=
"推广订单数量"
align=
"center"
align=
"center"
...
...
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