Commit Graph

899 Commits

Author SHA1 Message Date
youkehai
62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
kehaiyou
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
YunaiV
888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
YunaiV
c6031ba2b2 增加 user detail 的 todo 2023-09-27 23:30:09 +08:00
youkehai
0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
youkehai
2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00
YunaiV
245147223f code review:驳回逻辑 2023-09-24 23:05:33 +08:00
芋道源码
ada93a160b
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
2023-09-24 14:45:54 +00:00
kehaiyou
f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 2023-09-24 19:42:53 +08:00
kehaiyou
20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
芋道源码
0ffd07447b
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
2023-09-24 07:18:26 +00:00
YunaiV
ce78336fca Merge remote-tracking branch 'origin/dev' into dev 2023-09-24 12:10:14 +08:00
YunaiV
539f8a5bb5 修复 member 详情无法展示的问题 2023-09-24 12:10:03 +08:00
YunaiV
e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
2023-09-24 12:00:10 +08:00
kehaiyou
de79e79d91 feat: 支持回退按钮 2023-09-23 14:52:40 +08:00
owen
21c67b1b75 Trade: 完善配置 2023-09-22 22:51:45 +08:00
xingyu
2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
芋道源码
df6a384321
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
2023-09-19 17:12:27 +00:00
owen
854acf6e70 trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen
18b6c70d1a trade: 分销业务review代码修改 2023-09-19 16:37:50 +08:00
绮梦
245301452c 订单详情页面 请求详情接口改为真实携带的id 2023-09-19 13:57:26 +08:00
YunaiV
1be57ea8d3 增加 404 的说明 2023-09-16 15:14:41 +08:00
xingyu
a6b4908f45
!232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
2023-09-13 11:38:07 +00:00
芋道源码
de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
2023-09-12 15:19:33 +00:00
YunaiV
8b65a2866e code review:订单相关的逻辑 2023-09-12 23:14:53 +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
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
芋道源码
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
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