Commit Graph

  • 0fa3cc0690 Merge branch 'refs/heads/milestone-20250815-金币优化' into lihui/feature-20250815155204-金币优化 lihui 2025-08-20 13:53:48 +0800
  • f1b63bdc34 fix:样式优化 lihui 2025-08-20 13:53:33 +0800
  • de7a1eaf2d 历史金币 ZhangYong 2025-08-19 18:21:27 +0800
  • 6727c0b0d1 拉取 ZhangYong 2025-08-19 13:44:39 +0800
  • 33238fcde4 更新 ZhangYong 2025-08-19 13:43:49 +0800
  • 58507a71c8 fix:本周 lihui 2025-08-19 11:38:40 +0800
  • efe4f6de4a Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化 lihui 2025-08-19 11:22:28 +0800
  • 885226d555 fix:打包问题 lihui 2025-08-19 11:21:37 +0800
  • c86f0b94e9 审核重复提交优化 ZhangYong 2025-08-19 11:19:28 +0800
  • 922acddc24 金币金豆审核防止重复点击 ZhangYong 2025-08-19 11:16:23 +0800
  • 6a0bc7efb5 fix:合并 lihui 2025-08-19 11:07:07 +0800
  • e82cff9ece Merge branch 'refs/heads/lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-19 10:51:44 +0800
  • 72fc3b8f89 fix UserFlag to flag of usergold zhangrenyuan 2025-08-19 10:43:30 +0800
  • ba90fcab15 传adminName和小bug和历史数据 lihuilin 2025-08-18 17:56:43 +0800
  • a18609e79a Merge branch 'milestone-20250815-金币优化' of http://39.101.133.168:8807/huangqizhen/gold-vue into zhangyong/feature-20250815160302-金币优化 ZhangYong 2025-08-18 11:12:23 +0800
  • eeae43fcb1 金币退款重复点击 ZhangYong 2025-08-18 11:12:16 +0800
  • 96210bf19c build(deps): 添加 js-cookie依赖 lihui 2025-08-17 16:07:49 +0800
  • 3b64a43eee Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-17 15:49:08 +0800
  • afde6df197 feat: 金币充值消耗二次检查 lihui 2025-08-17 15:48:53 +0800
  • 7c33282cdf feat: 金币充值消耗二次检查 lihui 2025-08-17 15:47:26 +0800
  • 55bdc07941 refactor(目录结构): 优化金豆相关页面的文件组织 lihui 2025-08-17 15:00:25 +0800
  • 1c1d089c2d feat(recharge): 添加金币充值重复充值检测 lihui 2025-08-17 14:58:11 +0800
  • 3be8529ed0 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-17 14:30:28 +0800
  • 6a776e79e7 fix and feat isshowemployeedata and roleMarket's optimized zhangrenyuan 2025-08-17 14:28:54 +0800
  • 0da3eb3887 重复点击以及样式优化 ZhangYong 2025-08-17 11:31:17 +0800
  • 88f52a90ba 金币新增重复点击优化 ZhangYong 2025-08-17 09:46:49 +0800
  • 1288d2db88 金币新增重复提交修复 ZhangYong 2025-08-17 09:45:10 +0800
  • df11b972f0 Merge branch 'milestone-20250728-金币前端三期' into zhangrenyuan/feature-20250728113353-金币前端三期 zhangrenyuan/feature-20250728113353-金币前端三期 zhangrenyuan 2025-08-17 09:11:25 +0800
  • f7a6255ef1 Merge branch 'refs/heads/milestone-20250815-金币优化' into lihui/feature-20250815155204-金币优化 lihui 2025-08-17 09:11:08 +0800
  • 90ea56eb04 fix:日期七天 lihui 2025-08-17 09:07:42 +0800
  • f5119aff69 Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化 ZhangYong 2025-08-15 17:24:18 +0800
  • fc7cefc187 金币时间选择禁用 ZhangYong 2025-08-15 17:23:17 +0800
  • 6670e77167 it's a pull operation dev lihuilin 2025-08-15 15:17:25 +0800
  • b84a4ee0fb refactor(coinConsumeDetail): 修改消耗总新币为消耗新币 milestone-20250728-金币前端三期 lihui/feature-20250728114233-金币前端三期 lihui 2025-08-15 13:30:38 +0800
  • c7ed9efc5b 金币导出统计取消/100 ZhangYong 2025-08-14 17:13:35 +0800
  • f410363578 Merge branch 'refs/heads/lihui/feature-20250728114233-金币前端三期' into milestone-20250728-金币前端三期 lihui 2025-08-14 16:50:53 +0800
  • 1be2be64e2 fix(permissions): 重复调用 lihui 2025-08-14 16:50:34 +0800
  • 9c5deb22af Merge branch 'refs/heads/lihui/feature-20250728114233-金币前端三期' into milestone-20250728-金币前端三期 lihui 2025-08-14 16:35:37 +0800
  • f2f6870e56 fix(permissions): 重复调用 lihui 2025-08-14 16:35:04 +0800
  • 9091970c8d Merge branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250728-金币前端三期 ZhangYong 2025-08-14 14:31:08 +0800
  • fd5af5a229 金币取消/100 zhangyong/feature-20250716164232-金币前端 ZhangYong 2025-08-14 14:30:26 +0800
  • ed3288edb7 fix veryveryvery small code zhangrenyuan 2025-08-14 13:16:34 +0800
  • 0eece10204 fix(audit): 时间显示逻辑 lihui 2025-08-14 10:19:45 +0800
  • 00dc0fa15a refactor(audit): 优化审核时间筛选显示 lihui 2025-08-13 19:37:20 +0800
  • 5187f704df feat(audit): 添加货币名称和充值金额 lihui 2025-08-13 19:20:48 +0800
  • 71a951e0ab fix: 总金额 => 总新币 lihui 2025-08-13 18:48:04 +0800
  • e4bb3dd8e9 fix: 优化时间筛选功能 lihui 2025-08-13 18:36:54 +0800
  • 5654c1cd4f refactor(audit): 修改退款审核中的管理员 ID 获取方式 lihui 2025-08-13 11:20:56 +0800
  • ce3e5eff37 金币新增明细时间修改 ZhangYong 2025-08-12 16:59:32 +0800
  • bce68e4b43 fix: 空值导致总计为空 lihui 2025-08-12 16:41:21 +0800
  • 795651239c fix: 空值导致总计为空 fix:退款审核提交人id lihui 2025-08-12 16:30:50 +0800
  • 4bf9fc0ba9 合计数查全部合成 lihuilin 2025-08-12 13:29:37 +0800
  • 661f209703 fix(usergold): 修复金币数量显示逻辑 lihui 2025-08-12 13:07:08 +0800
  • 1aa365d60c fix(usergold): 修复金币数量显示错误 lihui 2025-08-12 12:58:05 +0800
  • f2ab8102c4 refactor(src): 全局拦截过期 lihui 2025-08-12 12:02:28 +0800
  • b4a97d65e4 金币充值输入优化 ZhangYong 2025-08-11 18:53:13 +0800
  • c7b746dd6a Merge branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into zhangyong/feature-20250716164232-金币前端 ZhangYong 2025-08-11 18:28:09 +0800
  • 425575c1f8 金豆输入校验优化 ZhangYong 2025-08-11 18:27:55 +0800
  • a0a87b3dad 样式修改,表单精简 lihuilin 2025-08-10 17:28:47 +0800
  • 9888be00af 样式修改,表单精简 lihuilin 2025-08-10 17:18:18 +0800
  • 1e28905359 重置调方法+调整布局 lihuilin 2025-08-10 10:11:11 +0800
  • 5d3adfa6d8 新增消耗修改 ZhangYong 2025-08-09 18:19:14 +0800
  • 6e5d1070b8 feat(components): 密码跳转 lihui 2025-08-09 16:57:12 +0800
  • 3769e8a6c5 大数字加逗号Merge branch 'lihuilin/feature-20250730114922-金币三期' into milestone-20250728-金币前端三期 lihuilin 2025-08-09 16:17:35 +0800
  • a72bbebbf9 大数字加逗号 lihuilin 2025-08-09 16:15:43 +0800
  • 421c509495 金豆明细序号 ZhangYong 2025-08-09 16:15:11 +0800
  • 8f3ffc3b28 金豆客户明细序号 ZhangYong 2025-08-09 16:12:06 +0800
  • 505c3b0140 fix:金币余额输入筛选项后点击重置,再点击查询,除了筛选项包含地区外,点击查询页面没有反应 lihui 2025-08-09 15:32:23 +0800
  • 953d067c53 这是一次拉取branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250730114922-金币三期 lihuilin 2025-08-09 15:29:11 +0800
  • 7a9bed3adf fix:金币明细输入筛选项后点击重置,再点击查询,除了筛选项包含地区外,点击查询页面没有反应 lihui 2025-08-09 15:25:50 +0800
  • 9fb9a2075f 付费免费 lihuilin 2025-08-09 15:00:47 +0800
  • 877fbac479 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期 ZhangYong 2025-08-09 14:57:51 +0800
  • 52168b3ef3 金豆字段修改 ZhangYong 2025-08-09 14:57:08 +0800
  • 3f19a6e061 这是一次拉取 lihuilin 2025-08-09 14:52:29 +0800
  • 36afd2793f 付费金豆 lihuilin 2025-08-09 14:50:24 +0800
  • 13194bb736 付费哈哈哈哈 lihuilin 2025-08-09 14:48:07 +0800
  • 18d4051f69 永久金币和免费金币不能同时为0 lihui 2025-08-09 14:47:37 +0800
  • 7f358ccb26 永久金币和付费金币不能同时为0 lihui 2025-08-09 14:44:21 +0800
  • 278329cd03 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期 ZhangYong 2025-08-09 14:24:55 +0800
  • 0da3fece75 金豆增减优化 ZhangYong 2025-08-09 14:24:21 +0800
  • 5d57fb5f03 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期 ZhangYong 2025-08-09 14:16:37 +0800
  • 78ed389236 金豆增减优化 ZhangYong 2025-08-09 14:16:18 +0800
  • a6b12231c6 Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250728-金币前端三期 ZhangYong 2025-08-09 11:35:13 +0800
  • 64edd1a4e8 金豆增减优化 ZhangYong 2025-08-09 11:34:46 +0800
  • ad659069d6 Merge branch 'refs/heads/lihui/feature-20250728114233-金币前端三期' into milestone-20250728-金币前端三期 lihui 2025-08-09 11:34:21 +0800
  • 213d1a075c fix:金币充值默认为0 lihui 2025-08-09 11:34:09 +0800
  • bbd4518488 Merge branch 'lihuilin/feature-20250730114922-金币三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250728-金币前端三期 lihuilin 2025-08-08 18:39:10 +0800
  • 2bc8736bf4 接口,切换页面清排序 lihuilin 2025-08-08 18:37:14 +0800
  • 1276e030c5 线上充值地区接口 ZhangYong 2025-08-08 18:30:07 +0800
  • 92110e6dbd lihuilin 2025-08-08 17:49:37 +0800
  • c34718bc50 研发/总部地区传空 lihuilin 2025-08-08 17:45:57 +0800
  • d496402c8a fix reset of articleVideo.vue zhangrenyuan 2025-08-08 17:45:22 +0800
  • 7837b6f597 Merge branch 'zhangrenyuan/feature-20250728113353-金币前端三期' into milestone-20250728-金币前端三期 zhangrenyuan 2025-08-08 17:33:35 +0800
  • 431c204874 fix bug zhangrenyuan 2025-08-08 17:29:07 +0800
  • 61c611b2cc 金豆审核做级联 lihuilin 2025-08-08 17:28:21 +0800
  • 01d06e1842 Merge branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250728-金币前端三期 zhangrenyuan 2025-08-08 13:47:50 +0800
  • d11ae90795 fix beanConsume card zhangrenyuan 2025-08-08 13:47:35 +0800
  • ac766ff0e2 fix: 近七天逻辑 lihui 2025-08-08 11:49:59 +0800
  • 02f0171020 fix .env.dev and bug zhangrenyuan 2025-08-07 18:30:55 +0800
  • 3b6cc29047 Merge branch 'milestone-20250728-金币前端三期' into zhangrenyuan/feature-20250728113353-金币前端三期 zhangrenyuan 2025-08-07 18:29:30 +0800