47 Commits

Author SHA1 Message Date
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
2023-09-25 12:30:24 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a6609d3698e259f2ab896b519eabf46ee)
2023-09-20 12:42:48 +08:00
owen
117577d9d1 mall:修复优惠券模板,固定日期范围保存失败
(cherry picked from commit 7887be6e92ac8c09bdc78f54dae8f9bb6a4f0f9c)
2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5e06f9734bbc90ef4b4fe31b6bd9e25)
2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall:修复优惠券发券弹窗样式
(cherry picked from commit a68acb096fd130b87ff10d264da21af7865cb437)
2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5d731d3419e9adee60c4a7b3cb4213c)
2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd09296d15c0c20e057619c477450ac2)
2023-09-20 12:38:39 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b9d292643672666fa06363e0c6c8908)
2023-09-20 12:38:35 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833f49fa60acc2d7809f2f7497230a2e4)
2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall:优惠券 商品选择组件
(cherry picked from commit 60d2e3114b4e6d41e0790c06ad02f93ce5f9eec9)
2023-09-20 12:30:37 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a9478dd43c2c91d537097c169e3c156c7)
2023-09-20 12:25:36 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
2023-09-20 12:18:16 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
2023-09-20 12:14:05 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce3159b525d17ab7abbd931c114867e8)
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 c368c9b232f8770171fbdd7a13905aa2c88e6619)
2023-09-19 20:52:42 +08:00
YunaiV
cfef155ee2 商城:
1. 微调砍价活动的代码

(cherry picked from commit 7bf3e41c6189776b129670d44c9b40ecce2f86d5)
2023-09-19 20:50:54 +08:00
YunaiV
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202edce8b41cdcd3e726eb4fde45b12441)
2023-09-19 20:50:49 +08:00
YunaiV
ffc797ae31 商城:
1. 修复秒杀活动,修改商品的秒杀价格,会存在 *100 的问题

(cherry picked from commit ff8bde207ddb0d46cc2bba1cbc03250242f7251e)
2023-09-19 20:50:41 +08:00
YunaiV
0fd07c0cbc 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7251779434a5bf95c3aa9aab3c4cd65)
2023-09-19 20:50:06 +08:00
YunaiV
00829471be 商城:优惠劵的前端完善
(cherry picked from commit 815897ca8b94f7b72b93286c6d5ba36c3933b9a1)
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 49477169837c87c5590ee4c31945d285792a7375)
2023-09-19 20:36:04 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177f000edab15c8304d73ed5bc7c910bd)
2023-09-19 20:24:40 +08:00
puhui999
67baf1e0a5 fix: 修正 combinationActivity.data.ts
(cherry picked from commit 73b918b4e9c2af6a571ced7f2653c254b6e0182c)
2023-09-19 20:24:15 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e7897552193e6aa4112ac27d5a1dc76fae645e8)
2023-09-19 20:02:03 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e3920dfd4a3536b7314857a5c2f5838fd)
2023-07-27 19:51:42 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1b5bc4a12983b971449ca1a6792d4b9)
2023-07-27 19:45:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)
2023-07-27 19:43:51 +08:00
puhui999
a507f26664 fix: mall SeckillActivity
(cherry picked from commit b67fabcf1f774b8d2a1117e05a3c29c4b7d5119d)
2023-07-27 19:41:28 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6cef7dbe18b224f831be4fae75d9407b2)
2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce1845b288ec1ea2f5f1528c07247502c21)
2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a75058edc9e85914772a1ae4cacf479d)
2023-07-27 19:40:48 +08:00
YunaiV
401112f668 review 秒杀活动
(cherry picked from commit b1ce2672e418cc9a970992787d5ba405c92d5070)
2023-07-27 19:37:02 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
2023-07-27 19:36:45 +08:00
puhui999
bc35b0c80f fix: 完善 mall seckillActivity add
(cherry picked from commit 341303b014f1d24baf132575763d20a4a08c4b1c)
2023-07-27 19:35:21 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式
(cherry picked from commit 76ccc54a350a6183b6aa89599d3e010b467263b6)
2023-07-27 19:35:01 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
2023-07-27 19:33:06 +08:00
puhui999
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
2023-07-27 19:27:44 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
2023-07-27 19:14:47 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
2023-07-27 18:53:49 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821d4eae7197cbd0dba66f544ee214ecc)
2023-07-27 18:42:44 +08:00