Commits · 5f557c7be5e06f9734bbc90ef4b4fe31b6bd9e25 · phsl / admin · GitLab

02 Sep, 2023 2 commits
- 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 11 commits
- fix: 修正合并差异 · 3e7945e4
  puhui999 committed Sep 01, 2023
  
  3e7945e4 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · 5035fc77
```
# Conflicts:
#	src/views/mall/product/spu/components/index.ts
#	src/views/mall/product/spu/form/BasicInfoForm.vue
```
  puhui999 committed Sep 01, 2023
  5035fc77 Browse Files
- code review · 3918fab1
  YunaiV committed Sep 01, 2023
  
  3918fab1 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · dd3c9f8d
  puhui999 committed Aug 31, 2023
  
  dd3c9f8d Browse Files
- fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 · f9780b63
  puhui999 committed Aug 31, 2023
  
  f9780b63 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 135c88a4
```
 Conflicts:
	src/router/modules/remaining.ts
```
  YunaiV committed Aug 31, 2023
  135c88a4 Browse Files
- !227 商品列表：修复添加属性时会返回已存在属性值的问题 · 2e945d29
```
Merge pull request !227 from puhui999/dev-to-dev
```
  芋道源码 committed Aug 31, 2023
  2e945d29 Browse Files
- 更新订单和售后退款详情页面路由 · 264a29e4
  puhui999 committed Aug 31, 2023
  
  264a29e4 Browse Files
- 订单列表：添加配送方式筛选 · 688dad31
  puhui999 committed Aug 31, 2023
  
  688dad31 Browse Files
- 商品列表：修复添加属性时会返回已存在属性值的问题 · 5c7796ca
  puhui999 committed Aug 31, 2023
  
  5c7796ca Browse Files
- 订单售后列表：完善部分 TODO · f5a17724
  puhui999 committed Aug 31, 2023
  
  f5a17724 Browse Files
30 Aug, 2023 3 commits
- code review：售后详情 · 29b8d06f
  YunaiV committed Aug 30, 2023
  
  29b8d06f Browse Files
- mall：优惠券商品适用范围，增加商品分类 · 27219e18
  owen committed Aug 30, 2023
  
  27219e18 Browse Files
- mall：优惠券商品选择组件 · 60d2e311
  owen committed Aug 30, 2023
  
  60d2e311 Browse Files
29 Aug, 2023 3 commits
- !224 订单售后退款：完善列表、详情、售后相关操作 · 09d21639
```
Merge pull request !224 from puhui999/dev-to-dev
```
  芋道源码 committed Aug 29, 2023
  09d21639 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · eea285b1
  puhui999 committed Aug 29, 2023
  
  eea285b1 Browse Files
- 订单售后列表：完善售后详情及相关操作 · ed739aec
  puhui999 committed Aug 29, 2023
  
  ed739aec Browse Files
28 Aug, 2023 10 commits
- 重构：商品详情界面的路由、文件路径 · 8d026f08
  YunaiV committed Aug 28, 2023
  
  8d026f08 Browse Files
- fix: 个人中心头像为空时不能修改 · e6a9dd0e
  xingyu committed Aug 28, 2023
  
  e6a9dd0e Browse Files
- perf: add ep include · e8dce93d
  xingyu committed Aug 28, 2023
  
  e8dce93d Browse Files
- fix: router · 54c41b44
  xingyu committed Aug 28, 2023
  
  54c41b44 Browse Files
- docs: update deps · 5724539c
  xingyu committed Aug 28, 2023
  
  5724539c Browse Files
- fix: router · 547b1741
  xingyu committed Aug 28, 2023
  
  547b1741 Browse Files
- chore: update deps · bd2d6ada
  xingyu committed Aug 28, 2023
  
  bd2d6ada Browse Files
- 订单售后列表：初始化售后详情 · 8a51c9c7
  puhui999 committed Aug 28, 2023
  
  8a51c9c7 Browse Files
- 订单售后列表：重构列表 · 4f814686
  puhui999 committed Aug 28, 2023
  
  4f814686 Browse Files
- 订单列表：修复差异 · 8239ca47
  puhui999 committed Aug 28, 2023
  
  8239ca47 Browse Files
27 Aug, 2023 2 commits
- !223 同步最新商城的代码 · ce84b14d
```
Merge pull request !223 from 芋道源码/dev
```
  芋道源码 committed Aug 27, 2023
  ce84b14d Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 9507e2b6
```
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
```
  YunaiV committed Aug 27, 2023
  9507e2b6 Browse Files