Merge remote-tracking branch 'origin/master'

+<template>
+    <div class="container">
+bottomNav
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'bottomNav',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file

+<template>
+    <div class="container">
+leftAssert
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'leftAssert',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file

+<template>
+    <div class="container">
+leftFunc
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'leftFunc',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file

+<template>
+    <div class="container">
+leftTopFunc
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'leftTopFunc',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file

+<template>
+    <div class="container">
+mapPop
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'mapPop',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file

+<template>
+    <div class="container">
+top
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'top',
+        components: {},
+        data() {
+            return {}
+        },
+        mounted() {},
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="sass" scoped>
+    .container {}
+</style>
\ No newline at end of file