Commit Graph

  • ae4707ab17 Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-24 10:22:17 +0800
  • a5faf0bb05 工作台消费合计+样式 lihuilin 2025-08-24 10:21:33 +0800
  • db5b0a72dc Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化 ZhangYong 2025-08-24 10:08:11 +0800
  • 449a316ddf 角色重置问题以及退款样式优化 ZhangYong 2025-08-24 10:06:20 +0800
  • 0e5d24326f fix:上传图片样式 lihui 2025-08-24 09:56:14 +0800
  • b26dba446a fix:本周 lihui 2025-08-24 09:38:05 +0800
  • cae8897906 add:第二个卡片加字 lihui 2025-08-24 09:04:17 +0800
  • 1c77446cb6 add:第二个卡片加字 lihui 2025-08-24 09:02:33 +0800
  • 283ee3141f fix:除100 lihui 2025-08-22 18:25:10 +0800
  • 74cc02a22e Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 18:02:38 +0800
  • 6467769a1c 无上级角色显示- lihuilin 2025-08-22 18:02:01 +0800
  • fa794b2238 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 17:57:12 +0800
  • 8a009ba6b0 fix / 100 and sumGold zhangrenyuan 2025-08-22 17:56:33 +0800
  • a3b0fa1d50 工作台样式 lihuilin 2025-08-22 17:52:13 +0800
  • 7d4bc3cf50 Merge branch 'refs/heads/milestone-20250815-金币优化' into lihui/feature-20250815155204-金币优化 lihui 2025-08-22 17:50:45 +0800
  • ac762b314f fix:取消订单号置空 lihui 2025-08-22 17:50:23 +0800
  • 7070218d81 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 17:39:07 +0800
  • 7589f69891 fix home.vue of changePassword's resetFieds, it's invoke changePassword.vue's resetFields() zhangrenyuan 2025-08-22 17:38:11 +0800
  • 6d00e53524 Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 17:35:06 +0800
  • 3c8f0c3e3c 工作台样式 lihuilin 2025-08-22 17:34:31 +0800
  • 0f54bea15f 工作台样式 lihuilin 2025-08-22 17:21:42 +0800
  • 4fb40dcd04 Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-22 16:52:49 +0800
  • 1e093ca2a7 fix:新的需求 订单号的那些 lihui 2025-08-22 16:52:26 +0800
  • d0776530e8 Merge branch 'milestone-20250815-金币优化' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 16:17:21 +0800
  • 8fdc87a219 fix goods zhangrenyuan 2025-08-22 16:17:12 +0800
  • 6e5ec1f08f Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 16:06:06 +0800
  • 5d471b66b9 Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化 ZhangYong 2025-08-22 16:06:02 +0800
  • 7c84820aa5 金豆用户卡片样式 ZhangYong 2025-08-22 16:05:52 +0800
  • 4f05075f50 fix changePassword zhangrenyuan 2025-08-22 16:00:25 +0800
  • 697db5b169 Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化 lihui 2025-08-22 14:16:18 +0800
  • a57b479efa fix:消耗的值 lihui 2025-08-22 14:16:04 +0800
  • c3a4c4262b Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 13:51:42 +0800
  • 7af443d1c0 工作台昨天 lihuilin 2025-08-22 13:51:02 +0800
  • a35f7fbb48 Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-22 13:49:06 +0800
  • 650fb2260c fix:退款样式 lihui 2025-08-22 13:48:54 +0800
  • 56c0cba5ef Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 13:37:28 +0800
  • 7a2aa344ac Merge branch 'milestone-20250815-金币优化' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250815-金币优化 lihuilin 2025-08-22 13:37:09 +0800
  • 3f0cbc6868 消耗选择商品问题 ZhangYong 2025-08-22 13:28:59 +0800
  • d6e8ed225c Merge branch 'milestone-20250815-金币优化' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250815155204-金币优化 lihuilin 2025-08-22 13:21:40 +0800
  • c4119e6b3b Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 13:20:30 +0800
  • 9a27a5bfe0 消耗样式 lihuilin 2025-08-22 13:19:11 +0800
  • 75b4a77d59 Merge branch 'youhua/chongzhi' into milestone-20250815-金币优化 ZhangYong 2025-08-22 13:17:09 +0800
  • 7b635fde26 金币充值用户卡片样式优化 youhua/chongzhi ZhangYong 2025-08-22 13:13:40 +0800
  • 017d66a587 Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化 lihui 2025-08-22 11:32:57 +0800
  • 6c8d73969f fix:模糊查消耗的商品 lihui 2025-08-22 11:32:21 +0800
  • 2ea8b3d511 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 11:24:02 +0800
  • b8d6a469b7 fix fileterable of diehardfan's 频道 zhangrenyuan 2025-08-22 11:23:20 +0800
  • 82dde45dc7 fix:消耗平台改回去 lihui 2025-08-22 11:15:09 +0800
  • 73f6be09db fix:确认退款 lihui 2025-08-22 11:04:23 +0800
  • 296367a867 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-22 10:42:54 +0800
  • 2bccb36433 fix click to change zhangrenyuan 2025-08-22 10:42:12 +0800
  • 0f91a71385 Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihuilin 2025-08-22 10:38:42 +0800
  • 040df9b988 消耗提交人 lihuilin 2025-08-22 10:38:04 +0800
  • 9326aa783f fix:提交人 lihui 2025-08-22 10:16:10 +0800
  • 97ce09ca59 Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-22 10:15:35 +0800
  • cb80fa7b18 fix:提交人 lihui 2025-08-22 10:15:19 +0800
  • 80df8b4377 fix:历史记录查询 lihui 2025-08-22 09:50:25 +0800
  • 4b0b4be3a4 Merge branch 'refs/heads/milestone-20250815-金币优化' into lihui/feature-20250815155204-金币优化 lihui 2025-08-21 18:27:56 +0800
  • 3a2cae2b41 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-21 18:27:22 +0800
  • 4aa3393636 fix market zhangrenyuan 2025-08-21 18:26:43 +0800
  • c5906c5752 fix:时间 每周 工作台 feat: 平台对接口 lihui 2025-08-21 18:26:15 +0800
  • 3f19d29fd1 Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-21 17:53:08 +0800
  • d578581c48 refactor(gold): 优化金币相关页面布局和样式间距 lihui 2025-08-21 17:52:13 +0800
  • 7078af443a fix 不显示历史金币 lihui 2025-08-21 17:02:19 +0800
  • 4cd57b6a68 Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-21 16:32:38 +0800
  • fec140d394 fix 第一次提交 lihui 2025-08-21 16:32:22 +0800
  • 3c592f495a 客户信息居中 lihuilin 2025-08-21 16:24:53 +0800
  • bc3177b7af 消费提交人 lihuilin 2025-08-21 15:54:18 +0800
  • 921b9e8a5f 历史 lihuilin 2025-08-21 15:51:02 +0800
  • 3267e56edb Merge branch 'refs/heads/lihui/feature-20250815155204-金币优化' into milestone-20250815-金币优化 lihui 2025-08-21 15:48:50 +0800
  • 6c97325775 feat:新增第一次弹窗 lihui 2025-08-21 15:45:57 +0800
  • 41b05f4465 Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-21 15:06:42 +0800
  • 308b64ebca Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化 ZhangYong 2025-08-21 15:05:49 +0800
  • 829bfbc6ef fix market note zhangrenyuan 2025-08-21 15:05:41 +0800
  • c5434249bc 工作台时间筛选优化 ZhangYong 2025-08-21 15:05:33 +0800
  • 12e5fc466f fix:地区级联问题 lihui 2025-08-21 15:00:38 +0800
  • cb6d2d2208 style(upload): 优化上传图片样式 fix:地区级联问题 lihui 2025-08-21 14:59:13 +0800
  • d9d90f8e1f Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化 zhangrenyuan 2025-08-21 14:14:56 +0800
  • 79e0f0019e fix default no_check (员工数据) zhangrenyuan 2025-08-21 14:13:34 +0800
  • bfc2b4087f Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化 lihui 2025-08-21 14:05:52 +0800
  • 83060ad0d5 小bug lihuilin 2025-08-21 14:05:19 +0800
  • e7e3bb28e7 fix:改了密码重新查一下 lihui 2025-08-21 14:04:09 +0800
  • 6a2d9eea92 小bug+样式 lihuilin 2025-08-21 13:58:59 +0800
  • 880913fe8d 充值方式,样式居中等 lihuilin 2025-08-21 13:57:21 +0800
  • c1a49104e6 fix:显示金豆的权限 fix:汇率关闭操作 fix:余额的历史两列去掉 lihui 2025-08-21 13:25:01 +0800
  • 28d230ca37 杂乱的bug lihuilin 2025-08-21 11:16:05 +0800
  • 8c4ef4b7fe 太多了 lihuilin 2025-08-21 11:13:58 +0800
  • d2e194e046 Merge remote-tracking branch 'origin/milestone-20250815-金币优化' into milestone-20250815-金币优化 lihui 2025-08-21 11:01:06 +0800
  • 13f926cb34 fix:线上充值消失 lihui 2025-08-21 11:00:40 +0800
  • 83d42b1367 Merge branch 'zhangyong/feature-20250815160302-金币优化' into milestone-20250815-金币优化 ZhangYong 2025-08-21 10:41:36 +0800
  • 21d449ef00 新增,消耗后有校验残留问题 ZhangYong 2025-08-21 10:41:01 +0800
  • f4f44d9076 add-form 改为组件样式 lihui 2025-08-21 10:24:43 +0800
  • cc1215f7d9 审核字段名 lihuilin 2025-08-20 18:43:40 +0800
  • 3f624ffd70 历史记录+审核 lihuilin 2025-08-20 18:41:19 +0800
  • e968815d06 历史记录 lihuilin 2025-08-20 18:39:20 +0800
  • a3ddb3531c fix consume's style and flag(@click->@change) zhangrenyuan 2025-08-20 18:33:44 +0800
  • cc209c9f35 金豆审核时间+筛选项 lihuilin 2025-08-20 14:56:50 +0800
  • 2223d6eec2 fix:工作台样式 fix:重置密码 lihui 2025-08-20 14:51:47 +0800
  • a9bddde706 add:忽略文件 lihui 2025-08-20 13:56:52 +0800
  • 39d093a9e0 add:忽略文件 lihui 2025-08-20 13:55:46 +0800