Commits · dd5a1f2d433944a0af4e03339e29f35f2389d111 · phsl / admin · GitLab

20 Sep, 2023 1 commit
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · dd5a1f2d
  puhui999 committed Sep 20, 2023
  
  dd5a1f2d Browse Files
19 Sep, 2023 5 commits
- !244 trade: 分销业务review代码修改 · df6a3843
```
Merge pull request !244 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 19, 2023
  df6a3843 Browse Files
- !243 订单详情页面请求详情接口改为真实携带的id · f63d518d
```
Merge pull request !243 from 风狗/dev
```
  芋道源码 committed Sep 19, 2023
  f63d518d Browse Files
- trade: 分销业务 - 佣金提现后台管理 · 854acf6e
  owen committed Sep 19, 2023
  
  854acf6e Browse Files
- trade: 分销业务review代码修改 · 18b6c70d
  owen committed Sep 19, 2023
  
  18b6c70d Browse Files
- 订单详情页面请求详情接口改为真实携带的id · 24530145
  绮梦 committed Sep 19, 2023
  
  24530145 Browse Files
16 Sep, 2023 1 commit
- 增加 404 的说明 · 1be57ea8
  YunaiV committed Sep 16, 2023
  
  1be57ea8 Browse Files
13 Sep, 2023 1 commit
- spu：分佣属性和分佣保持一致 · 8778f574
  puhui999 committed Sep 13, 2023
  
  8778f574 Browse Files
12 Sep, 2023 3 commits
- !241 完善分销功能 · de615c23
```
Merge pull request !241 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 12, 2023
  de615c23 Browse Files
- code review：订单相关的逻辑 · 8b65a286
  YunaiV committed Sep 12, 2023
  
  8b65a286 Browse Files
- !240 完善前端 mall-order 模块相关问题 · ef152619
```
Merge pull request !240 from puhui999/dev-to-dev
```
  芋道源码 committed Sep 12, 2023
  ef152619 Browse Files
10 Sep, 2023 3 commits
- trade: 分销业务review代码修改 · 2e830d14
  owen committed Sep 11, 2023
  
  2e830d14 Browse Files
- trade: 分销业务后台功能：推广订单列表 · 0582d419
  owen committed Sep 10, 2023
  
  0582d419 Browse Files
- trade: 分销业务后台功能：推广用户列表 · 2aa372d8
  owen committed Sep 10, 2023
  
  2aa372d8 Browse Files
09 Sep, 2023 10 commits
- spu：分佣属性和分佣保持一致 · 5dc0c6e3
  puhui999 committed Sep 09, 2023
  
  5dc0c6e3 Browse Files
- order：完善订单聚合搜索 · 615763d4
  puhui999 committed Sep 09, 2023
  
  615763d4 Browse Files
- mall-order：修复 todo 提到的问题 · 7e511d1e
  puhui999 committed Sep 09, 2023
  
  7e511d1e Browse Files
- trade: 分销业务后台功能：佣金格式化 · 87ca916e
  owen committed Sep 09, 2023
  
  87ca916e Browse Files
- trade: 分销业务后台功能：修改上级推广人 · 5ed90926
  owen committed Sep 09, 2023
  
  5ed90926 Browse Files
- trade: 分销业务后台功能：清除推广员、修改推广资格 · 7ea35713
  owen committed Sep 09, 2023
  
  7ea35713 Browse Files
- 登录界面：姐姐点击登录后界面疯狂闪动的问题 · a79f1452
  puhui999 committed Sep 09, 2023
  
  a79f1452 Browse Files
- code review：会员详情 · 0e2ea395
  YunaiV committed Sep 09, 2023
  
  0e2ea395 Browse Files
- Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev · 30f0c1b3
```
 Conflicts:
	src/utils/dict.ts
```
  YunaiV committed Sep 09, 2023
  30f0c1b3 Browse Files
- !239 分销员表格佣金字段格式化 · e3b9a15c
```
Merge pull request !239 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 09, 2023
  e3b9a15c Browse Files
08 Sep, 2023 7 commits
- code review：完善订单详情和售后退款 TODO 提到的问题 · 3c315cf2
  YunaiV committed Sep 09, 2023
  
  3c315cf2 Browse Files
- !238 完善订单详情和售后退款 TODO 提到的问题 · dbfabcbb
```
Merge pull request !238 from puhui999/dev-to-dev
```
  芋道源码 committed Sep 08, 2023
  dbfabcbb Browse Files
- trade: 分销员表格佣金字段格式化 · dbb87e38
  owen committed Sep 08, 2023
  
  dbb87e38 Browse Files
- !237 分销业务从 member 模块转移到 trade模块 · 1719debd
```
Merge pull request !237 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 08, 2023
  1719debd Browse Files
- trade: 优化分销用户佣金字段名称 · e9d5027e
  owen committed Sep 08, 2023
  
  e9d5027e Browse Files
- trade: 优化分销用户绑定用户编号、绑定时间字段名称 · 72633154
  owen committed Sep 08, 2023
  
  72633154 Browse Files
- trade: 分销用户管理 · 34ce7f7e
  owen committed Sep 08, 2023
  
  34ce7f7e Browse Files
07 Sep, 2023 2 commits
- 完善订单详情 · b3639977
  puhui999 committed Sep 08, 2023
  
  b3639977 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · f44688d6
  puhui999 committed Sep 08, 2023
  
  f44688d6 Browse Files
06 Sep, 2023 1 commit
- 完善订单详情和售后退款 TODO 提到的问题 · 73628d39
  puhui999 committed Sep 06, 2023
  
  73628d39 Browse Files
05 Sep, 2023 5 commits
- trade: 分销业务从 member 模块转移到 trade模块 · 1e212080
  owen committed Sep 06, 2023
  
  1e212080 Browse Files
- trade: 分销业务从 member 模块转移到 trade模块 · 2ed5d12b
  owen committed Sep 06, 2023
  
  2ed5d12b Browse Files
- trade: 增加交易中心配置表 · 35664d1f
  owen committed Sep 05, 2023
  
  35664d1f Browse Files
- 新增用户详情下订单页面 · 2318f176
  绮梦 committed Sep 05, 2023
  
  2318f176 Browse Files
- !235 会员：佣金记录、配置 · d8ca08a3
```
Merge pull request !235 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 05, 2023
  d8ca08a3 Browse Files
04 Sep, 2023 1 commit
- 新增用户详情下成长值页面。 · fe6cf7ce
  绮梦 committed Sep 04, 2023
  
  fe6cf7ce Browse Files