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 |
|
puhui999
|
2d88367e61
|
fix: review
(cherry picked from commit b89db1af55)
|
2023-07-27 19:02:19 +08:00 |
|
xiaobai
|
b9ba1d36c2
|
20230606 add trade-order and details
(cherry picked from commit 985d764f62)
|
2023-07-27 18:54:36 +08:00 |
|
YunaiV
|
f641785df9
|
code review：优惠劵管理
(cherry picked from commit 51e76ffd53)
|
2023-07-27 18:53:49 +08:00 |
|
puhui999
|
ce62362982
|
fix: 优化 spu 相关路由配置
(cherry picked from commit a1b45f80bc)
|
2023-07-27 18:50:14 +08:00 |
|
YunaiV
|
79a4aa5189
|
code review：商品管理
(cherry picked from commit 158585670c)
|
2023-07-27 18:50:01 +08:00 |
|
YunaiV
|
16c518e18a
|
code review：门店自提、快递运费
(cherry picked from commit 60c1604d49)
|
2023-07-27 18:46:14 +08:00 |
|
xiaobai
|
a29421dd41
|
临时提交
(cherry picked from commit 505f5cfa0c)
|
2023-07-27 18:44:50 +08:00 |
|
dhb52
|
e2faf6a2a4
|
style: 添加VO
(cherry picked from commit c5a7d05821)
|
2023-07-27 18:42:44 +08:00 |
|
puhui999
|
b28bfc4081
|
fix: 修复善品测试发现的问题
(cherry picked from commit 7fb6258bed)
|
2023-07-27 18:36:45 +08:00 |
|
shizhong
|
c2168466f3
|
fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
|
2023-07-27 18:36:06 +08:00 |
|
puhui999
|
144be6ef44
|
fix: 完善 SPU 选择快递模版的功能
(cherry picked from commit 2ddb605076)
|
2023-07-27 13:11:05 +08:00 |
|
puhui999
|
d35ac547ac
|
fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944)
|
2023-07-27 13:10:58 +08:00 |
|
jason
|
9e7fe34ae8
|
新增门店自提管理
(cherry picked from commit 000aa95012)
|
2023-07-27 13:10:46 +08:00 |
|
puhui999
|
cf7f4ff89e
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757)
|
2023-07-27 13:09:36 +08:00 |
|
shizhong
|
c6a9c0c5fb
|
所有菜单的 name 都加上模块的前缀，避免冲突
|
2023-07-10 19:11:15 +08:00 |
|
shizhong
|
6f266fb967
|
给所有组件添加name属性预防未知bug!!!
|
2023-06-13 21:05:25 +08:00 |
|
jason
|
88439669c0
|
运费模板区域改成多选
(cherry picked from commit 70c5082776)
|
2023-06-13 14:15:44 +08:00 |
|
YunaiV
|
6e7ee28079
|
review + mall：快递公司管理
(cherry picked from commit b12aefe46e)
|
2023-06-13 14:15:31 +08:00 |
|
YunaiV
|
dfc3da744f
|
review + mall：商品管理
(cherry picked from commit 349a39e72f)
|
2023-06-13 14:15:28 +08:00 |
|
shizhong
|
61396246a5
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
|
2023-06-13 14:14:42 +08:00 |
|
YunaiV
|
4cd4327bc8
|
review + mall：商品管理
(cherry picked from commit 0fba3fd503)
|
2023-06-13 14:13:55 +08:00 |
|
puhui999
|
4eacb6dd8c
|
fix: 完善善品导出
(cherry picked from commit d877bfd26e)
|
2023-06-13 14:12:49 +08:00 |
|
jason
|
4850c05614
|
运费模板表格样式调整
(cherry picked from commit c296c9e53d)
|
2023-06-13 14:12:45 +08:00 |
|
jason
|
bbe9e667c4
|
运费模板性能优化。区域选择使用懒加载
(cherry picked from commit af2fb4bf5f)
|
2023-06-13 14:12:41 +08:00 |
|
jason
|
90ccc11006
|
mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128)
|
2023-06-13 14:10:52 +08:00 |
|
puhui999
|
c254222b5f
|
fix: 优化相关逻辑，修复遗留bug
(cherry picked from commit 38545e89c6)
|
2023-06-13 14:07:33 +08:00 |
|