67 Commits

Author SHA1 Message Date
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e703c238056bd7a91a2f1f117ef5d5eea)
2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改
(cherry picked from commit 18b6c70d1a2354f930cea3f388a1c28903ef1f1a)
2023-09-25 12:48:04 +08:00
绮梦
8d06ee2b39 订单详情页面 请求详情接口改为真实携带的id
(cherry picked from commit 245301452cd6522c578ae877397f88cace39634c)
2023-09-25 12:47:58 +08:00
YunaiV
da5ea7c43b code review:订单相关的逻辑
(cherry picked from commit 8b65a2866e19b00fdcb5ef85bd9027bf2f6a1151)
2023-09-25 12:46:49 +08:00
owen
52def241f8 trade: 分销业务review代码修改
(cherry picked from commit 2e830d14d55b65a859306f4cc6982b9ee9ac9d14)
2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能:推广订单列表
(cherry picked from commit 0582d41972cedcf4932348f64032cf0b9e43712c)
2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能:推广用户列表
(cherry picked from commit 2aa372d8f4319959fb6a4b660034c9905668562e)
2023-09-25 12:43:19 +08:00
puhui999
4dda8d2ab7 order:完善订单聚合搜索
(cherry picked from commit 615763d4156d04dded8281e905433a011b063ef5)
2023-09-25 12:43:09 +08:00
puhui999
2e4cad38bb mall-order:修复 todo 提到的问题
(cherry picked from commit 7e511d1e4f0b7c412245b43bd56f36074564a616)
2023-09-25 12:42:27 +08:00
owen
fc77eb3b89 trade: 分销业务后台功能:佣金格式化
(cherry picked from commit 87ca916e69f2b3c6996b9e5e1d9aacfb5ccb6053)
2023-09-25 12:42:13 +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
ba8840de4f trade: 分销员表格佣金字段格式化
(cherry picked from commit dbb87e385038eacfa3b4a2ce7dd6f9c42dbb0c6f)
2023-09-25 12:38:37 +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
241f4ec092 完善订单详情
(cherry picked from commit b3639977a719ff103f98e165b14f6190a32ace47)
2023-09-25 12:38:06 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
2023-09-25 12:30:24 +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
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
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
YunaiV
04a16dbb7d code review:订单列表
(cherry picked from commit 0743e4941c3a1cc232a2f11545aefb6e563d1942)
2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5829fb3fa2eff0b1b9955c96e0ebe6d)
2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款:完善售后管理(列表、详情)
(cherry picked from commit 07a0530fc92021c4a7080a37402c9bb5242f4446)
2023-09-20 12:34:48 +08:00
YunaiV
27bdeb9b50 code review
(cherry picked from commit 3918fab1ec69793f7e3a6e1b3cc86fa5f30d987e)
2023-09-20 12:34:16 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由
(cherry picked from commit 264a29e4515c67d011663a70c7ab3f191e20bd4b)
2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表:添加配送方式筛选
(cherry picked from commit 688dad319edb7bdc7a07f4d2b8992317df620ff4)
2023-09-20 12:33:30 +08:00
puhui999
95f0a06667 订单售后列表:完善部分 TODO
(cherry picked from commit f5a177246480702ecc3745aabdc3a9806fc8125d)
2023-09-20 12:33:19 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff272f2bde5275a74d4d2b99362e19648)
2023-09-20 12:32:48 +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
puhui999
109e18dba6 订单列表: 修复差异
(cherry picked from commit 8239ca474fa0aa0622df02c0c82067aadddf7263)
2023-09-20 12:25:45 +08:00
YunaiV
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
2023-09-20 12:22:48 +08:00
puhui999
41be920135 订单列表:优化订单列表页面结构
(cherry picked from commit 58502b12410844a054b638f39149f211c5d88e49)
2023-09-20 12:18:24 +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
edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614ab3804196f0ad7ad103ac347bc6fe9a)
2023-09-20 12:12:58 +08:00
puhui999
300cfe694b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit 83e780da06daf38da658c1745bc963e90b9b7209)
2023-09-20 12:12:55 +08:00
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
2023-09-20 12:12:52 +08:00
puhui999
8a7b6e2be1 订单列表:列表重构 ④ 移除测试数据
(cherry picked from commit ebcbe63d9b0ae095e6cb6002c6564f6603b30536)
2023-09-20 12:11:53 +08:00
puhui999
9efe122318 订单列表:列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85782b97c03827fa26b9716ad9727d4f)
2023-09-20 12:11:09 +08:00
puhui999
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
2023-09-20 12:10:57 +08:00
puhui999
21643274cb 订单列表:列表重构 ①
(cherry picked from commit 2eb740765e76e7ea4e4559de5441e2c3e7c9993e)
2023-09-19 21:03:26 +08:00