AKING
|
d74f96fe17
|
update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题
Signed-off-by: AKING <2734339436@qq.com>
|
2023-09-04 03:31:35 +00:00 |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
2023-09-03 23:04:20 +08:00 |
|
owen
|
5a9764c08c
|
member: 分销配置
|
2023-09-03 21:14:44 +08:00 |
|
YunaiV
|
881ec67236
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-09-03 19:25:33 +08:00 |
|
芋道源码
|
067f89f1d4
|
!226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
|
2023-09-03 10:56:36 +00:00 |
|
芋道源码
|
130208959d
|
!231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
|
2023-09-03 10:55:35 +00:00 |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
2023-09-03 01:44:22 +08:00 |
|
owen
|
7887be6e92
|
mall：修复优惠券模板，固定日期范围保存失败
|
2023-09-02 10:42:55 +08:00 |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:36 +08:00 |
|
owen
|
a68acb096f
|
mall：修复优惠券发券弹窗样式
|
2023-09-02 08:39:53 +08:00 |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
2023-09-02 00:34:45 +08:00 |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
2023-09-01 16:33:43 +00:00 |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
2023-09-02 00:12:21 +08:00 |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
2023-09-01 23:50:26 +08:00 |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
2023-09-01 14:55:30 +00:00 |
|
YunaiV
|
0743e4941c
|
code review：订单列表
|
2023-09-01 20:03:08 +08:00 |
|
芋道源码
|
22d95fa0ac
|
!229 完善订单管理和售后管理相关问题
Merge pull request !229 from puhui999/dev-to-dev
|
2023-09-01 11:41:17 +00:00 |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
2023-09-01 12:04:33 +08:00 |
|
puhui999
|
07a0530fc9
|
售后退款：完善售后管理（列表、详情）
|
2023-09-01 10:32:05 +08:00 |
|
puhui999
|
3e7945e437
|
fix: 修正合并差异
|
2023-09-01 01:24:46 +08:00 |
|
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
|
2023-09-01 01:20:08 +08:00 |
|
YunaiV
|
3918fab1ec
|
code review
|
2023-09-01 00:49:42 +08:00 |
|
puhui999
|
dd3c9f8ddb
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-31 21:13:46 +08:00 |
|
puhui999
|
f9780b636c
|
fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
|
2023-08-31 21:13:20 +08:00 |
|
芋道源码
|
5c7b2c8c5d
|
!228 同步商城最新代码
Merge pull request !228 from 芋道源码/dev
|
2023-08-31 12:38:05 +00:00 |
|
YunaiV
|
135c88a473
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/router/modules/remaining.ts
|
2023-08-31 20:37:20 +08:00 |
|
芋道源码
|
2e945d29cc
|
!227 商品列表：修复添加属性时会返回已存在属性值的问题
Merge pull request !227 from puhui999/dev-to-dev
|
2023-08-31 11:52:12 +00:00 |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
2023-08-31 16:39:48 +08:00 |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
2023-08-31 16:26:24 +08:00 |
|
puhui999
|
5c7796ca6f
|
商品列表：修复添加属性时会返回已存在属性值的问题
|
2023-08-31 15:58:34 +08:00 |
|
puhui999
|
f5a1772464
|
订单售后列表：完善部分 TODO
|
2023-08-31 15:39:13 +08:00 |
|
AKING
|
3e67f3bc4c
|
update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时，form中事件不能触发的问题
Signed-off-by: AKING <2734339436@qq.com>
|
2023-08-31 03:50:51 +00:00 |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
2023-08-30 21:18:46 +08:00 |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
2023-08-30 20:54:20 +08:00 |
|
owen
|
60d2e3114b
|
mall：优惠券 商品选择组件
|
2023-08-30 11:50:21 +08:00 |
|
芋道源码
|
09d216394e
|
!224 订单售后退款：完善列表、详情、售后相关操作
Merge pull request !224 from puhui999/dev-to-dev
|
2023-08-29 01:55:37 +00:00 |
|
puhui999
|
eea285b141
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-29 09:49:34 +08:00 |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
2023-08-29 09:48:33 +08:00 |
|
YunaiV
|
8d026f0837
|
重构：商品详情界面的路由、文件路径
|
2023-08-28 18:56:37 +08:00 |
|
xingyu
|
e6a9dd0e4c
|
fix: 个人中心头像为空时不能修改
|
2023-08-28 17:53:45 +08:00 |
|
xingyu
|
e8dce93d66
|
perf: add ep include
|
2023-08-28 17:44:59 +08:00 |
|
xingyu
|
54c41b4445
|
fix: router
|
2023-08-28 17:44:47 +08:00 |
|
xingyu
|
5724539caf
|
docs: update deps
|
2023-08-28 17:41:09 +08:00 |
|
xingyu
|
547b1741fc
|
fix: router
|
2023-08-28 17:40:15 +08:00 |
|
xingyu
|
bd2d6adafa
|
chore: update deps
|
2023-08-28 17:40:07 +08:00 |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
2023-08-28 17:18:42 +08:00 |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
2023-08-28 14:00:09 +08:00 |
|
puhui999
|
8239ca474f
|
订单列表： 修复差异
|
2023-08-28 10:05:49 +08:00 |
|
芋道源码
|
ce84b14d15
|
!223 同步最新商城的代码
Merge pull request !223 from 芋道源码/dev
|
2023-08-27 13:03:31 +00:00 |
|
YunaiV
|
9507e2b687
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/detail/UserPointList.vue
|
2023-08-27 21:02:52 +08:00 |
|