Commit Graph

29 Commits (f71156aac922ac479aafec6a60f6d2d724812ab4)

Author SHA1 Message Date
guangyin f71156aac9 Merge branch 'guangyin' 2023-05-18 10:23:53 +08:00
guangyin c7be35f12b feat:删除无用图片
feat:导览页面数据模拟
2023-05-18 10:23:22 +08:00
吴延福 4a5973d657 Merge commit 'a37cd8f9fca8289f949525bdc26e73834565176f' 2023-05-18 09:13:47 +08:00
吴延福 0361dc06ed feat:新增周界 2023-05-18 09:13:35 +08:00
guangyin a37cd8f9fc feat:添加退出导览按钮 2023-05-18 09:12:05 +08:00
guangyin ffb50be119 feat:运营管理页面左侧顶部样式调整 2023-05-18 08:56:35 +08:00
guangyin 38155bd34e Merge branch 'master' into guangyin 2023-05-18 08:29:11 +08:00
guangyin 1f3c757bee feat:运营管理页面搭建 2023-05-18 08:28:51 +08:00
吴延福 378de94183 Merge commit 'b3d6a8aa29f6c78004b5137827b3511dd8f8941a' 2023-05-17 18:09:28 +08:00
吴延福 9eecbf8fdb feat:新增自由导览 2023-05-17 18:09:16 +08:00
guangyin b3d6a8aa29 Merge branch 'master' into guangyin 2023-05-17 16:56:27 +08:00
guangyin 7dde068ed0 feat:运营管理页面搭建 2023-05-17 16:54:11 +08:00
吴延福 c9a45ca8f6 feat:新增自由导览 2023-05-17 16:48:12 +08:00
吴延福 9a94cd4e0e Merge commit 'e83e91434742112d7100e93e6a770bdd9104d475' 2023-05-17 15:52:35 +08:00
吴延福 fb20e164c7 feat:新增地图方法 2023-05-17 15:52:16 +08:00
guangyin e83e914347 feat:导览页搭建完成 2023-05-17 15:07:29 +08:00
guangyin f13a95d92d Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-16 18:09:33 +08:00
guangyin 0937577802 feat:首页搭建完成
feat:导览页搭建
2023-05-16 18:08:36 +08:00
吴延福 5b6fa34bb9 feat:新增弹窗页面样式 2023-05-16 18:03:04 +08:00
吴延福 9b147841d4 fixed:修改配置文件 2023-05-16 16:33:33 +08:00
吴延福 b1eb8f3a9f Merge commit '6bcb4c6b0dd3ff9858d4afa293976aa42d75c51c'
# Conflicts:
#	src/mock/layer.ts
2023-05-16 16:19:54 +08:00
吴延福 e7fd08acef style:增加逗号 2023-05-16 16:19:04 +08:00
guangyin 6bcb4c6b0d feat:解决代码合并问题 2023-05-16 16:17:45 +08:00
guangyin d580a6f1dc Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-16 16:16:33 +08:00
guangyin 68aaa9ad58 feat:首页搭建 2023-05-16 16:13:55 +08:00
吴延福 3d77e7584f style:清空无效代码 2023-05-16 16:10:28 +08:00
guangyin 6e136a2404 feat:删除无用文件 2023-05-16 14:45:12 +08:00
guangyin f062d8c76e feat:配置文件 2023-05-16 13:47:18 +08:00
guangyin 8d6e72a8ad 初始化页面搭建 2023-05-16 13:37:15 +08:00