Commit Graph

2666 Commits

Author SHA1 Message Date
何童崇 9cdcb99695 解决冲突 2022-04-24 10:16:50 +08:00
何童崇 273bf478b4 合并竞赛代码 2022-04-24 10:14:38 +08:00
xxq250 28c54cf03e Merge pull request '启智2022增加需求' (#362) from durian/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-04-22 14:35:56 +08:00
谢思 3dac15aa86 通知公告标题显示+文案更新 2022-04-22 11:42:55 +08:00
何童崇 da4ffd203e 修改首页及帮助手册样式 2022-04-22 11:30:12 +08:00
谢思 7e32d426c8 issue 2022-04-22 11:06:50 +08:00
谢思 f4f3545fd5 Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-21 18:26:44 +08:00
何童崇 5ca0cdabe7 兼容 2022-04-21 18:27:09 +08:00
谢思 09e08af180 Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-21 18:04:39 +08:00
何童崇 ba8c86ada7 修改兼容提示 2022-04-21 18:03:48 +08:00
谢思 aa2547290b 更新文案 2022-04-21 18:03:38 +08:00
谢思 a1b47c1340 Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-21 17:11:27 +08:00
谢思 1c279d7b06 报名/作品列表新增驳回以及搜索功能,报名/作品驳回操作 2022-04-21 17:11:07 +08:00
何童崇 17daf34f07 调整数据统计展示效果 2022-04-21 11:00:59 +08:00
何童崇 070af23ff2 Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-21 10:44:10 +08:00
何童崇 f129a2cc7d 新增首页modal导航 2022-04-21 10:42:17 +08:00
谢思 eaf1cdfbfd 启智2022新增功能 2022-04-20 17:41:48 +08:00
xxq250 5569f35ee1 Merge pull request '修改报名表下载路径以及背景颜色' (#360) from durian/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-04-20 11:04:57 +08:00
谢思 c97dcb1192 更改网站背景颜色 2022-04-20 10:17:16 +08:00
谢思 3e01886af0 报名表下载路径+背景颜色更改 2022-04-20 09:59:42 +08:00
xxq250 1778e751ad Merge pull request '修改竞赛样式图片等' (#359) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-04-20 09:16:23 +08:00
何童崇 15a58c61d6 修改登录及联系我们logo 2022-04-19 20:39:38 +08:00
谢思 cc274970d8 Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-19 19:16:03 +08:00
何童崇 129f7eab8d 首页样式修改 2022-04-19 19:14:19 +08:00
谢思 a9631228ec 启智竞赛无权限跳转403 2022-04-19 19:13:32 +08:00
何童崇 0eb589e0df 修改竞赛首页 2022-04-19 19:08:50 +08:00
何童崇 dd34da9ed4 修改导航 2022-04-19 18:12:32 +08:00
何童崇 b3b50f462b 修改样式 2022-04-19 16:58:58 +08:00
谢思 9c2aac1907 更新联系我们logo 2022-04-19 16:05:51 +08:00
谢思 7cf2c4fc2e Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_qz2022 2022-04-19 15:57:18 +08:00
谢思 0c5bd5503b Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-04-19 15:55:34 +08:00
谢思 fecf0a2b9d 提交成功刷新页面 2022-04-19 15:55:16 +08:00
何童崇 f9af1c814f 修改竞赛代码 2022-04-19 15:36:33 +08:00
谢思 97e8547c94 启智竞赛无权限编辑时跳转到403 2022-04-19 15:32:20 +08:00
caishi 3348a459be 弹窗-cookie保存24小时 2022-04-19 14:03:44 +08:00
何童崇 f4a67ee68e 修改竞赛样式图片等 2022-04-19 13:36:34 +08:00
xxq250 f0dcdcddaf Merge pull request '合并启智竞赛' (#358) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-04-19 11:15:36 +08:00
何童崇 ba33ebc6f6 Merge branch 'pre_dev_military' of https://code.gitlink.org.cn/Gitlink/forgeplus-react into dev_military_qz2022 2022-04-19 11:10:41 +08:00
何童崇 cf729cbd8b 修改竞赛样式等代码 2022-04-19 11:09:53 +08:00
何童崇 73b5f6650c 使用手册 2022-04-19 09:56:12 +08:00
何童崇 990459823e 修改链接,重要 2022-04-19 09:52:14 +08:00
何童崇 a6b293af80 修改联系我们的样式 2022-04-19 09:52:14 +08:00
何童崇 6710dc0780 修改竞赛 2022-04-19 02:19:03 +08:00
何童崇 b80d37fb9c 修改竞赛 2022-04-19 00:42:42 +08:00
何童崇 15d73d4f30 首页增加竞赛轮播 2022-04-18 16:40:39 +08:00
何童崇 e9e9851e0c sm处理 2022-04-18 11:37:02 +08:00
何童崇 cae5f321aa Merge branch 'dev_military_qz2022' of https://code.gitlink.org.cn/durian/forgeplus-react into dev_military_qz2022 2022-04-18 11:22:26 +08:00
何童崇 43c49a1fb7 微调去掉SM相关内容 2022-04-18 11:21:51 +08:00
何童崇 c70e22d550 微调样式 2022-04-14 17:24:51 +08:00
谢思 e0c0125004 支付上传凭证从后往前 2022-04-11 15:06:04 +08:00