Commits · 2aa372d8f4319959fb6a4b660034c9905668562e · phsl / admin · GitLab

10 Sep, 2023 1 commit
- trade: 分销业务后台功能：推广用户列表 · 2aa372d8
  owen committed Sep 10, 2023
  
  2aa372d8 Browse Files
09 Sep, 2023 6 commits
- 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
- 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
03 Sep, 2023 3 commits
- member: 佣金记录 · 73f8cef3
  owen committed Sep 03, 2023
  
  73f8cef3 Browse Files
- member: 分销配置 · 5a9764c0
  owen committed Sep 03, 2023
  
  5a9764c0 Browse Files
- !231 优惠券优化 · 13020895
```
Merge pull request !231 from 疯狂的世界/coupon
```
  芋道源码 committed Sep 03, 2023
  13020895 Browse Files
02 Sep, 2023 4 commits
- 完善订单详情和售后退款日志展示样式重构 · 46fd154e
  puhui999 committed Sep 03, 2023
  
  46fd154e Browse Files
- mall：修复优惠券模板，固定日期范围保存失败 · 7887be6e
  owen committed Sep 02, 2023
  
  7887be6e Browse Files
- promotion: 优惠券模板 productSpuIds 改成 productScopeValues · 5f557c7b
  owen committed Sep 02, 2023
  
  5f557c7b Browse Files
- mall：修复优惠券发券弹窗样式 · a68acb09
  owen committed Sep 02, 2023
  
  a68acb09 Browse Files
01 Sep, 2023 9 commits
- code review：优惠劵逻辑 · d10530c9
  YunaiV committed Sep 02, 2023
  
  d10530c9 Browse Files
- !230 mall：优惠券发送优化 · 9aa7ba35
```
Merge pull request !230 from 疯狂的世界/mall_coupon_send
```
  芋道源码 committed Sep 01, 2023
  9aa7ba35 Browse Files
- code review：优惠劵逻辑 · 4f7d6793
  YunaiV committed Sep 02, 2023
  
  4f7d6793 Browse Files
- mall：优惠券发送优化 · 76c4644b
  owen committed Sep 01, 2023
  
  76c4644b Browse Files
- !225 优惠券 · 190c6e38
```
Merge pull request !225 from 疯狂的世界/owen_dev
```
  芋道源码 committed Sep 01, 2023
  190c6e38 Browse Files
- code review：订单列表 · 0743e494
  YunaiV committed Sep 01, 2023
  
  0743e494 Browse Files
- !229 完善订单管理和售后管理相关问题 · 22d95fa0
```
Merge pull request !229 from puhui999/dev-to-dev
```
  芋道源码 committed Sep 01, 2023
  22d95fa0 Browse Files
- 订单管理：完善订单详情 · f0249e94
  puhui999 committed Sep 01, 2023
  
  f0249e94 Browse Files
- 售后退款：完善售后管理（列表、详情） · 07a0530f
  puhui999 committed Sep 01, 2023
  
  07a0530f Browse Files
31 Aug, 2023 1 commit
- fix: 修正合并差异 · 3e7945e4
  puhui999 committed Sep 01, 2023
  
  3e7945e4 Browse Files