Commit Graph

161 Commits

Author SHA1 Message Date
puhui999
4dda8d2ab7 order:完善订单聚合搜索
(cherry picked from commit 615763d415)
2023-09-25 12:43:09 +08:00
puhui999
2e4cad38bb mall-order:修复 todo 提到的问题
(cherry picked from commit 7e511d1e4f)
2023-09-25 12:42:27 +08:00
owen
fc77eb3b89 trade: 分销业务后台功能:佣金格式化
(cherry picked from commit 87ca916e69)
2023-09-25 12:42:13 +08:00
owen
ad35b40a76 trade: 分销业务后台功能:修改上级推广人
(cherry picked from commit 5ed909263a)
2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能:清除推广员、修改推广资格
(cherry picked from commit 7ea3571356)
2023-09-25 12:42:04 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea39591)
2023-09-25 12:41:27 +08:00
YunaiV
58f01a8bc5 code review:完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 3c315cf287)
2023-09-25 12:38:53 +08:00
owen
ba8840de4f trade: 分销员表格佣金字段格式化
(cherry picked from commit dbb87e3850)
2023-09-25 12:38:37 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称
(cherry picked from commit e9d5027e72)
2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称
(cherry picked from commit 7263315412)
2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理
(cherry picked from commit 34ce7f7ec5)
2023-09-25 12:38:18 +08:00
puhui999
241f4ec092 完善订单详情
(cherry picked from commit b3639977a7)
2023-09-25 12:38:06 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d3930)
2023-09-25 12:30:24 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 2ed5d12be8)
2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表
(cherry picked from commit 35664d1f32)
2023-09-25 12:30:09 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a)
2023-09-25 12:24:59 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a66)
2023-09-20 12:42:48 +08:00
owen
117577d9d1 mall:修复优惠券模板,固定日期范围保存失败
(cherry picked from commit 7887be6e92)
2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5)
2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall:修复优惠券发券弹窗样式
(cherry picked from commit a68acb096f)
2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5)
2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd)
2023-09-20 12:38:39 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b)
2023-09-20 12:38:35 +08:00
YunaiV
04a16dbb7d code review:订单列表
(cherry picked from commit 0743e4941c)
2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5)
2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款:完善售后管理(列表、详情)
(cherry picked from commit 07a0530fc9)
2023-09-20 12:34:48 +08:00
puhui999
ad2c6654c1 fix: 修正合并差异
(cherry picked from commit 3e7945e437)
2023-09-20 12:34:38 +08:00
YunaiV
27bdeb9b50 code review
(cherry picked from commit 3918fab1ec)
2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
(cherry picked from commit f9780b636c)
2023-09-20 12:33:46 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由
(cherry picked from commit 264a29e451)
2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表:添加配送方式筛选
(cherry picked from commit 688dad319e)
2023-09-20 12:33:30 +08:00
puhui999
ca94a1f274 商品列表:修复添加属性时会返回已存在属性值的问题
(cherry picked from commit 5c7796ca6f)
2023-09-20 12:33:25 +08:00
puhui999
95f0a06667 订单售后列表:完善部分 TODO
(cherry picked from commit f5a1772464)
2023-09-20 12:33:19 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff2)
2023-09-20 12:32:48 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833)
2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall:优惠券 商品选择组件
(cherry picked from commit 60d2e3114b)
2023-09-20 12:30:37 +08:00
puhui999
c738fd417a 订单售后列表:完善售后详情及相关操作
(cherry picked from commit ed739aec55)
2023-09-20 12:30:14 +08:00
YunaiV
ed41a9bed6 重构:商品详情界面的路由、文件路径
(cherry picked from commit 8d026f0837)
2023-09-20 12:30:02 +08:00
puhui999
52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771)
2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表:重构列表
(cherry picked from commit 4f81468695)
2023-09-20 12:25:50 +08:00
puhui999
109e18dba6 订单列表: 修复差异
(cherry picked from commit 8239ca474f)
2023-09-20 12:25:45 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a94)
2023-09-20 12:25:36 +08:00
YunaiV
b9c0d4ffa5 code review:商品评论
(cherry picked from commit 5cd01903e4)
2023-09-20 12:24:24 +08:00
owen
ae0982ee44 商品评论:回复表单提取到单独的组件中
(cherry picked from commit 3a15390090)
2023-09-20 12:23:12 +08:00
owen
9f4751b1d7 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下

(cherry picked from commit 15971b6feb)
2023-09-20 12:23:04 +08:00
YunaiV
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6)
2023-09-20 12:22:48 +08:00
YunaiV
0e36aea9ff code review:商品评论
(cherry picked from commit 84c5eb9942)
2023-09-20 12:22:22 +08:00