18 Commits

Author SHA1 Message Date
wds
3ff0d534b8 Merge branch 'master' of C:\Users\wds81\StudioProjects\NavinfoOutDoorDataCollect with conflicts. 2021-05-28 18:48:31 +08:00
wds
e5d85ac72f Merge remote-tracking branch 'OutDoor/master' 2021-05-28 18:42:01 +08:00
md
1c47b5ebd2 '能力测评部分实现' 2021-05-28 18:41:20 +08:00
wds
ea36fa25e8 Merge remote-tracking branch 'OutDoor/master' 2021-05-28 18:40:00 +08:00
王东升
7756d1d62c !4 发现 -任务专区 ,活动专区
* 完成发现-任务专区,活动专区
2021-05-28 11:30:30 +08:00
wds
7af079b6e0 完成发现-任务专区,活动专区 2021-05-27 18:46:16 +08:00
5ad85c5a4b !3 完成了任务说明
Merge pull request !3 from Amdi/master
2021-05-27 18:31:15 +08:00
md
0a1afb7ffb 完成任务说明 2021-05-27 18:00:26 +08:00
wds
cea2d6c31c 解决合并 2021-05-26 19:09:35 +08:00
wds
b0526a0eb1 解决冲突 2021-05-26 19:01:46 +08:00
wds
80893ca08f 解决冲突 2021-05-26 18:47:39 +08:00
md
3b0581c621 feat: 初始化界面 2021-05-26 18:45:48 +08:00
9bbe6ead62 !1 初始化界面
Merge pull request !1 from Amdi/master
2021-05-26 18:04:43 +08:00
wds
26d444cbf8 增加发现页 2021-05-26 17:58:12 +08:00
md
131dd1d958 feat: 初始化界面 2021-05-26 14:29:24 +08:00
wds
4b28f19d9a 首页实现页面切换 2021-05-25 18:31:26 +08:00
wds
39ca9da5e9 feat: 初次提交测试 2021-05-25 14:54:49 +08:00
wds
5b5c61e0a7 feat: 项目初始化 2021-05-25 14:44:35 +08:00