1025 Commits (4ae1722e724632d82d37822a5ce4335b60993c46)
 

Author SHA1 Message Date
xingyu 4ae1722e72 fix: stylelint 3 years ago
xingyu 2035484a83 chore: vscode setting 3 years ago
xingyu 5494756a66 fix: eslint 3 years ago
xingyu 56a71f64e7 fix: #I7WY9N 3 years ago
xingyu 9a6d29b295 fix: avatar 3 years ago
xingyu 1fe950aea5 chore: 1.8.1-snapshot 3 years ago
xingyu 8f0c6625de docs: update version 3 years ago
xingyu 4664014fc4 chore: update deps 3 years ago
xingyu 4c5d0392d7 chore: vscode setting 3 years ago
芋道源码 944565a241
!236 update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
Merge pull request !236 from 岁月不经谈/N/A
3 years ago
岁月不经谈 a1ce9eda2a
update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
部门树节点过滤不生效

Signed-off-by: 岁月不经谈 <473831241@qq.com>
3 years ago
YunaiV 881ec67236 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 3 years ago
芋道源码 067f89f1d4
!226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
3 years ago
芋道源码 130208959d
!231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
3 years ago
owen 7887be6e92 mall:修复优惠券模板,固定日期范围保存失败 3 years ago
owen 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 3 years ago
owen a68acb096f mall:修复优惠券发券弹窗样式 3 years ago
YunaiV d10530c9f5 code review:优惠劵逻辑 3 years ago
芋道源码 9aa7ba3578
!230 mall:优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
3 years ago
YunaiV 4f7d6793fd code review:优惠劵逻辑 3 years ago
owen 76c4644b4b mall:优惠券发送优化 3 years ago
芋道源码 190c6e384c
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
3 years ago
YunaiV 0743e4941c code review:订单列表 3 years ago
芋道源码 22d95fa0ac
!229 完善订单管理和售后管理相关问题
Merge pull request !229 from puhui999/dev-to-dev
3 years ago
puhui999 f0249e94a5 订单管理:完善订单详情 3 years ago
puhui999 07a0530fc9 售后退款:完善售后管理(列表、详情) 3 years ago
puhui999 3e7945e437 fix: 修正合并差异 3 years ago
puhui999 5035fc77e7 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	src/views/mall/product/spu/components/index.ts
#	src/views/mall/product/spu/form/BasicInfoForm.vue
3 years ago
YunaiV 3918fab1ec code review 3 years ago
puhui999 dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 3 years ago
芋道源码 5c7b2c8c5d
!228 同步商城最新代码
Merge pull request !228 from 芋道源码/dev
3 years ago
YunaiV 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/router/modules/remaining.ts
3 years ago
芋道源码 2e945d29cc
!227 商品列表:修复添加属性时会返回已存在属性值的问题
Merge pull request !227 from puhui999/dev-to-dev
3 years ago
puhui999 264a29e451 更新订单和售后退款详情页面路由 3 years ago
puhui999 688dad319e 订单列表:添加配送方式筛选 3 years ago
puhui999 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 3 years ago
puhui999 f5a1772464 订单售后列表:完善部分 TODO 3 years ago
AKING 3e67f3bc4c
update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时,form中事件不能触发的问题

Signed-off-by: AKING <2734339436@qq.com>
3 years ago
YunaiV 29b8d06ff2 code review:售后详情 3 years ago
owen 27219e1833 mall:优惠券 商品适用范围,增加商品分类 3 years ago
owen 60d2e3114b mall:优惠券 商品选择组件 3 years ago
芋道源码 09d216394e
!224 订单售后退款:完善列表、详情、售后相关操作
Merge pull request !224 from puhui999/dev-to-dev
3 years ago
puhui999 eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 ed739aec55 订单售后列表:完善售后详情及相关操作 3 years ago
YunaiV 8d026f0837 重构:商品详情界面的路由、文件路径 3 years ago
xingyu e6a9dd0e4c fix: 个人中心头像为空时不能修改 3 years ago
xingyu e8dce93d66 perf: add ep include 3 years ago
xingyu 54c41b4445 fix: router 3 years ago
xingyu 5724539caf docs: update deps 3 years ago