Merge remote-tracking branch 'origin/develop' into develop

wangqi

2021-03-30 9f77315b5327bb5f32eacb31a69c9601a30e3800

 src/App.vue

@@ -14,7 +14,6 @@
</script>

<style lang="less">
@import '@assets/css/map/_map-variable';
html, body, #app{
  color: @color;
  height: 100vh;
@@ -24,7 +23,7 @@
  overflow: hidden;
}
body .el-scrollbar__wrap {
  overflow-x: hidden;
  // overflow-x: hidden;
}
body{
  -ms-overflow-style: none;