ZhangYong
|
d0e8369395
|
Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
ZhangYong
|
ea90b63bc0
|
编辑用户展示问题，新增角色排版问题
|
2 weeks ago |
zry
|
a0732d312d
|
edit role permissions, display the permissions tree according to the superior role and check existing ones by default
|
2 weeks ago |
|
zry
|
0560bf2b2c
|
update code merge
|
2 weeks ago |
|
zry
|
e9c2939df2
|
update
|
2 weeks ago |
|
ZhangYong
|
3a98a978c8
|
新增角色地区bug
|
2 weeks ago |
|
ZhangYong
|
475e26c62e
|
合并
|
2 weeks ago |
|
ZhangYong
|
6f3f0a992c
|
新增角色所属地
|
2 weeks ago |
|
zry
|
be6851256d
|
second modified merge
|
2 weeks ago |
|
zry
|
6fe9a69971
|
merge success
|
2 weeks ago |
lihui
|
2471e2395c
|
fix: 冲突解决
|
2 weeks ago |
|
zry
|
97f3085ebe
|
Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期
|
2 weeks ago |
|
zry
|
40f8dc48a7
|
success merge
|
2 weeks ago |
|
ZhangYong
|
4e98616d6f
|
新增用户表单校验
|
2 weeks ago |
|
ZhangYong
|
10de44896f
|
新增用户表单校验
|
2 weeks ago |
|
zry
|
0bdd147102
|
edit role permissions
|
2 weeks ago |
|
lihui
|
4775a78850
|
fix(usergold): 修复总数据请求成功时精网号不存在的问题 导致数据 为null 不清除
|
2 weeks ago |
|
lihui
|
e898fb7151
|
fix(permissions): 重置按钮
|
2 weeks ago |
|
lihui
|
82695e9799
|
fix(consume): 将"消耗金额"改为"消耗总金额"，数据为永久金币数
|
2 weeks ago |
|
ZhangYong
|
240f112f53
|
新增角色页面地区，权限列表单选，角色重复提示
|
2 weeks ago |
|
ZhangYong
|
b4e62a5d7a
|
新增角色功能
|
2 weeks ago |
|
lihui
|
ce0947b015
|
Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
lihui
|
68c650234d
|
refactor(recharge): 注释冗余的用户验证逻辑
|
2 weeks ago |
|
lihui
|
15e5dca807
|
Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
lihui
|
377ba8fce2
|
feat(workspace): 优化工作台数据更新时间显示逻辑时间
|
2 weeks ago |
|
lihui
|
8a6e50c6fd
|
Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
lihui
|
5eb8515431
|
feat(consume): 添加初始化金币，优化修改密码布局
|
2 weeks ago |
|
lihui
|
c843bf8af5
|
Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期
# Conflicts:
# src/views/permissions/permission.vue
|
2 weeks ago |
|
lihui
|
e05bae5071
|
fix(permissions): 修复重置密码权限检查逻辑
|
2 weeks ago |
|
lihui
|
1afdb5e59f
|
Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期
# Conflicts:
# src/views/permissions/permission.vue
|
2 weeks ago |
|
lihui
|
9bba794626
|
fix(permissions): 修复重置密码权限检查逻辑
|
2 weeks ago |
|
lihui
|
38978ff0fb
|
Revert "fix(permissions): 修复重置密码权限检查逻辑"
This reverts commit 3e1a01cc78.
|
2 weeks ago |
|
lihui
|
d532ce1b63
|
fix(usergold): 修复免费金币计算方式
|
2 weeks ago |
|
lihui
|
3e1a01cc78
|
fix(permissions): 修复重置密码权限检查逻辑
|
2 weeks ago |
|
lihui
|
0b6992321f
|
feat(permissions): 添加用户密码重置功能
|
2 weeks ago |
|
ZhangYong
|
51b08e3499
|
重置密码地区校验
|
2 weeks ago |
|
ZhangYong
|
33b28e1cae
|
重置密码地区校验
|
2 weeks ago |
|
lihui
|
71779b6456
|
客户账户明细 金币总数等 为空 为 0
|
2 weeks ago |
|
lihui
|
4a428f9abc
|
feat(permissions): 重置密码弹窗
|
2 weeks ago |
|
zry
|
a9ae9028cd
|
Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
zry
|
1d6f8aa841
|
oldpw modified
|
2 weeks ago |
|
ZhangYong
|
49d018d348
|
Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期
|
2 weeks ago |
|
ZhangYong
|
119306fe4d
|
用户所属地区总部不共选优化
|
2 weeks ago |
|
lihui
|
4b3c7767c5
|
Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期
|
2 weeks ago |
|
lihui
|
4d471a7280
|
refactor(general): roleMarkets =>adminMarkets
|
2 weeks ago |
|
ZhangYong
|
22383fe807
|
Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期
|
2 weeks ago |
|
lihui
|
ba759d2e00
|
Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期
|
2 weeks ago |
|
ZhangYong
|
d2405a3571
|
Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期
新增角色权限列表排版
|
2 weeks ago |
|
lihui
|
dfafaf4d04
|
feat(home): 动态菜单
|
2 weeks ago |
|
ZhangYong
|
389d467236
|
新增角色权限列表无数据时排版
|
2 weeks ago |
