Commit Graph

  • 06ade4fc82 total clienCountDetail's modified zry 2025-07-07 11:49:23 +0800
  • 325b1c3180 success Merge branch 'milestone-20250623-金币前端' into zhangrenyuan/feature-20250623164058-金币前端 zry 2025-07-07 11:45:53 +0800
  • 61bac52b98 number valid rules! zry 2025-07-07 11:43:06 +0800
  • 7e7b60f97e fix(consume): 优化用户查询逻辑 lihui 2025-07-07 11:28:34 +0800
  • 791883fc74 refactor: 优化金币消费校验提示信息 lihui 2025-07-07 10:54:32 +0800
  • b89e4c85fe refactor(consume): 优化消费页面的金币输入校验规则 lihui 2025-07-07 10:50:59 +0800
  • f2f1944ae0 Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端 lihuilin 2025-07-07 10:31:26 +0800
  • 3809a26c71 success 2025年7月7日10:16:34 merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端 zry 2025-07-07 10:16:20 +0800
  • cf933bb428 gold coins /100 of recharge's card zry 2025-07-07 10:14:06 +0800
  • 8537eff366 style(audit): 优化审计页面时间筛选布局 - 在充值审计和退款审计页面中,为"充值时间"和"提交时间"标签添加固定宽度 lihui 2025-07-06 17:45:51 +0800
  • 6553a96c38 new modifiy zry 2025-07-06 17:12:23 +0800
  • 0fba0b0e1b success Merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端 zry 2025-07-06 10:08:24 +0800
  • 44b73c5b8b add upload code in env.test, and modified refund code zry 2025-07-06 10:07:05 +0800
  • a578ec7086 Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端 lihuilin 2025-07-05 18:03:40 +0800
  • fa76719e61 驳回理由 lihuilin 2025-07-05 18:03:00 +0800
  • b201c1cfda Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-05 17:59:14 +0800
  • e31afd27ca style(rechargeAudit): 优化支付凭证列的样式 lihui 2025-07-05 17:58:58 +0800
  • 3a4512e1e7 Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端 lihuilin 2025-07-05 17:45:28 +0800
  • 2f8ad671a2 退款类型 lihuilin 2025-07-05 17:43:16 +0800
  • f06bdf2673 success Merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端 zry 2025-07-05 17:27:41 +0800
  • 22ec0987ce mainly modified the uploaded pictures of recharge zry 2025-07-05 17:26:16 +0800
  • ce9371b9a8 退款审核人 lihuilin 2025-07-05 17:18:50 +0800
  • 45832205e7 fix(audit): 修复充值审计列表排序字段 lihui 2025-07-05 15:54:01 +0800
  • 206b3b7951 Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-05 15:36:01 +0800
  • 466489621f fix:优化汇率输入的两位小数限制逻辑 之前逻辑写反了 lihui 2025-07-05 15:35:44 +0800
  • 4f3a0ce024 合一下 lihuilin 2025-07-05 14:44:39 +0800
  • 9cf5b1bb2c 右下小卡好了 lihuilin 2025-07-05 14:40:24 +0800
  • 71ae7815e6 feat(rate): 限制汇率输入最多两位小数 lihui 2025-07-05 14:33:15 +0800
  • 851ef679c2 success 2025年7月5日14:22:18 Merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端 zry 2025-07-05 14:21:53 +0800
  • bbcebc4421 phase 1 bugs have been resolved zry 2025-07-05 14:17:55 +0800
  • 93fc6016ef refactor(consume): 优化客户信息展示布局和提示消息 lihui 2025-07-05 14:09:06 +0800
  • a28cf63abd ??工作台时间怎么回事 lihuilin 2025-07-05 10:19:23 +0800
  • f64fc6118f fix:充值审核-筛选条件改变时合计数不变,充值审核-审核通过或驳回后合计数不能及时刷新 添加金币消耗卡片问题 lihui 2025-07-05 09:40:34 +0800
  • fba8e5bb0c 删除异常显示 lihuilin 2025-07-04 18:23:25 +0800
  • c49daed7e2 Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端 lihuilin 2025-07-04 18:22:39 +0800
  • 98ac01718d ??????????????? lihuilin 2025-07-04 18:18:34 +0800
  • 92e5b66dd8 Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 18:17:26 +0800
  • ac8ac4c7f5 fix:新增消耗 卡片加宽 计算精度2位小数 充值审核 改为服务器地址 lihui 2025-07-04 18:14:54 +0800
  • 8c0aace4ad Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端 lihuilin 2025-07-04 18:03:54 +0800
  • cec5a4155d 排序无法刷新 lihuilin 2025-07-04 18:02:10 +0800
  • db018924cd Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250623164044-金币前端 lihuilin 2025-07-04 17:52:22 +0800
  • 1379023d8f 看看排序 lihuilin 2025-07-04 17:51:48 +0800
  • a10c6d613c Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250623-金币前端 lihuilin 2025-07-04 17:21:31 +0800
  • 6dd01e75d9 排序好了吗 lihuilin 2025-07-04 17:20:54 +0800
  • b63af1ac32 排序好了吗 lihuilin 2025-07-04 17:19:26 +0800
  • c1f6f2fbcf Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 16:54:08 +0800
  • 96c9e98f1c fix合并冲突 lihui 2025-07-04 16:52:00 +0800
  • c1e9f741ed Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 16:48:15 +0800
  • afc786d19f fix:充值审核增加排序 lihui 2025-07-04 16:47:58 +0800
  • 3ba3bd0e4f merge success-20250704 zry 2025-07-04 16:18:11 +0800
  • e80c96abf0 fixed some bug... zry 2025-07-04 16:13:01 +0800
  • 4bcaf3fa7c Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 15:44:22 +0800
  • 90630a8fe8 fix:充值审核 去掉总计的任务金币显示,充值金额与永久金币统一,去掉审核时间的排序 lihui 2025-07-04 15:44:04 +0800
  • 07ee34f59b 修改箭头 lihuilin 2025-07-04 15:37:41 +0800
  • e41c835833 Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 15:31:44 +0800
  • 278dff9c8b fix:消耗详情 ERP系统改为ERP 汇率增加验证数字与字符串 充值审核改了按钮的布局 lihui 2025-07-04 15:31:31 +0800
  • 4a6bfe739d Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-07-04 13:55:32 +0800
  • a610f59f26 fix: 新增消耗金币分配问题,传adminId问题 汇率页面传adminId问题 lihui 2025-07-04 13:54:49 +0800
  • a581757670 工作台/100 lihuilin 2025-07-04 13:26:35 +0800
  • c169e8802c 与测试同步 lihuilin 2025-07-04 11:45:06 +0800
  • a071e5c8d5 小bug lihuilin 2025-07-04 10:00:55 +0800
  • 585e96770d 改了域名,导出好了 lihuilin 2025-07-03 18:14:58 +0800
  • ba5d48fec1 导出好了 lihuilin 2025-07-03 18:11:07 +0800
  • a669588ec5 登录完成 lihuilin 2025-07-03 11:55:19 +0800
  • cdb80edce6 差登录,网卡死了天哪 lihuilin 2025-07-03 11:06:30 +0800
  • ba32b86392 Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端 lihuilin 2025-07-02 21:19:06 +0800
  • 397592b0c5 差登录 lihuilin 2025-07-02 21:18:43 +0800
  • 30ab9514d2 Merge branch 'lihuilin/feature-20250623164044-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250623164044-金币前端 lihuilin 2025-07-02 17:06:43 +0800
  • e5d28b9da3 差支付凭证 lihuilin 2025-07-02 17:03:08 +0800
  • f6b973ac60 7.2 登录界面与退出登录 huangqizheng/feature-20250702164103-登录页面退出登录 huangqizhen 2025-07-02 16:42:10 +0800
  • 56ec957a95 Merge branch 'lihuilin/feature-20250623164044-金币前端' into milestone-20250623-金币前端 no99 2025-07-02 16:29:04 +0800
  • b8ba2a3bc5 在登陆界面浏览器链接拼上machineId no99 2025-07-02 16:27:01 +0800
  • dac9f6f5a0 删了用户登录,动画保留! lihuilin 2025-07-02 15:56:28 +0800
  • 18639c0f49 暂时登录页面 no99 2025-07-02 15:51:43 +0800
  • 7487eaf275 login-hxl暂时登陆界面 no99 2025-07-02 15:50:06 +0800
  • 6cc6fc02e7 充值审核没改完 lihuilin 2025-07-02 14:25:10 +0800
  • 79b2b39b5d 差退款审核、柱状图 lihuilin 2025-07-01 14:04:17 +0800
  • 9f8855cafe 测试一下 lihuilin 2025-07-01 13:49:42 +0800
  • b699ac9ad8 success merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端 zry 2025-06-30 19:43:15 +0800
  • 79e6046fae 完成数据的测试,传数据库的*100,拿数据的/100,包括充值,退款,客户账户明细。存在的问题(也许是后端):1、排序;2、客户账户明细的永久金币字段 zry 2025-06-30 19:41:38 +0800
  • 533f04e709 差柱状图、退款审核 lihuilin 2025-06-30 18:40:50 +0800
  • 5792155eaa feat: 1.充值审核(缺总计接口、缺排序)2.消费传给后端*100 拿到数据/100 3.修改请求地址为测试服务器 fix:修改合并出现问题 lihui 2025-06-30 17:51:09 +0800
  • 137c178636 merge lh,zry,milestone success zry 2025-06-30 13:46:21 +0800
  • b4ccc725ac 地址更换为服务器的,修改了新增充值、充值明细,昨天的退款 zry 2025-06-30 13:33:37 +0800
  • 152b99adfc style: 修改 汇率 消耗详情的代码格式,优化汇率输入错误的提示 feat:消耗明细金币总计(根据筛选)、排序功能 refactor: 重构充值审核,退款审核页面样式、字段 ,目前缺后端接口 lihui 2025-06-30 13:15:25 +0800
  • c9efe4f4cd ?? lihuilin 2025-06-29 12:00:22 +0800
  • 4c3c8cd5e0 ?? lihuilin 2025-06-29 11:59:53 +0800
  • d03b13e750 0629merge lihuilin 2025-06-29 11:53:37 +0800
  • ed0d2b0659 0629 lihuilin 2025-06-29 11:24:45 +0800
  • e1a58c669d 退款合并冲突解决 zry 2025-06-28 16:50:51 +0800
  • 2597185c27 登录做了修改,不需要验证登录,退款页面(基本完成,需要后端的退款类型接口、商品接口;以及计算明细的合计数的正确逻辑 zry 2025-06-28 16:44:14 +0800
  • bae599c1e2 feat: 新增消耗(完成) 消耗明细(总计金币数[后端不能筛选]) 汇率页面(完成) lihui 2025-06-28 16:39:41 +0800
  • 49807ae9e3 feat: 新增消耗(提交,数据正常提交,后端返回提示错误) 消耗明细(缺总计金币数) 汇率页面(完成) lihui 2025-06-28 14:37:49 +0800
  • e64b4a325c 合并完成20250627 zry 2025-06-27 18:17:27 +0800
  • 3ebc5d3483 充值、退款都换成了路由切换,权限改了一些,客户账户明细、余额基本无误 zry 2025-06-27 18:13:24 +0800
  • 64ee464b6e feat: 新增消耗 消耗明细80% 汇率页面(缺接口) lihui 2025-06-27 18:03:45 +0800
  • fa25cb17df Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端 lihui 2025-06-26 18:03:12 +0800
  • 03be57ca36 个人信息卡片,新增正在做 lihui 2025-06-26 18:01:09 +0800
  • 066e41fb05 客户账户金币管理完成,剩余导出后续在做 zry 2025-06-26 17:54:47 +0800
  • ae8dd76f33 Merge remote-tracking branch 'origin/milestone-20250623-金币前端' into lihui/feature-20250623144029-金币前端lihui lihui 2025-06-26 10:45:46 +0800