Commit Graph

1260 Commits

Author SHA1 Message Date
YunaiV
8b65a2866e code review:订单相关的逻辑 2023-09-12 23:14:53 +08:00
芋道源码
ef15261926
!240 完善前端 mall-order 模块相关问题
Merge pull request !240 from puhui999/dev-to-dev
2023-09-12 15:08:34 +00:00
xingyu
4ae1722e72 fix: stylelint 2023-09-11 17:08:57 +08:00
xingyu
2035484a83 chore: vscode setting 2023-09-11 17:08:48 +08:00
xingyu
5494756a66 fix: eslint 2023-09-11 17:08:39 +08:00
xingyu
56a71f64e7 fix: #I7WY9N 2023-09-11 16:55:49 +08:00
xingyu
9a6d29b295 fix: avatar 2023-09-11 16:54:34 +08:00
xingyu
1fe950aea5 chore: 1.8.1-snapshot 2023-09-11 16:47:19 +08:00
xingyu
8f0c6625de docs: update version 2023-09-11 16:23:31 +08:00
xingyu
4664014fc4 chore: update deps 2023-09-11 16:22:11 +08:00
xingyu
4c5d0392d7 chore: vscode setting 2023-09-11 16:22:05 +08:00
owen
2e830d14d5 trade: 分销业务review代码修改 2023-09-11 00:54:11 +08:00
owen
0582d41972 trade: 分销业务后台功能:推广订单列表 2023-09-10 23:30:43 +08:00
owen
2aa372d8f4 trade: 分销业务后台功能:推广用户列表 2023-09-10 22:32:38 +08:00
puhui999
5dc0c6e3da spu:分佣属性和分佣保持一致 2023-09-09 23:14:02 +08:00
puhui999
615763d415 order:完善订单聚合搜索 2023-09-09 23:08:28 +08:00
puhui999
7e511d1e4f mall-order:修复 todo 提到的问题 2023-09-09 20:51:33 +08:00
owen
87ca916e69 trade: 分销业务后台功能:佣金格式化 2023-09-09 20:00:56 +08:00
owen
5ed909263a trade: 分销业务后台功能:修改上级推广人 2023-09-09 19:20:12 +08:00
owen
7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 2023-09-09 14:40:06 +08:00
puhui999
a79f1452b3 登录界面:姐姐点击登录后界面疯狂闪动的问题 2023-09-09 14:27:48 +08:00
YunaiV
0e2ea39591 code review:会员详情 2023-09-09 10:06:32 +08:00
YunaiV
30f0c1b351 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
2023-09-09 09:50:13 +08:00
芋道源码
944565a241
!236 update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
Merge pull request !236 from 岁月不经谈/N/A
2023-09-09 01:47:40 +00:00
芋道源码
e3b9a15c26
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
2023-09-09 01:46:05 +00:00
YunaiV
3c315cf287 code review:完善订单详情和售后退款 TODO 提到的问题 2023-09-09 01:44:08 +08:00
芋道源码
dbfabcbbb5
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
2023-09-08 17:29:05 +00:00
owen
dbb87e3850 trade: 分销员表格佣金字段格式化 2023-09-08 23:58:45 +08:00
芋道源码
1719debd11
!237 分销业务从 member 模块 转移到 trade模块
Merge pull request !237 from 疯狂的世界/brokerage
2023-09-08 15:18:32 +00:00
owen
e9d5027e72 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen
7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:04 +08:00
owen
34ce7f7ec5 trade: 分销用户管理 2023-09-08 11:05:31 +08:00
puhui999
b3639977a7 完善订单详情 2023-09-08 01:01:50 +08:00
puhui999
f44688d61c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-08 01:00:59 +08:00
puhui999
73628d3930 完善订单详情和售后退款 TODO 提到的问题 2023-09-06 11:23:16 +08:00
owen
1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:41:20 +08:00
owen
2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:33:59 +08:00
owen
35664d1f32 trade: 增加交易中心配置表 2023-09-05 22:31:35 +08:00
岁月不经谈
a1ce9eda2a
update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
部门树节点过滤不生效

Signed-off-by: 岁月不经谈 <473831241@qq.com>
2023-09-05 10:14:42 +00:00
绮梦
2318f176a6 新增用户详情下订单页面 2023-09-05 10:15:12 +08:00
芋道源码
d8ca08a348
!235 会员:佣金记录、配置
Merge pull request !235 from 疯狂的世界/brokerage
2023-09-05 01:58:33 +00:00
绮梦
fe6cf7ce98 新增用户详情下成长值页面。 2023-09-04 15:02:41 +08:00
AKING
d74f96fe17
update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
2023-09-04 03:31:35 +00:00
owen
73f8cef3b4 member: 佣金记录 2023-09-03 23:04:20 +08:00
owen
5a9764c08c member: 分销配置 2023-09-03 21:14:44 +08:00
YunaiV
881ec67236 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-09-03 19:25:33 +08:00
芋道源码
067f89f1d4
!226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
2023-09-03 10:56:36 +00:00
芋道源码
130208959d
!231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
2023-09-03 10:55:35 +00:00
puhui999
46fd154e3a 完善订单详情和售后退款日志展示样式重构 2023-09-03 01:44:22 +08:00
owen
7887be6e92 mall:修复优惠券模板,固定日期范围保存失败 2023-09-02 10:42:55 +08:00