5410061f by jikai

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/Home.vue
2 parents a0f0b7d2 d09ebd64
...@@ -7,5 +7,8 @@ ...@@ -7,5 +7,8 @@
7 </template> 7 </template>
8 8
9 <style> 9 <style>
10 10 * {
11 margin: 0px;
12 padding: 0px;
13 }
11 </style> 14 </style>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 mounted() { 17 mounted() {
18 Cesium.Ion.defaultAccessToken = this.config.mapToken; 18 Cesium.Ion.defaultAccessToken = this.config.mapToken;
19 var viewer = new Cesium.Viewer('cesiumContainer', { 19 var viewer = new Cesium.Viewer('cesiumContainer', {
20 fullscreenButton: true, 20 fullscreenButton: true,
21 }); 21 });
22 }, 22 },
23 methods: { 23 methods: {
......