Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• cf9ea4751a Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp main qiuyuan 2026-01-21 16:16:42 +08:00
• 7854188d95 1 qiuyuan 2026-01-21 16:16:41 +08:00
• eee7025a85 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2026-01-21 16:05:56 +08:00
• 7e181b21f2 智能聊天 Leo_Ding 2026-01-21 16:05:51 +08:00
• 98435311b2 1 qiuyuan 2025-12-29 13:54:05 +08:00
• 2736f63505 会议室预约个人自习室预约时间改成一个月 Leo_Ding 2025-09-24 18:11:49 +08:00
• 832709cdc5 1 Leo_Ding 2025-09-23 19:31:53 +08:00
• d02c845016 时间改成年月日，人数和场次验证 Leo_Ding 2025-09-23 19:20:38 +08:00
• ee188bd4a2 修复借用时间bug Leo_Ding 2025-09-23 15:40:30 +08:00
• da8a7020eb 预约时间调整 Leo_Ding 2025-09-22 17:57:45 +08:00
• 1e7d3671c1 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-09-22 17:48:37 +08:00
• fa73ab3853 会议室预约场次和人数字段调整；会议室列表几个会议室可预约时间段提示 Leo_Ding 2025-09-22 17:48:33 +08:00
• 6ce3663581 1 qiuyuan 2025-09-16 16:30:56 +08:00
• 578e7ba675 11 qiuyuan 2025-09-16 16:28:36 +08:00
• a4ef11b0bd Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-09-16 16:28:23 +08:00
• 9a73643c8f 开始时间 Leo_Ding 2025-09-16 16:28:19 +08:00
• 0d5d4a6f1a 修改预约提示 qiuyuan 2025-09-16 16:15:29 +08:00
• e9ead9668f Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-09-16 16:10:32 +08:00
• 34cb08ed53 申请人数和场次默认1 Leo_Ding 2025-09-16 16:10:27 +08:00
• e1c1edffb3 自习室预约提示 qiuyuan 2025-09-16 16:08:54 +08:00
• 036be9b27b 22 qiuyuan 2025-09-16 13:37:11 +08:00
• 98e6ffffff 删除图片 Leo_Ding 2025-09-16 11:43:50 +08:00
• b0b79b2ce0 添加预约时间和已被预约数量限制 Leo_Ding 2025-09-16 11:01:43 +08:00
• e0579b82ab Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-09-15 18:55:57 +08:00
• 6f1b01847f 城市会客厅预约模式更改 Leo_Ding 2025-09-15 18:52:36 +08:00
• ef84fb565e 修改 qiuyuan 2025-09-10 12:23:20 +08:00
• 75c1e98756 承诺书修改 qiuyuan 2025-09-10 11:12:35 +08:00
• 554c35e9c5 会议室预约添加时间被占用的提醒以及修改下载pdf的功能 Leo_Ding 2025-09-10 10:32:29 +08:00
• 092c32a56d 修复bug Leo_Ding 2025-09-09 10:55:27 +08:00
• 83d5a99629 1 Leo_Ding 2025-09-09 09:34:18 +08:00
• d81d1e316c 优化会议室预约印章上传逻辑 Leo_Ding 2025-09-08 16:19:05 +08:00
• b2660d85ad 修复页面跳转问题 Leo_Ding 2025-09-08 10:13:31 +08:00
• ef8a1bc2b4 代码修改 qiuyuan 2025-09-08 09:40:27 +08:00
• f1c6910a2b 登录修改 qiuyuan 2025-09-05 09:44:36 +08:00
• 6f0d90e162 修改 qiuyuan 2025-09-04 17:28:30 +08:00
• edff1cc690 个人和单位申请分开 Leo_Ding 2025-08-29 18:15:26 +08:00
• 056bdacf76 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-29 10:15:23 +08:00
• 84e766364f 上传applyType参数 Leo_Ding 2025-08-29 10:15:19 +08:00
• 41847c1317 1 qiuyuan 2025-08-27 14:16:54 +08:00
• 744ac0cc11 修改我已知晓的顺序 Leo_Ding 2025-08-27 14:14:41 +08:00
• 7231bd1d01 会议室预约申请书名称 Leo_Ding 2025-08-27 10:38:02 +08:00
• f48f805d61 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-27 09:43:22 +08:00
• 3bb9c7bb5e 上传印章 Leo_Ding 2025-08-27 09:43:18 +08:00
• 5db1ee877f 代码修改 qiuyuan 2025-08-27 09:33:02 +08:00
• 2376a9eaf2 1 Leo_Ding 2025-08-22 14:19:46 +08:00
• 1bc6feb14a 1 qiuyuan 2025-08-21 15:32:07 +08:00
• 0b8a8c5941 1 qiuyuan 2025-08-21 15:31:52 +08:00
• a3772996ba 1 qiuyuan 2025-08-21 15:31:37 +08:00
• 510ea9232f 1 qiuyuan 2025-08-13 15:48:53 +08:00
• 5d3f1b9c81 1 qiuyuan 2025-08-13 10:53:10 +08:00
• 0cc0a04508 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-12 18:45:36 +08:00
• 5bfa0a4343 优化tabbar Leo_Ding 2025-08-12 18:45:24 +08:00
• 1481a01915 12 qiuyuan 2025-08-12 18:42:56 +08:00
• 757b7035b2 1 qiuyuan 2025-08-12 18:35:00 +08:00
• e2139dacb1 1 qiuyuan 2025-08-12 18:34:20 +08:00
• e55fe17bcf 11 qiuyuan 2025-08-12 17:44:54 +08:00
• a5178d64f6 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-12 16:50:54 +08:00
• 293b3d8bf3 优化界面 Leo_Ding 2025-08-12 16:49:19 +08:00
• 1d16210f89 代码修改 qiuyuan 2025-08-12 16:47:10 +08:00
• 2a48964efb 优化问题 Leo_Ding 2025-08-12 09:33:22 +08:00
• f8b3520e5d 11 qiuyuan 2025-08-11 08:16:45 +08:00
• a4e47cde15 1 qiuyuan 2025-08-09 18:41:07 +08:00
• 73e46f8ec1 1 qiuyuan 2025-08-09 18:40:56 +08:00
• 56c43a74e0 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp qiuyuan 2025-08-08 19:39:28 +08:00
• 4619e3474d 1 qiuyuan 2025-08-08 19:39:12 +08:00
• 74784a8d9e 修复上传图片地址 Leo_Ding 2025-08-08 19:37:56 +08:00
• cd8f2588e6 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-08 19:07:37 +08:00
• 45127cef9b 修复bug Leo_Ding 2025-08-08 19:07:22 +08:00
• 99039d1696 1 qiuyuan 2025-08-08 19:00:40 +08:00
• b75b710702 1 qiuyuan 2025-08-08 19:00:22 +08:00
• 01ca2c7e01 预约记录修改 qiuyuan 2025-08-08 18:38:56 +08:00
• 302abc9a29 11 qiuyuan 2025-08-08 18:26:57 +08:00
• 4d8022c95e 1 qiuyuan 2025-08-08 18:00:20 +08:00
• 00a70f1c6c Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-08 17:58:01 +08:00
• f735571c56 优化会议室预约 Leo_Ding 2025-08-08 17:56:55 +08:00
• 79e74d84db 修改 qiuyuan 2025-08-08 14:30:26 +08:00
• 98e9cf72e7 优化聊天记录 Leo_Ding 2025-08-07 13:13:39 +08:00
• eea635e7bd Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-07 12:55:52 +08:00
• 859d6f2e79 ws聊天记录 Leo_Ding 2025-08-07 12:55:39 +08:00
• 42b6d2db33 1 qiuyuan 2025-08-07 12:22:19 +08:00
• 0adc144dc4 11 qiuyuan 2025-08-06 18:26:39 +08:00
• e757cb5c77 1 qiuyuan 2025-08-06 18:19:27 +08:00
• 23e1c4d6f0 11 qiuyuan 2025-08-06 18:15:28 +08:00
• 181cd1ec82 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp qiuyuan 2025-08-06 18:15:14 +08:00
• 72f51c4f91 11 qiuyuan 2025-08-06 18:15:04 +08:00
• ba09a59e21 1 qiuyuan 2025-08-06 18:14:31 +08:00
• a411e94890 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-06 18:12:54 +08:00
• 8260925b71 会议室预约 Leo_Ding 2025-08-06 18:11:05 +08:00
• 9f052c8cc8 1 qiuyuan 2025-08-06 18:05:09 +08:00
• 4022a1ebcd 相关修改 qiuyuan 2025-08-06 17:55:50 +08:00
• 6dea318ca8 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp qiuyuan 2025-08-05 15:19:52 +08:00
• d65a23d727 编辑头像修改 qiuyuan 2025-08-05 15:19:33 +08:00
• d710c820a7 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-04 16:13:31 +08:00
• dac61f5ead 1 Leo_Ding 2025-08-04 16:13:18 +08:00
• 11e2900c47 Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp qiuyuan 2025-08-04 15:57:13 +08:00
• 128fd1f7c8 1 qiuyuan 2025-08-04 15:56:52 +08:00
• 98dda253ce Merge branch 'main' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_uniapp Leo_Ding 2025-08-04 15:12:51 +08:00
• 05709de6b6 优化签名 Leo_Ding 2025-08-04 15:12:03 +08:00
• 0b395638ed 11 qiuyuan 2025-08-04 10:15:46 +08:00
• d7f7180e80 11 qiuyuan 2025-08-01 09:34:49 +08:00