Commits · 27219e1833f49fa60acc2d7809f2f7497230a2e4 · phsl / admin · GitLab

30 Aug, 2023 2 commits
- mall：优惠券商品适用范围，增加商品分类 · 27219e18
  owen committed Aug 30, 2023
  
  27219e18 Browse Files
- mall：优惠券商品选择组件 · 60d2e311
  owen committed Aug 30, 2023
  
  60d2e311 Browse Files
26 Aug, 2023 8 commits
- mall: 完善后台发送优惠券 · beef6a0a
  owen committed Aug 26, 2023
  
  beef6a0a Browse Files
- 商品评论：回复表单提取到单独的组件中 · 3a153900
  owen committed Aug 26, 2023
  
  3a153900 Browse Files
- 商品评论： · 15971b6f
```
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下
```
  owen committed Aug 26, 2023
  15971b6f Browse Files
- Merge remote-tracking branch 'origin/dev' into owen_dev · ec412f7a
  owen committed Aug 26, 2023
  
  ec412f7a Browse Files
- code review：订单列表 · b8ca5800
  YunaiV committed Aug 26, 2023
  
  b8ca5800 Browse Files
- !217 完善 TODO 提到的问题，优化订单列表相关页面结构 · 2605cb7d
```
Merge pull request !217 from puhui999/dev-to-dev
```
  芋道源码 committed Aug 26, 2023
  2605cb7d Browse Files
- code review：商品评论 · 84c5eb99
  YunaiV committed Aug 26, 2023
  
  84c5eb99 Browse Files
- !220 商品：完善商品评论功能 · 343b6bbf
```
Merge pull request !220 from 疯狂的世界/owen_dev
```
  芋道源码 committed Aug 26, 2023
  343b6bbf Browse Files
25 Aug, 2023 6 commits
- Merge remote-tracking branch 'origin/dev' into owen_dev · bce427f7
  owen committed Aug 26, 2023
  
  bce427f7 Browse Files
- code review：用户详情 · 1b6c9b2e
  YunaiV committed Aug 26, 2023
  
  1b6c9b2e Browse Files
- Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev · 41530946
```
 Conflicts:
	src/views/member/user/index.vue
```
  YunaiV committed Aug 26, 2023
  41530946 Browse Files
- Merge remote-tracking branch 'origin/dev' into member_dev · 2c563458
  owen committed Aug 25, 2023
  
  2c563458 Browse Files
- 商品：完善后台商品评论功能 · 814b4631
  owen committed Aug 25, 2023
  
  814b4631 Browse Files
- 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 · 28951fb3
  绮梦 committed Aug 25, 2023
  
  28951fb3 Browse Files
24 Aug, 2023 2 commits
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · 6b487c7e
  puhui999 committed Aug 24, 2023
  
  6b487c7e Browse Files
- 订单列表：优化订单列表页面结构 · 58502b12
  puhui999 committed Aug 24, 2023
  
  58502b12 Browse Files
23 Aug, 2023 7 commits
- !215 会员: 会员等级功能调整 · 5fb5c6cb
```
Merge pull request !215 from 疯狂的世界/member_dev
```
  芋道源码 committed Aug 23, 2023
  5fb5c6cb Browse Files
- 完善 code review 提到的问题 · 7db6c121
  puhui999 committed Aug 23, 2023
  
  7db6c121 Browse Files
- 重命名组件名称 · f17bb9a7
  绮梦 committed Aug 23, 2023
  
  f17bb9a7 Browse Files
- 会员详情页的跳转携带参数方式改为params · d1bb7369
  绮梦 committed Aug 23, 2023
  
  d1bb7369 Browse Files
- 会员列表页面增加详情页的跳转。 · 451458eb
  绮梦 committed Aug 23, 2023
  
  451458eb Browse Files
- Merge remote-tracking branch 'origin/dev' into member_dev · 2e68a523
```
# Conflicts:
#	src/views/member/user/UserForm.vue
```
  owen committed Aug 23, 2023
  2e68a523 Browse Files
- 会员: 会员等级取消分页功能 · e9120f06
  owen committed Aug 23, 2023
  
  e9120f06 Browse Files
22 Aug, 2023 14 commits
- code review：用户详情 · 55772cbb
  YunaiV committed Aug 23, 2023
  
  55772cbb Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 746bf864
```
 Conflicts:
	src/views/mall/promotion/combination/record/index.vue
```
  YunaiV committed Aug 23, 2023
  746bf864 Browse Files
- !212 管理后台用户详情 · d096e6e7
```
Merge pull request !212 from 风狗/用户详情
```
  芋道源码 committed Aug 22, 2023
  d096e6e7 Browse Files
- code review：订单列表、订单详情 · cfbc2ed7
  YunaiV committed Aug 23, 2023
  
  cfbc2ed7 Browse Files
- !210 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 · 69a66b2a
```
Merge pull request !210 from puhui999/dev-to-dev
```
  芋道源码 committed Aug 22, 2023
  69a66b2a Browse Files
- code review：会员等级 · bb0c1cb5
  YunaiV committed Aug 22, 2023
  
  bb0c1cb5 Browse Files
- 订单列表：列表重构添加门店、物流检索条件 · 5dceda61
  puhui999 committed Aug 22, 2023
  
  5dceda61 Browse Files
- 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 · 83e780da
  puhui999 committed Aug 22, 2023
  
  83e780da Browse Files
- 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 · be143ea2
  puhui999 committed Aug 22, 2023
  
  be143ea2 Browse Files
- 用户详情-积分tab 去除无用的组件。 · c1a40e7c
  绮梦 committed Aug 22, 2023
  
  c1a40e7c Browse Files
- 增加用户详情页以及签到、积分等用户详情下的子tab页。 · 10d9f11f
```
增加 用户、签到、积分 接口的VO,方便在组件中使用。
```
  绮梦 committed Aug 22, 2023
  10d9f11f Browse Files
- !209 会员：增加用户等级功能 · 40711c0e
```
Merge pull request !209 from 疯狂的世界/member_dev
```
  芋道源码 committed Aug 22, 2023
  40711c0e Browse Files
- 会员: 修改会员等级，使用单独的表单、接口 · 51738f8f
  owen committed Aug 22, 2023
  
  51738f8f Browse Files
- 订单列表：列表重构 ④ 移除测试数据 · ebcbe63d
  puhui999 committed Aug 22, 2023
  
  ebcbe63d Browse Files
21 Aug, 2023 1 commit
- 会员：等级下拉框显示图标 · c5a703f4
  owen committed Aug 22, 2023
  
  c5a703f4 Browse Files