Commit Graph

945 Commits

Author SHA1 Message Date
xingyu
592d902529 chore: add unocss eslint
(cherry picked from commit 57a7ed46e7)
2023-09-25 12:48:33 +08:00
xingyu
86695606ab docs: update deps
(cherry picked from commit 436cc8069c)
2023-09-25 12:48:30 +08:00
xingyu
78f85d96d2 chore: update deps
(cherry picked from commit ce5f303272)
2023-09-25 12:48:22 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e70)
2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改
(cherry picked from commit 18b6c70d1a)
2023-09-25 12:48:04 +08:00
绮梦
8d06ee2b39 订单详情页面 请求详情接口改为真实携带的id
(cherry picked from commit 245301452c)
2023-09-25 12:47:58 +08:00
YunaiV
96a96b1a5d 增加 404 的说明
(cherry picked from commit 1be57ea8d3)
2023-09-25 12:47:49 +08:00
YunaiV
da5ea7c43b code review:订单相关的逻辑
(cherry picked from commit 8b65a2866e)
2023-09-25 12:46:49 +08:00
owen
52def241f8 trade: 分销业务review代码修改
(cherry picked from commit 2e830d14d5)
2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能:推广订单列表
(cherry picked from commit 0582d41972)
2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能:推广用户列表
(cherry picked from commit 2aa372d8f4)
2023-09-25 12:43:19 +08:00
puhui999
9607127897 spu:分佣属性和分佣保持一致
(cherry picked from commit 5dc0c6e3da)
2023-09-25 12:43:15 +08:00
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
puhui999
3f0ec5cf16 登录界面:姐姐点击登录后界面疯狂闪动的问题
(cherry picked from commit a79f1452b3)
2023-09-25 12:41:45 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea39591)
2023-09-25 12:41:27 +08:00
shizhong
fa0c84da02 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-25 12:40:29 +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
b398062102 trade: 分销业务从 member 模块 转移到 trade模块
(cherry picked from commit 1e2120806d)
2023-09-25 12:30:17 +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
绮梦
9295030153 新增用户详情下订单页面
(cherry picked from commit 2318f176a6)
2023-09-25 12:29:17 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b4)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a)
2023-09-25 12:24:59 +08:00
芋道源码
563c3eeddf
!246 解决keep alive不生效问题,改为vue3.3 defineOptions
Merge pull request !246 from clockdotnet/master-vxe
2023-09-22 13:49:08 +00:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +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
芋道源码
6ec2ee8af4
!245 合并master上1.8.1的修改到master-vxe
Merge pull request !245 from clockdotnet/master-vxe
2023-09-20 14:28:20 +00:00
shizhong
ee44bef034 样式 2023-09-20 17:36:08 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
xingyu
4a0e850f42 fix: stylelint
(cherry picked from commit 4ae1722e72)
2023-09-20 12:42:56 +08:00
xingyu
b2f813aa29 chore: vscode setting
(cherry picked from commit 2035484a83)
2023-09-20 12:42:52 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a66)
2023-09-20 12:42:48 +08:00
xingyu
ba6544a8c3 fix: #I7WY9N
(cherry picked from commit 56a71f64e7)
2023-09-20 12:42:42 +08:00
xingyu
0b7593fbd4 fix: avatar
(cherry picked from commit 9a6d29b295)
2023-09-20 12:42:31 +08:00
xingyu
3630ff4e9b chore: 1.8.1-snapshot
(cherry picked from commit 1fe950aea5)
2023-09-20 12:42:23 +08:00
xingyu
d3571369c8 docs: update version
(cherry picked from commit 8f0c6625de)
2023-09-20 12:41:40 +08:00