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 |
|
芋道源码
|
b9881f2941
|
!252 分销：Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
|
2023-09-25 00:37:31 +00: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 |
|
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 |
|
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 |
|
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 |
|
puhui999
|
8778f5746f
|
spu：分佣属性和分佣保持一致
|
2023-09-13 10:17:14 +08: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 |
|
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 |
|
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 |
|
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
2023-09-04 15:02:41 +08:00 |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
2023-09-03 23:04:20 +08:00 |
|
owen
|
5a9764c08c
|
member: 分销配置
|
2023-09-03 21:14:44 +08:00 |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
2023-09-03 01:44:22 +08:00 |
|
owen
|
7887be6e92
|
mall：修复优惠券模板，固定日期范围保存失败
|
2023-09-02 10:42:55 +08:00 |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:36 +08:00 |
|
owen
|
a68acb096f
|
mall：修复优惠券发券弹窗样式
|
2023-09-02 08:39:53 +08:00 |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
2023-09-02 00:34:45 +08:00 |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
2023-09-01 16:33:43 +00:00 |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
2023-09-02 00:12:21 +08:00 |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
2023-09-01 23:50:26 +08:00 |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
2023-09-01 14:55:30 +00:00 |
|
YunaiV
|
0743e4941c
|
code review：订单列表
|
2023-09-01 20:03:08 +08:00 |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
2023-09-01 12:04:33 +08:00 |
|
puhui999
|
07a0530fc9
|
售后退款：完善售后管理（列表、详情）
|
2023-09-01 10:32:05 +08:00 |
|
puhui999
|
3e7945e437
|
fix: 修正合并差异
|
2023-09-01 01:24:46 +08:00 |
|
puhui999
|
5035fc77e7
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# src/views/mall/product/spu/components/index.ts
# src/views/mall/product/spu/form/BasicInfoForm.vue
|
2023-09-01 01:20:08 +08:00 |
|
YunaiV
|
3918fab1ec
|
code review
|
2023-09-01 00:49:42 +08:00 |
|
puhui999
|
dd3c9f8ddb
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-31 21:13:46 +08:00 |
|
puhui999
|
f9780b636c
|
fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
|
2023-08-31 21:13:20 +08:00 |
|
YunaiV
|
135c88a473
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/router/modules/remaining.ts
|
2023-08-31 20:37:20 +08:00 |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
2023-08-31 16:39:48 +08:00 |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
2023-08-31 16:26:24 +08:00 |
|
puhui999
|
5c7796ca6f
|
商品列表：修复添加属性时会返回已存在属性值的问题
|
2023-08-31 15:58:34 +08:00 |
|
puhui999
|
f5a1772464
|
订单售后列表：完善部分 TODO
|
2023-08-31 15:39:13 +08:00 |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
2023-08-30 21:18:46 +08:00 |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
2023-08-30 20:54:20 +08:00 |
|
owen
|
60d2e3114b
|
mall：优惠券 商品选择组件
|
2023-08-30 11:50:21 +08:00 |
|
puhui999
|
eea285b141
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-29 09:49:34 +08:00 |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
2023-08-29 09:48:33 +08:00 |
|
YunaiV
|
8d026f0837
|
重构：商品详情界面的路由、文件路径
|
2023-08-28 18:56:37 +08:00 |
|
xingyu
|
e6a9dd0e4c
|
fix: 个人中心头像为空时不能修改
|
2023-08-28 17:53:45 +08:00 |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
2023-08-28 17:18:42 +08:00 |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
2023-08-28 14:00:09 +08:00 |
|
puhui999
|
8239ca474f
|
订单列表： 修复差异
|
2023-08-28 10:05:49 +08:00 |
|
YunaiV
|
9507e2b687
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/detail/UserPointList.vue
|
2023-08-27 21:02:52 +08:00 |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
2023-08-26 22:29:55 +08:00 |
|
YunaiV
|
5cd01903e4
|
code review：商品评论
|
2023-08-26 21:23:10 +08:00 |
|
芋道源码
|
d09366b9bd
|
!222 优化商品评论
Merge pull request !222 from 疯狂的世界/owen_dev
|
2023-08-26 12:58:49 +00:00 |
|
YunaiV
|
2d8d323767
|
code review：会员中心
|
2023-08-26 20:57:22 +08:00 |
|
绮梦
|
76e37a3ee7
|
Merge remote-tracking branch 'origin/dev' into dev-gitee
|
2023-08-26 13:58:11 +08:00 |
|
绮梦
|
45a6b3bcc7
|
账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
|
2023-08-26 13:48:43 +08:00 |
|
owen
|
3a15390090
|
商品评论：回复表单提取到单独的组件中
|
2023-08-26 13:34:07 +08:00 |
|
owen
|
15971b6feb
|
商品评论：
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下
|
2023-08-26 13:09:14 +08:00 |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
2023-08-26 11:41:43 +08:00 |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
2023-08-26 03:21:35 +00:00 |
|