owen
|
6508d841f5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-30 22:08:45 +08:00 |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
2023-09-30 15:50:12 +08:00 |
|
owen
|
940a102546
|
会员：会员详情-推广用户列表
|
2023-09-30 14:10:15 +08:00 |
|
owen
|
b48f19c646
|
会员：会员详情-优惠券列表
|
2023-09-30 13:55:42 +08:00 |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
2023-09-30 12:40:21 +08:00 |
|
芋道源码
|
654094b4fd
|
!258 交易统计
Merge pull request !258 from 疯狂的世界/dev
|
2023-09-30 03:24:07 +00:00 |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-29 21:08:48 +08:00 |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
2023-09-29 21:08:14 +08:00 |
|
owen
|
150c77cff0
|
fix eslint problems
|
2023-09-29 16:25:38 +08:00 |
|
YunaiV
|
fb94ae9674
|
trade：退款理由的维护
|
2023-09-29 13:35:52 +08:00 |
|
kehaiyou
|
a438353308
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
2023-09-29 12:38:53 +08:00 |
|
kehaiyou
|
b1469669e2
|
Merge branch 'feature/bpm-delegate'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
2023-09-29 12:37:32 +08:00 |
|
YunaiV
|
04e02ffbd2
|
trade：分佣界面的微调
|
2023-09-28 16:38:51 +08:00 |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
2023-09-28 15:29:15 +08:00 |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-27 23:30:48 +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 |
|
芋道源码
|
65047b93a4
|
!250 【工作流】委派
Merge pull request !250 from Youkehai/feature/bpm-delegate
|
2023-09-25 12:10:52 +00:00 |
|
绮梦
|
f832d26a0d
|
站内信测试增加 Member 用户类型支持
|
2023-09-25 16:04:32 +08:00 |
|
shizhong
|
361e4fadda
|
解决处理顶级非目录路由的组件名称逻辑缺失的问题
|
2023-09-25 15:25:33 +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 |
|
芋道源码
|
b9881f2941
|
!252 分销：Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
|
2023-09-25 00:37:31 +00:00 |
|
YunaiV
|
99a0c7c3e7
|
1.8.2 版本发布
|
2023-09-24 23:45:10 +08:00 |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
2023-09-24 23:18:50 +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 |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
2023-09-24 22:32:10 +08: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 |
|
芋道源码
|
795847586a
|
!249 合并最新商城代码
Merge pull request !249 from 芋道源码/dev
|
2023-09-24 04:11:34 +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 |
|
芋道源码
|
be589cfb99
|
!247 Trade: 完善配置
Merge pull request !247 from 疯狂的世界/brokerage
|
2023-09-24 01:55:48 +00: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 |
|
xingyu
|
57a7ed46e7
|
chore: add unocss eslint
|
2023-09-22 17:48:56 +08:00 |
|
xingyu
|
436cc8069c
|
docs: update deps
|
2023-09-22 17:43:45 +08:00 |
|
xingyu
|
ce5f303272
|
chore: update deps
|
2023-09-22 17:42:31 +08:00 |
|
puhui999
|
dd5a1f2d43
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-09-20 16:39:19 +08:00 |
|
芋道源码
|
df6a384321
|
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
|
2023-09-19 17:12:27 +00:00 |
|
芋道源码
|
f63d518d0d
|
!243 订单详情页面 请求详情接口改为真实携带的id
Merge pull request !243 from 风狗/dev
|
2023-09-19 17:11:34 +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 |
|