yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,094 Commits
9 Branches
21 Tags
30 MiB
Commit Graph

1094 Commits (62a953815d2c10f885e12cd9260b99422b089521)

Author SHA1 Message Date
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
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
芋道源码 22d95fa0ac
!229 完善订单管理和售后管理相关问题 
Merge pull request !229 from puhui999/dev-to-dev
 2023-09-01 11:41:17 +00: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