Commit Graph

  • 475e26c62e 合并 ZhangYong 2025-07-22 17:52:11 +0800
  • 6f3f0a992c 新增角色所属地 ZhangYong 2025-07-22 17:38:56 +0800
  • be6851256d second modified merge zry 2025-07-22 17:32:59 +0800
  • 6fe9a69971 merge success zry 2025-07-22 17:29:12 +0800
  • 2471e2395c fix: 冲突解决 lihui 2025-07-22 17:22:39 +0800
  • 97f3085ebe Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zry 2025-07-22 17:15:16 +0800
  • 40f8dc48a7 success merge zry 2025-07-22 17:13:22 +0800
  • 4e98616d6f 新增用户表单校验 ZhangYong 2025-07-22 17:12:40 +0800
  • 10de44896f 新增用户表单校验 ZhangYong 2025-07-22 17:10:12 +0800
  • 0bdd147102 edit role permissions zry 2025-07-22 17:07:46 +0800
  • 4775a78850 fix(usergold): 修复总数据请求成功时精网号不存在的问题 导致数据 为null 不清除 lihui 2025-07-22 16:48:22 +0800
  • e898fb7151 fix(permissions): 重置按钮 lihui 2025-07-22 16:24:16 +0800
  • 82695e9799 fix(consume): 将"消耗金额"改为"消耗总金额",数据为永久金币数 lihui 2025-07-22 16:16:11 +0800
  • 240f112f53 新增角色页面地区,权限列表单选,角色重复提示 ZhangYong 2025-07-22 16:04:08 +0800
  • b4e62a5d7a 新增角色功能 ZhangYong 2025-07-22 15:51:32 +0800
  • ce0947b015 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 15:50:35 +0800
  • 68c650234d refactor(recharge): 注释冗余的用户验证逻辑 lihui 2025-07-22 15:50:25 +0800
  • 15e5dca807 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 15:33:10 +0800
  • 377ba8fce2 feat(workspace): 优化工作台数据更新时间显示逻辑时间 lihui 2025-07-22 15:32:56 +0800
  • 8a6e50c6fd Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 14:59:29 +0800
  • 5eb8515431 feat(consume): 添加初始化金币,优化修改密码布局 lihui 2025-07-22 14:59:17 +0800
  • c843bf8af5 Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 13:15:10 +0800
  • e05bae5071 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:14:31 +0800
  • 1afdb5e59f Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-22 13:12:19 +0800
  • 9bba794626 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:11:58 +0800
  • 38978ff0fb Revert "fix(permissions): 修复重置密码权限检查逻辑" lihui 2025-07-22 13:06:05 +0800
  • d532ce1b63 fix(usergold): 修复免费金币计算方式 lihui 2025-07-22 13:05:53 +0800
  • 3e1a01cc78 fix(permissions): 修复重置密码权限检查逻辑 lihui 2025-07-22 13:01:25 +0800
  • 0b6992321f feat(permissions): 添加用户密码重置功能 lihui 2025-07-22 11:56:54 +0800
  • 51b08e3499 重置密码地区校验 ZhangYong 2025-07-22 11:23:03 +0800
  • 33b28e1cae 重置密码地区校验 ZhangYong 2025-07-22 11:11:24 +0800
  • 71779b6456 客户账户明细 金币总数等 为空 为 0 lihui 2025-07-22 11:10:34 +0800
  • 4a428f9abc feat(permissions): 重置密码弹窗 lihui 2025-07-22 10:21:53 +0800
  • a9ae9028cd Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-22 10:17:19 +0800
  • 1d6f8aa841 oldpw modified zry 2025-07-22 10:16:21 +0800
  • 49d018d348 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-21 19:11:36 +0800
  • 119306fe4d 用户所属地区总部不共选优化 ZhangYong 2025-07-21 19:09:43 +0800
  • 4b3c7767c5 Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-21 18:41:12 +0800
  • 4d471a7280 refactor(general): roleMarkets =>adminMarkets lihui 2025-07-21 18:40:43 +0800
  • 22383fe807 Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 ZhangYong 2025-07-21 17:13:56 +0800
  • ba759d2e00 Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-21 17:06:30 +0800
  • d2405a3571 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 新增角色权限列表排版 ZhangYong 2025-07-21 17:06:23 +0800
  • dfafaf4d04 feat(home): 动态菜单 lihui 2025-07-21 17:06:17 +0800
  • 389d467236 新增角色权限列表无数据时排版 ZhangYong 2025-07-21 17:04:46 +0800
  • b7f6c27f00 新增角色权限列表无数据时排版 ZhangYong 2025-07-21 16:24:09 +0800
  • a310f1498d Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-21 16:25:59 +0800
  • 3ef303760b 表单校验 ZhangYong 2025-07-21 16:24:09 +0800
  • acb89d16a2 password modified prompt zry 2025-07-21 16:04:50 +0800
  • e6350760f5 Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-21 15:44:53 +0800
  • 4e64dfb986 password modified zry 2025-07-21 15:44:01 +0800
  • 26c0127d51 Merge remote-tracking branch 'origin/milestone-20250711-金币前端二期' into milestone-20250711-金币前端二期 lihui 2025-07-21 14:57:15 +0800
  • 495c090d05 refactor(workspace): 优化金币统计卡片的展示内容 (真的改过了) lihui 2025-07-21 14:56:05 +0800
  • 59601a7422 Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-21 14:47:58 +0800
  • a37fe239e6 password regular expression zry 2025-07-21 14:46:28 +0800
  • f914f547f5 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 ZhangYong 2025-07-21 14:43:07 +0800
  • c279affd29 新增角色权限校验 ZhangYong 2025-07-21 14:40:07 +0800
  • 65bc869c8d Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期 zry 2025-07-21 14:33:15 +0800
  • c0c2a24869 ggbond zry 2025-07-21 14:30:38 +0800
  • 2ba78a88e2 feat(general): 更新地区数据获取接口 lihui 2025-07-21 14:28:57 +0800
  • 9c35d7f8fc 管理员角色不能删除 ZhangYong 2025-07-21 14:03:29 +0800
  • a2e03fc758 fix: 用户删除 lihui 2025-07-21 13:10:39 +0800
  • 862d28754d fix: 优化 防止修改自己权限 lihui 2025-07-21 11:48:15 +0800
  • 500d01d455 Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zhangyongQINGHU 2025-07-21 11:40:10 +0800
  • 44b7517f6f 合并问题 zhangyongQINGHU 2025-07-21 11:39:51 +0800
  • 363c602faf Merge branch 'refs/heads/lihui/feature-20250711103624-金币二期' into milestone-20250711-金币前端二期 lihui 2025-07-21 11:13:22 +0800
  • 9461d22012 fix(usergold): 过滤市场数据中的空值 lihui 2025-07-21 11:13:04 +0800
  • 4f0fc2226e 权限编辑提示优化 zhangyongQINGHU 2025-07-21 11:12:30 +0800
  • b64c37b460 Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期 zry 2025-07-21 11:02:11 +0800
  • 29f628c606 fix: 工作台换 为外层 对应的字段 lihui 2025-07-21 11:00:02 +0800
  • 8226290b87 password success modified zry 2025-07-21 10:59:21 +0800
  • 3173b46091 新增角色 zhangyongQINGHU 2025-07-21 10:47:34 +0800
  • 6da11be07e fix:问题 lihui 2025-07-20 18:42:18 +0800
  • c70a0f0009 合并错误 zhangyongQINGHU 2025-07-20 18:17:47 +0800
  • 09b8e5c8fb Merge branch 'lihuilin/feature-20250715112412-金币二期' into milestone-20250711-金币前端二期 zhangyongQINGHU 2025-07-20 18:12:16 +0800
  • ecf5df9817 权限编辑,重置密码,分页,新增角色等问题修复 zhangyongQINGHU 2025-07-20 18:02:29 +0800
  • c44f4d3698 编辑权限完成,新建用户逻辑修改 zhangyongQINGHU 2025-07-20 13:11:58 +0800
  • 74b96e43d6 金币消耗导出 zhangyongQINGHU 2025-07-19 18:57:11 +0800
  • 2ba1dbf326 fix(home): 修复个人资料市场信息显示错误 lihui 2025-07-19 11:33:38 +0800
  • eec32e3d95 Merge branch 'refs/heads/milestone-20250711-金币前端二期' into lihui/feature-20250711103624-金币二期 lihui 2025-07-19 11:31:08 +0800
  • 1619f59e2c fix: 关闭home挂载导出 复制慧琳姐的 工作台内容(为了打包) lihui 2025-07-19 11:29:57 +0800
  • f022917453 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 zhangyongQINGHU 2025-07-19 11:23:21 +0800
  • 0abda5650c 金币消耗传参问题 zhangyongQINGHU 2025-07-19 11:18:41 +0800
  • c0ab55b47d 消耗金币传参更改 zhangyongQINGHU 2025-07-19 11:10:43 +0800
  • fe8fc410dd 合并问题 zhangyongQINGHU 2025-07-19 10:40:35 +0800
  • 153f2ff1dc 分页导出 zhangyongQINGHU 2025-07-19 10:30:41 +0800
  • 5d4914c4b3 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期 zhangyongQINGHU 2025-07-19 10:27:55 +0800
  • 4235152c47 导出 zhangyongQINGHU 2025-07-19 10:17:34 +0800
  • ac26105315 fix::客户余额和明细导出功能 lihui 2025-07-19 09:30:07 +0800
  • 99430211b0 bianjiAdnmin zhangyongQINGHU 2025-07-19 09:10:31 +0800
  • 35d4b2e02f 编辑admin zhangyongQINGHU 2025-07-18 19:18:26 +0800
  • 9a8f435e37 feat 改为使用 @change lihui 2025-07-18 17:31:09 +0800
  • b25a30f49e feat(usergold): 实现总部与其他地区互斥选择功能 (加监听) lihui 2025-07-18 17:16:21 +0800
  • 958ee699ee 客户明细地区列表 zhangyongQINGHU 2025-07-18 17:06:52 +0800
  • aa6031c305 Merge remote-tracking branch 'origin/milestone-20250711-金币前端二期' into zhangyong/feature-20250716164232-金币前端 zhangyongQINGHU 2025-07-18 13:40:33 +0800
  • 4e283a01d9 fix: 修复合计数 lihui 2025-07-18 13:29:13 +0800
  • 60e7d43887 refactor(usergold): 将 user.market 和 goldDetail.market 字段名修改为 markets lihui 2025-07-18 12:02:38 +0800
  • d06843891c 编辑用户 zhangyongQINGHU 2025-07-18 11:40:26 +0800
  • 906a1e86a6 feat(usergold): 为用户金币相关页面的地区选择添加多选功能,传数组 lihui 2025-07-18 11:34:09 +0800
  • 889236cc7e ceshi zhangyongQINGHU 2025-07-18 10:01:13 +0800
  • 03f08aa637 除编辑均已完成 lihuilin 2025-07-18 09:26:27 +0800