Commits · 539f8a5bb5a63da15fe13be582ce23ee44b56ce3 · phsl / admin · GitLab

24 Sep, 2023 2 commits
- 修复 member 详情无法展示的问题 · 539f8a5b
  YunaiV committed Sep 24, 2023
  
  539f8a5b Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · e4896277
```
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
```
  YunaiV committed Sep 24, 2023
  e4896277 Browse Files
22 Sep, 2023 4 commits
- style: unocss eslint · 2a58e3f6
  xingyu committed Sep 22, 2023
  
  2a58e3f6 Browse Files
- chore: add unocss eslint · 57a7ed46
  xingyu committed Sep 22, 2023
  
  57a7ed46 Browse Files
- docs: update deps · 436cc806
  xingyu committed Sep 22, 2023
  
  436cc806 Browse Files
- chore: update deps · ce5f3032
  xingyu committed Sep 22, 2023
  
  ce5f3032 Browse Files
16 Sep, 2023 1 commit
- 增加 404 的说明 · 1be57ea8
  YunaiV committed Sep 16, 2023
  
  1be57ea8 Browse Files
13 Sep, 2023 1 commit
- !232 update src/components/Dialog/src/Dialog.vue. · a6b4908f
```
Merge pull request !232 from AKING/N/A
```
  xingyu committed Sep 13, 2023
  a6b4908f 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
11 Sep, 2023 9 commits
- fix: stylelint · 4ae1722e
  xingyu committed Sep 11, 2023
  
  4ae1722e Browse Files
- chore: vscode setting · 2035484a
  xingyu committed Sep 11, 2023
  
  2035484a Browse Files
- fix: eslint · 5494756a
  xingyu committed Sep 11, 2023
  
  5494756a Browse Files
- fix: #I7WY9N · 56a71f64
  xingyu committed Sep 11, 2023
  
  56a71f64 Browse Files
- fix: avatar · 9a6d29b2
  xingyu committed Sep 11, 2023
  
  9a6d29b2 Browse Files
- chore: 1.8.1-snapshot · 1fe950ae
  xingyu committed Sep 11, 2023
  
  1fe950ae Browse Files
- docs: update version · 8f0c6625
  xingyu committed Sep 11, 2023
  
  8f0c6625 Browse Files
- chore: update deps · 4664014f
  xingyu committed Sep 11, 2023
  
  4664014f Browse Files
- chore: vscode setting · 4c5d0392
  xingyu committed Sep 11, 2023
  
  4c5d0392 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 11 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
- !236 update src/views/system/user/DeptTree.vue 部门树节点过滤不生效 · 944565a2
```
Merge pull request !236 from 岁月不经谈/N/A
```
  芋道源码 committed Sep 09, 2023
  944565a2 Browse Files
- !239 分销员表格佣金字段格式化 · e3b9a15c
```
Merge pull request !239 from 疯狂的世界/brokerage
```
  芋道源码 committed Sep 09, 2023
  e3b9a15c Browse Files
08 Sep, 2023 6 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