427 Commits

Author SHA1 Message Date
kehaiyou
6888fd90d1 feat: 支持回退按钮
(cherry picked from commit de79e79d91f4949df9314f2238a30c9bd319eafe)
2023-09-25 13:15:55 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e703c238056bd7a91a2f1f117ef5d5eea)
2023-09-25 12:48:07 +08:00
puhui999
9607127897 spu:分佣属性和分佣保持一致
(cherry picked from commit 5dc0c6e3da8e7d200773d79cb31d699004b6cd6d)
2023-09-25 12:43:15 +08:00
puhui999
2e4cad38bb mall-order:修复 todo 提到的问题
(cherry picked from commit 7e511d1e4f0b7c412245b43bd56f36074564a616)
2023-09-25 12:42:27 +08:00
owen
ad35b40a76 trade: 分销业务后台功能:修改上级推广人
(cherry picked from commit 5ed909263a55ed41b6c31befebeb2eae115bf7a7)
2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能:清除推广员、修改推广资格
(cherry picked from commit 7ea35713566f786fd398e72121174bebfc4ab139)
2023-09-25 12:42:04 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea3959164c2b5719bb906ee5408e92890981b)
2023-09-25 12:41:27 +08:00
YunaiV
58f01a8bc5 code review:完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 3c315cf28799362c1d8b34fdf862b1fadf7db3ad)
2023-09-25 12:38:53 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称
(cherry picked from commit e9d5027e72d86c308b766d08936e15d4217301c1)
2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称
(cherry picked from commit 726331541222c7822695b88f709a7db8f1df9d10)
2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理
(cherry picked from commit 34ce7f7ec512eaa42bf86b04ddf2e67c082ecdde)
2023-09-25 12:38:18 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 1e2120806d26f0749b89329b0dd94f0fa5d15edc)
2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 2ed5d12be8c01bf8ed280086ef5b870f82553966)
2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表
(cherry picked from commit 35664d1f3296712e741b4f7e93830c4fdd76e799)
2023-09-25 12:30:09 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98d475039aedf296c426e164d53e6220)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b44569f48eef2c2fb2bef3b87864a36f)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c0a2c12cabd0416638313f9f4942db7)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
2023-09-25 12:24:59 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5e06f9734bbc90ef4b4fe31b6bd9e25)
2023-09-20 12:39:13 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b9d292643672666fa06363e0c6c8908)
2023-09-20 12:38:35 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5829fb3fa2eff0b1b9955c96e0ebe6d)
2023-09-20 12:34:53 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff272f2bde5275a74d4d2b99362e19648)
2023-09-20 12:32:48 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833f49fa60acc2d7809f2f7497230a2e4)
2023-09-20 12:30:42 +08:00
puhui999
c738fd417a 订单售后列表:完善售后详情及相关操作
(cherry picked from commit ed739aec551cb6fad7a462cbd24e8bdea4b99b28)
2023-09-20 12:30:14 +08:00
puhui999
52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771472ebe7ccf21ad986d03c4e4b354e4)
2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表:重构列表
(cherry picked from commit 4f81468695f19586aef9a3bbf4ed93dd13d697a3)
2023-09-20 12:25:50 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a9478dd43c2c91d537097c169e3c156c7)
2023-09-20 12:25:36 +08:00
YunaiV
4ffc150701 code review:会员中心
(cherry picked from commit 2d8d32376703162daacb7c47841ebffd1263cb99)
2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7461418c1d7822280948083f6f9b168)
2023-09-20 12:23:26 +08:00
YunaiV
e97a62fe06 code review:用户详情
(cherry picked from commit 1b6c9b2e2939a853e59843d5b9f321652bb38da8)
2023-09-20 12:22:09 +08:00
owen
1a49567613 商品:完善后台商品评论功能
(cherry picked from commit 814b4631c944a4657128210378bda40294628b3f)
2023-09-20 12:19:40 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
(cherry picked from commit 28951fb31d05de22ff264d1734852fa6013d0aa5)
2023-09-20 12:19:00 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
2023-09-20 12:18:16 +08:00
owen
4de2049956 会员: 会员等级取消分页功能
(cherry picked from commit e9120f06cf20e5c8708a42809050497278cec679)
2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review:用户详情
(cherry picked from commit 55772cbba0d0729fd864f9cf338baabcba1e41d0)
2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review:会员等级
(cherry picked from commit bb0c1cb536494f87b61e15323826cb2bbecb2099)
2023-09-20 12:13:05 +08:00
puhui999
edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614ab3804196f0ad7ad103ac347bc6fe9a)
2023-09-20 12:12:58 +08:00
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
2023-09-20 12:12:52 +08:00
绮梦
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。

(cherry picked from commit 10d9f11fbaef14685b3860ed6fa1669b36637d9d)
2023-09-20 12:12:11 +08:00
owen
2b67180f80 会员: 修改会员等级,使用单独的表单、接口
(cherry picked from commit 51738f8f6e60b59666c3c9ace97d251a051bcb14)
2023-09-20 12:12:02 +08:00
puhui999
9efe122318 订单列表:列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85782b97c03827fa26b9716ad9727d4f)
2023-09-20 12:11:09 +08:00
owen
b74d4df4f8 会员:增加用户分组
(cherry picked from commit 78917cd2be0d34dbbf4baab040f0cb83cec910ee)
2023-09-20 12:11:04 +08:00
puhui999
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
2023-09-20 12:10:57 +08:00
owen
788cba3bc5 会员:用户标签增加下拉框使用的 精简信息列表查询接口
(cherry picked from commit 884bb055b054408a019c9c1ef7992e3d2c446390)
2023-09-20 12:09:04 +08:00
owen
9b15c04efc 会员:后台调整会员等级
(cherry picked from commit 7bef2409262a4075b51b5dbc14d275b5cc3f0a0e)
2023-09-20 12:08:53 +08:00
YunaiV
e27733aed8 code review:签到记录
(cherry picked from commit be485cc4aba71df1127557eaa5187a2099a55692)
2023-09-19 21:04:40 +08:00
YunaiV
57df63dc35 code review:签到配置
(cherry picked from commit 82628ce78083d04edc7c9521f61bdb4d7abfbfbe)
2023-09-19 21:04:29 +08:00