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 |
|
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 |
|
puhui999
|
4410bdd93c
|
fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52)
|
2023-06-13 14:07:22 +08:00 |
|
jason
|
4ec3d3fe72
|
新增快递公司菜单
(cherry picked from commit b0984c9013)
|
2023-06-13 14:06:19 +08:00 |
|
puhui999
|
ea4e2a0bcc
|
fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454)
|
2023-06-13 14:06:16 +08:00 |
|
puhui999
|
d73a32106a
|
fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug
(cherry picked from commit 3c4a39df01)
|
2023-06-13 14:06:02 +08:00 |
|
puhui999
|
085dbd6220
|
fix: 修复 SkuList TODO 优化相关算法
(cherry picked from commit 9c06832d7e)
|
2023-06-13 14:05:57 +08:00 |
|
puhui999
|
73b2809654
|
fix: 添加商品属性去掉备注
(cherry picked from commit 6ac8c78d57)
|
2023-06-13 14:05:53 +08:00 |
|
puhui999
|
74d926172c
|
fix: 进一步完善商品列表，修复TODO
(cherry picked from commit 52bfc4dac0)
|
2023-06-13 14:05:48 +08:00 |
|
puhui999
|
cafd74193f
|
fix: 移动copyValueToTarget方法到utils/index中
(cherry picked from commit 43e541f944)
|
2023-06-13 14:05:38 +08:00 |
|
YunaiV
|
7a5993c584
|
code review 商品管理的实现
(cherry picked from commit e92361ed40)
|
2023-06-13 13:56:48 +08:00 |
|
puhui999
|
b9fd7b7753
|
商品管理: 打通所有接口（第一版）
(cherry picked from commit 0c6e3a39c9)
|
2023-06-13 13:56:04 +08:00 |
|
puhui999
|
263ca68ff1
|
商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显
(cherry picked from commit 9ee35fc165)
|
2023-06-13 13:55:51 +08:00 |
|
puhui999
|
2152573c5e
|
商品管理: 调整相关组件优化逻辑
(cherry picked from commit 1116fb278b)
|
2023-06-13 13:55:48 +08:00 |
|
puhui999
|
72fd0b8ed5
|
商品管理: 调整相关组件优化逻辑
(cherry picked from commit 6478d295df)
|
2023-06-13 13:55:44 +08:00 |
|
puhui999
|
cb45ea0753
|
商品管理: 完成商品属性批量添加
(cherry picked from commit 64f6f67ddd)
|
2023-06-13 13:55:20 +08:00 |
|
puhui999
|
d37540de1d
|
商品管理: 完成商品属性排列组合算法生成对应表数据
(cherry picked from commit ab1120b0ff)
|
2023-06-13 13:55:17 +08:00 |
|
puhui999
|
84ed1f7df3
|
商品管理: 保存属性值到数据库
(cherry picked from commit 35c3545e7c)
|
2023-06-13 13:55:13 +08:00 |
|
puhui999
|
4bb39f2578
|
商品管理: fix:根据商品属性动态生成表格值
(cherry picked from commit 538d1e0b6c)
|
2023-06-13 13:54:58 +08:00 |
|
puhui999
|
7368bd8c2a
|
商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug
(cherry picked from commit 7a64eb5198)
|
2023-06-13 13:54:51 +08:00 |
|
puhui999
|
1a2d7a2f0e
|
商品管理: 初步完成相关组件
(cherry picked from commit 61218ae711)
|
2023-06-13 13:54:08 +08:00 |
|
puhui999
|
7a1a4e82d0
|
商品管理: 完善选择商品分类
(cherry picked from commit ab1685a741)
|
2023-06-13 13:53:11 +08:00 |
|
puhui999
|
083a0c4760
|
商品管理: 完善表单校验，优化信息提示，完成新建、编辑、提交逻辑
(cherry picked from commit c38abc365c)
|
2023-06-13 13:52:42 +08:00 |
|
YunaiV
|
6e604f9e07
|
调整商品分类的实现
(cherry picked from commit 9680a204ca)
|
2023-06-13 13:50:37 +08:00 |
|
puhui999
|
3c220cdb63
|
商品管理初始界面结构设计
(cherry picked from commit a0014bed65)
|
2023-06-13 13:48:52 +08:00 |
|
YunaiV
|
4f89c1edfe
|
REVIEW 商品品牌
(cherry picked from commit 1e0f613449)
|
2023-06-13 12:00:03 +08:00 |
|
Aix
|
7992cd951e
|
【feature】新增商品品牌功能
(cherry picked from commit ef4f6bda5c)
|
2023-06-13 11:59:25 +08:00 |
|
shizhong
|
7cfb09fe3c
|
命名
|
2023-06-13 10:56:20 +08:00 |
|
YunaiV
|
b18bf8a95f
|
REVIEW 商品属性
|
2023-04-02 09:46:45 +08:00 |
|
YunaiV
|
5a5202d483
|
REVIEW 商品属性
|
2023-04-02 01:25:31 +08:00 |
|
芋道源码
|
616243a0ab
|
!83 商品属性模块
Merge pull request !83 from 孔思宇/feat/mall-product-property
|
2023-04-01 16:25:24 +00:00 |
|
YunaiV
|
00c3133391
|
REVIEW 商品分类
|
2023-04-02 00:17:56 +08:00 |
|
Siyu Kong
|
1724f2c674
|
feat: 新增商品属性(值)模块页面
|
2023-03-30 16:58:06 +08:00 |
|
Siyu Kong
|
b8ce330c12
|
feat: 新增产品分类模块页面&api
|
2023-03-28 20:35:31 +08:00 |
|