YunaiV
|
46ab58ddf0
|
code review：订单列表、订单详情
(cherry picked from commit cfbc2ed74c)
|
2023-09-20 12:14:05 +08:00 |
|
puhui999
|
edb88f8548
|
订单列表：列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614a)
|
2023-09-20 12:12:58 +08:00 |
|
puhui999
|
300cfe694b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit 83e780da06)
|
2023-09-20 12:12:55 +08:00 |
|
puhui999
|
99ef6f83ba
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b)
|
2023-09-20 12:12:52 +08:00 |
|
puhui999
|
8a7b6e2be1
|
订单列表：列表重构 ④ 移除测试数据
(cherry picked from commit ebcbe63d9b)
|
2023-09-20 12:11:53 +08:00 |
|
puhui999
|
9efe122318
|
订单列表：列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85)
|
2023-09-20 12:11:09 +08:00 |
|
puhui999
|
c89d08e22a
|
订单列表：列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6c)
|
2023-09-20 12:10:57 +08:00 |
|
YunaiV
|
5fd150ad84
|
优化商品属性的编辑按钮
(cherry picked from commit 1db98698bd)
|
2023-09-20 12:08:44 +08:00 |
|
puhui999
|
21643274cb
|
订单列表：列表重构 ①
(cherry picked from commit 2eb740765e)
|
2023-09-19 21:03:26 +08:00 |
|
puhui999
|
1854e891cb
|
fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce)
|
2023-09-19 20:53:01 +08:00 |
|
zws
|
beb13d65d8
|
fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW
(cherry picked from commit c368c9b232)
|
2023-09-19 20:52:42 +08:00 |
|
YunaiV
|
cfef155ee2
|
商城：
1. 微调砍价活动的代码
(cherry picked from commit 7bf3e41c61)
|
2023-09-19 20:50:54 +08:00 |
|
YunaiV
|
81d8e36ccc
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
(cherry picked from commit 127e6b202e)
|
2023-09-19 20:50:49 +08:00 |
|
YunaiV
|
ffc797ae31
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
(cherry picked from commit ff8bde207d)
|
2023-09-19 20:50:41 +08:00 |
|
YunaiV
|
0fd07c0cbc
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
(cherry picked from commit 9984de0dc7)
|
2023-09-19 20:50:06 +08:00 |
|
YunaiV
|
00829471be
|
商城：优惠劵的前端完善
(cherry picked from commit 815897ca8b)
|
2023-09-19 20:49:56 +08:00 |
|
shizhong
|
49e28e7b02
|
修复时间检索，value format 错误，导致无法搜索的问题
|
2023-09-19 20:49:04 +08:00 |
|
puhui999
|
541fc97796
|
feat: 完善砍价活动管理
(cherry picked from commit 4947716983)
|
2023-09-19 20:36:04 +08:00 |
|
xingyu
|
c4fd56dbcd
|
fix: dialog
(cherry picked from commit 003751a41c)
|
2023-09-19 20:31:53 +08:00 |
|
puhui999
|
da5ad39251
|
fix: combinationActivity 调整
(cherry picked from commit c327f79177)
|
2023-09-19 20:24:40 +08:00 |
|
puhui999
|
67baf1e0a5
|
fix: 修正 combinationActivity.data.ts
(cherry picked from commit 73b918b4e9)
|
2023-09-19 20:24:15 +08:00 |
|
xingyu
|
c7d6d35642
|
fix: eslint
(cherry picked from commit 8e78975521)
|
2023-09-19 20:02:03 +08:00 |
|
YunaiV
|
2104de6a71
|
review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e39)
|
2023-07-27 19:51:42 +08:00 |
|
puhui999
|
84d538ad69
|
fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1)
|
2023-07-27 19:45:36 +08:00 |
|
puhui999
|
85cc7cdb46
|
fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e)
|
2023-07-27 19:43:51 +08:00 |
|
puhui999
|
a507f26664
|
fix: mall SeckillActivity
(cherry picked from commit b67fabcf1f)
|
2023-07-27 19:41:28 +08:00 |
|
puhui999
|
0394f81dab
|
fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 4057130275)
|
2023-07-27 19:41:21 +08:00 |
|
puhui999
|
d1cc7d134b
|
fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6ce)
|
2023-07-27 19:41:03 +08:00 |
|
puhui999
|
de53abb249
|
fix: mall SeckillActivity
(cherry picked from commit 36c0bce184)
|
2023-07-27 19:40:57 +08:00 |
|
puhui999
|
1ab348f8df
|
fix: mall SeckillActivity
(cherry picked from commit b98149f1a7)
|
2023-07-27 19:40:48 +08:00 |
|
YunaiV
|
401112f668
|
review 秒杀活动
(cherry picked from commit b1ce2672e4)
|
2023-07-27 19:37:02 +08:00 |
|
puhui999
|
22f869db89
|
feat: mall CombinationActivity
(cherry picked from commit 2e96b1c984)
|
2023-07-27 19:36:45 +08:00 |
|
puhui999
|
bc35b0c80f
|
fix: 完善 mall seckillActivity add
(cherry picked from commit 341303b014)
|
2023-07-27 19:35:21 +08:00 |
|
puhui999
|
1d0d9d24ad
|
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc)
|
2023-07-27 19:35:12 +08:00 |
|
puhui999
|
670ebb8ba5
|
fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式
(cherry picked from commit 76ccc54a35)
|
2023-07-27 19:35:01 +08:00 |
|
YunaiV
|
a22eea8e90
|
review 营销活动
(cherry picked from commit 5d613e69b3)
|
2023-07-27 19:34:54 +08:00 |
|
puhui999
|
70c2fe409c
|
fix：完善秒杀活动管理①
(cherry picked from commit b1e7f14963)
|
2023-07-27 19:33:06 +08:00 |
|
YunaiV
|
2fdcdf983a
|
review 订单
(cherry picked from commit 0395b8f138)
|
2023-07-27 19:32:55 +08:00 |
|
YunaiV
|
d32d3fb2ed
|
合并 master 代码的冲突
(cherry picked from commit e1b1c134d9)
|
2023-07-27 19:32:36 +08:00 |
|
shizhong
|
419a572e80
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-07-27 19:32:27 +08:00 |
|
puhui999
|
7da1b04ae2
|
feat：添加秒杀活动管理
(cherry picked from commit 3d47d6744e)
|
2023-07-27 19:27:44 +08:00 |
|
shizhong
|
a35fd3ec62
|
提交订单列表和详情20230619
|
2023-07-27 19:17:22 +08:00 |
|
xiaobai
|
1b5c983d1d
|
提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b5)
|
2023-07-27 19:15:56 +08:00 |
|
puhui999
|
0f9629707f
|
feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226)
|
2023-07-27 19:14:57 +08:00 |
|
puhui999
|
a233d16dbb
|
feat: 秒杀时段管理
(cherry picked from commit a75720ec06)
|
2023-07-27 19:14:47 +08:00 |
|
YunaiV
|
b6dff5f976
|
code review：订单详情
(cherry picked from commit 91c53e2e3f)
|
2023-07-27 19:14:39 +08:00 |
|
YunaiV
|
8bf1f04044
|
code review：订单列表
(cherry picked from commit e3f250fff0)
|
2023-07-27 19:11:50 +08:00 |
|
YunaiV
|
1fad4f626c
|
code review：spu todo 去掉
(cherry picked from commit ae69492b53)
|
2023-07-27 19:09:57 +08:00 |
|
puhui999
|
6976c26c37
|
fix: 完善 SPU 相关路由 review
(cherry picked from commit d31ade7a5f)
|
2023-07-27 19:04:38 +08:00 |
|
puhui999
|
9d8e0d507b
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
(cherry picked from commit 20f3f72670)
|
2023-07-27 19:02:29 +08:00 |
|