5410061f by jikai

Merge remote-tracking branch 'origin/master'

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